fix 64bit warnings (use: GYP_DEFINES=skia_arch_width=64 make ... )

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

diff --git a/include/core/SkChecksum.h b/include/core/SkChecksum.h
index e8117f9..e767670 100644 (file)
--- a/include/core/SkChecksum.h
+++ b/include/core/SkChecksum.h
@@ -110,8 +110,8 @@ public:
          *  if we're on a 32bit or 64bit arch, since we use sizeof(uintptr_t)
          *  to compute how much to shift-down the size.
          */
-        int n4 = size / (sizeof(uintptr_t) << 2);
-        for (int i = 0; i < n4; ++i) {
+        size_t n4 = size / (sizeof(uintptr_t) << 2);
+        for (size_t i = 0; i < n4; ++i) {
             result = Mash(result, *ptr++);
             result = Mash(result, *ptr++);
             result = Mash(result, *ptr++);

diff --git a/include/core/SkReader32.h b/include/core/SkReader32.h
index c127d89..1bdf949 100644 (file)
--- a/include/core/SkReader32.h
+++ b/include/core/SkReader32.h
@@ -32,13 +32,13 @@ public:
         fStop = (const char*)data + size;
     }
     
-    uint32_t size() const { return fStop - fBase; }
-    uint32_t offset() const { return fCurr - fBase; }
+    uint32_t size() const { return SkToU32(fStop - fBase); }
+    uint32_t offset() const { return SkToU32(fCurr - fBase); }
     bool eof() const { return fCurr >= fStop; }
     const void* base() const { return fBase; }
     const void* peek() const { return fCurr; }
 
-    uint32_t available() const { return fStop - fCurr; }
+    uint32_t available() const { return SkToU32(fStop - fCurr); }
     bool isAvailable(uint32_t size) const { return fCurr + size <= fStop; }
     
     void rewind() { fCurr = fBase; }

diff --git a/include/core/SkTDArray.h b/include/core/SkTDArray.h
index 426bb6d..1afd3d0 100644 (file)
--- a/include/core/SkTDArray.h
+++ b/include/core/SkTDArray.h
@@ -95,7 +95,7 @@ public:
     /**
      *  Return the number of elements in the array
      */
-    int count() const { return fCount; }
+    int count() const { return (int)fCount; }
 
     /**
      *  return the number of bytes in the array: count * sizeof(T)