commit 2ec7280a178ad3dcfd2e645bc330eeb04a84bfcf
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 21 21:46:03 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 21 21:46:03 2011 +0000
tree 1eb732a73860f0f8c5b5610a44829851ae82578b
parent 53effc5e327749ea47bc0c678cb45246644600b0

Fix some warnings

Review URL: http://codereview.appspot.com/5075049/



git-svn-id: http://skia.googlecode.com/svn/trunk@2304 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrAAHairLinePathRenderer.cpp

diff --git a/gpu/src/GrAAHairLinePathRenderer.cpp b/gpu/src/GrAAHairLinePathRenderer.cpp
index d57aa3a..8349fa7 100644
--- a/gpu/src/GrAAHairLinePathRenderer.cpp
+++ b/gpu/src/GrAAHairLinePathRenderer.cpp
@@ -219,7 +219,8 @@
         GrAssert(get_float_exp(3000000.f) == 21);
     }
 #endif
-    return (((*(int*)&x) & 0x7f800000) >> 23) - 127;
+    const int* iptr = (const int*)&x;
+    return (((*iptr) & 0x7f800000) >> 23) - 127;
 }
 
 // we subdivide the quads to avoid huge overfill

gpu/src/GrGLProgram.cpp

diff --git a/gpu/src/GrGLProgram.cpp b/gpu/src/GrGLProgram.cpp
index 0c707c5..015be61 100644
--- a/gpu/src/GrGLProgram.cpp
+++ b/gpu/src/GrGLProgram.cpp
@@ -515,7 +515,7 @@
 
     // the dual source output has no canonical var name, have to
     // declare an output, which is incompatible with gl_FragColor/gl_FragData.
-    const char* fsColorOutput;
+    const char* fsColorOutput = NULL;
     bool dualSourceOutputWritten = false;
     segments.fHeader.printf(glsl_version_string(gl, glslVersion));
     bool isColorDeclared = decl_and_get_fs_color_output(glslVersion,

gpu/src/GrGpu.cpp

diff --git a/gpu/src/GrGpu.cpp b/gpu/src/GrGpu.cpp
index 46ce46c..b338d05 100644
--- a/gpu/src/GrGpu.cpp
+++ b/gpu/src/GrGpu.cpp
@@ -490,6 +490,8 @@
                     done = true;
                 }
                 break;
+            default:
+                GrCrash("Unknown set op.");
         }
     }
     return done ? curr-1 : count;
@@ -567,7 +569,7 @@
             clipBit = (1 << (clipBit-1));
             
             bool clearToInside;
-            GrSetOp startOp;
+            GrSetOp startOp = kReplace_SetOp; // suppress warning
             int start = process_initial_clip_elements(clip, &clearToInside,
                                                       &startOp);
 

src/core/SkPath.cpp

diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index 4c7a8a3..5e10f1b 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -88,7 +88,9 @@
 
 ////////////////////////////////////////////////////////////////////////////
 
-SkPath::SkPath() : fBoundsIsDirty(true), fFillType(kWinding_FillType) {
+SkPath::SkPath() 
+    : fFillType(kWinding_FillType)
+    , fBoundsIsDirty(true) {
     fConvexity = kUnknown_Convexity;
     fSegmentMask = 0;
 #ifdef ANDROID