commit 8b169311b59ab84e8ca6f3630a1e960cc1be751e
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 17:47:36 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 17:47:36 2013 +0000
tree 5d9ec712d281a81183fed5b650b1f9a92ae7cad4
parent baa15581f6cbd9ce4cc5ba5eb1d6fcbe27ae6741

Second wave of Win64 warning cleanup

https://codereview.chromium.org/27343002/



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

src/utils/SkCanvasStateUtils.cpp

diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp
index 0cc42c5..c62bc04 100644
--- a/src/utils/SkCanvasStateUtils.cpp
+++ b/src/utils/SkCanvasStateUtils.cpp
@@ -60,7 +60,7 @@
     union {
         struct {
             RasterConfig config; // pixel format: a value from RasterConfigs.
-            uint32_t rowBytes;   // Number of bytes from start of one line to next.
+            size_t rowBytes;     // Number of bytes from start of one line to next.
             void* pixels;        // The pixels, all (height * rowBytes) of them.
         } raster;
         struct {

src/utils/SkNinePatch.cpp

diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp
index 9dc8bd2..4e0d1d1 100644
--- a/src/utils/SkNinePatch.cpp
+++ b/src/utils/SkNinePatch.cpp
@@ -43,7 +43,7 @@
         }
         n += 1;
     }
-    return indices - startIndices;
+    return static_cast<int>(indices - startIndices);
 }
 
 // Computes the delta between vertices along a single axis