Clean up most clang warnings outside animator/
http://codereview.appspot.com/6464058/
git-svn-id: http://skia.googlecode.com/svn/trunk@5079 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkBitmapProcState_procs.h b/src/core/SkBitmapProcState_procs.h
index 7b05884..6d17193 100644
--- a/src/core/SkBitmapProcState_procs.h
+++ b/src/core/SkBitmapProcState_procs.h
@@ -341,3 +341,4 @@
#include "SkBitmapProcState_shaderproc.h"
#undef NAME_WRAP
+
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index a424b02..a1cd75b 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -795,7 +795,7 @@
// with the existing clip.
for ( ; NULL != clip; clip = iter.next()) {
GrPathFill fill;
- bool fillInverted;
+ bool fillInverted = false;
// enabled at bottom of loop
drawState->disableState(GrGpu::kModifyStencilClip_StateBit);
// if the target is MSAA then we want MSAA enabled when the clip is soft
@@ -807,11 +807,10 @@
}
}
- bool canRenderDirectToStencil; // can the clip element be drawn
- // directly to the stencil buffer
- // with a non-inverted fill rule
- // without extra passes to
- // resolve in/out status.
+ // Can the clip element be drawn directly to the stencil buffer
+ // with a non-inverted fill rule without extra passes to
+ // resolve in/out status?
+ bool canRenderDirectToStencil = false;
SkRegion::Op op = clip->fOp;
if (first) {
@@ -831,16 +830,15 @@
contains(*clip->fRect, devRTRect, oldClipData->fOrigin)) {
continue;
}
- } else if (NULL != clip->fPath) {
+ } else {
+ GrAssert(NULL != clip->fPath);
fill = get_path_fill(*clip->fPath);
fillInverted = GrIsFillInverted(fill);
fill = GrNonInvertedFill(fill);
clipPath = clip->fPath;
- pr = this->getContext()->getPathRenderer(*clipPath,
- fill, fGpu, false,
- true);
+ pr = this->getContext()->getPathRenderer(*clipPath, fill, fGpu, false, true);
if (NULL == pr) {
- fGpu->setClip(oldClipData); // restore to the original
+ fGpu->setClip(oldClipData);
return false;
}
canRenderDirectToStencil =
@@ -856,10 +854,11 @@
// stencil bit used for clipping.
canDrawDirectToClip =
GrStencilSettings::GetClipPasses(op,
- canRenderDirectToStencil,
- clipBit,
- fillInverted,
- &passes, stencilSettings);
+ canRenderDirectToStencil,
+ clipBit,
+ fillInverted,
+ &passes,
+ stencilSettings);
// draw the element to the client stencil bits if necessary
if (!canDrawDirectToClip) {
diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp
index 3027688..e9dcc7f 100644
--- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp
+++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp
@@ -415,7 +415,7 @@
// (0, 0, 0, 0, 0, 0, 0, 0)
const __m128i zero = _mm_setzero_si128();
- __m128i alpha;
+ __m128i alpha = _mm_setzero_si128();
if (has_alpha)
// 8x(alpha)
alpha = _mm_set1_epi16(s.fAlphaScale);
diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp
index e6013db..e485d50 100644
--- a/src/pipe/SkGPipeRead.cpp
+++ b/src/pipe/SkGPipeRead.cpp
@@ -645,7 +645,12 @@
///////////////////////////////////////////////////////////////////////////////
-SkGPipeState::SkGPipeState(): fReader(0), fFlags(0), fSharedHeap(NULL) {}
+SkGPipeState::SkGPipeState()
+ : fReader(0)
+ , fSharedHeap(NULL)
+ , fFlags(0) {
+
+}
SkGPipeState::~SkGPipeState() {
fTypefaces.safeUnrefAll();
diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
index d1db4e2..8573f88 100644
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -129,20 +129,21 @@
}
}
-static void toString(const void* text, size_t len, SkPaint::TextEncoding enc,
+static void toString(const void* text, size_t byteLen, SkPaint::TextEncoding enc,
SkString* str) {
+ // FIXME: this code appears to be untested - and probably unused - and probably wrong
switch (enc) {
case SkPaint::kUTF8_TextEncoding:
- str->printf("\"%.*s\"%s", SkMax32(len, 32), (const char*) text,
- len > 32 ? "..." : "");
+ str->printf("\"%.*s\"%s", SkMax32(byteLen, 32), (const char*) text,
+ byteLen > 32 ? "..." : "");
break;
case SkPaint::kUTF16_TextEncoding:
- str->printf("\"%.*S\"%s", SkMax32(len, 32), (const wchar_t*) text,
- len > 64 ? "..." : "");
+ str->printf("\"%.*S\"%s", SkMax32(byteLen, 32), (const wchar_t*) text,
+ byteLen > 64 ? "..." : "");
break;
case SkPaint::kUTF32_TextEncoding:
- str->printf("\"%.*S\"%s", SkMax32(len, 32), (const wchar_t*) text,
- len > 128 ? "..." : "");
+ str->printf("\"%.*S\"%s", SkMax32(byteLen, 32), (const wchar_t*) text,
+ byteLen > 128 ? "..." : "");
break;
case SkPaint::kGlyphID_TextEncoding:
str->set("<glyphs>");