commit 93f03324189f211db95c312b3cb08b435cc5ac34
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 03 17:35:19 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Dec 03 17:35:19 2012 +0000
tree 0eb0f4c0c62ce4cdff52d98c54334a0094d3cc5d
parent 08cb7286c6fe50ceaabc15a16f0020d808390f43

Fixed remaining clang compiler warnings

https://codereview.appspot.com/6865053/



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

gm/bitmaprect.cpp

diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 4af6f0b..9c6d472 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -94,9 +94,9 @@
     static const int gYSize = 3;
 
     SkColor textureData[gXSize][gYSize] = {
-        SK_ColorRED,    SK_ColorWHITE, SK_ColorBLUE,
-        SK_ColorGREEN,  SK_ColorBLACK, SK_ColorCYAN,
-        SK_ColorYELLOW, SK_ColorGRAY,  SK_ColorMAGENTA
+        { SK_ColorRED,    SK_ColorWHITE, SK_ColorBLUE },
+        { SK_ColorGREEN,  SK_ColorBLACK, SK_ColorCYAN },
+        { SK_ColorYELLOW, SK_ColorGRAY,  SK_ColorMAGENTA }
     };
 
 

gm/fatpathfill.cpp

diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp
index c86dfcb..c583d64 100644
--- a/gm/fatpathfill.cpp
+++ b/gm/fatpathfill.cpp
@@ -81,7 +81,8 @@
 
         for (int i = 0; i < REPEAT_LOOP; ++i) {
             SkPath line, path;
-            line.moveTo(1, 2); line.lineTo(4 + i, 1);
+            line.moveTo(SkIntToScalar(1), SkIntToScalar(2)); 
+            line.lineTo(SkIntToScalar(4 + i), SkIntToScalar(1));
             paint.getFillPath(line, &path);
             draw_fatpath(canvas, surface, &path, 1);
 

gm/modecolorfilters.cpp

diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp
index 3515033..4f04dd4 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -123,11 +123,11 @@
         int idx = 0;
         static const int kRectsPerRow = SkMax32(this->getISize().fWidth / kRectWidth, 1);
         for (size_t cfm = 0; cfm < SK_ARRAY_COUNT(modes); ++cfm) {
-            for (int cfc = 0; cfc < SK_ARRAY_COUNT(colors); ++cfc) {
+            for (size_t cfc = 0; cfc < SK_ARRAY_COUNT(colors); ++cfc) {
                 SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(colors[cfc],
                                                                                modes[cfm]));
                 paint.setColorFilter(cf);
-                for (int s = 0; s < SK_ARRAY_COUNT(shaders); ++s) {
+                for (size_t s = 0; s < SK_ARRAY_COUNT(shaders); ++s) {
                     paint.setShader(shaders[s]);
                     bool hasShader = NULL == paint.getShader();
                     int paintColorCnt = hasShader ? SK_ARRAY_COUNT(alphas) : SK_ARRAY_COUNT(colors);
@@ -146,7 +146,7 @@
             }
         }
 
-        for (int i = 0; i < SK_ARRAY_COUNT(shaders); ++i) {
+        for (size_t i = 0; i < SK_ARRAY_COUNT(shaders); ++i) {
             SkSafeUnref(shaders[i]);
         }
     }

gm/tilemodes.cpp

diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index f2fbe77..ab4ea0a 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -170,6 +170,8 @@
         case 2:
             return SkGradientShader::CreateSweep(center.fX, center.fY, colors, NULL, SK_ARRAY_COUNT(colors));
     }
+
+    return NULL;
 }
 
 static SkShader* make_radial(SkShader::TileMode tx, SkShader::TileMode ty) {