Even more win64 warning fixes

src/utils/SkTextureCompressor_ASTC.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTextureCompressor_ASTC.h"
 #include "SkTextureCompressor_Blitter.h"
 
@@ skipping 116 matching lines @@
 { 1, 7, 9, 3, 8, 9, 4, 9, 9, 2, 10, 9, 2, 7, 10, 6, 8, 10, 9, 9, 10, 4,
   10, 10, 3, 7, 11, 10, 8, 11, 15, 9, 11, 7, 10, 11, -1, 0, 0, -1, 0, 0, -1, 0,
   0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0}, // n = 20
 { 2, 10, 9, 4, 11, 9, 1, 9, 10, 6, 10, 10, 10, 11, 10, 1, 9, 11, 9, 10, 11, 16,
   11, 11, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0,
   0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0} // n = 20
 };
 
 // Returns the alpha value of a texel at position (x, y) from src.
 // (x, y) are assumed to be in the range [0, 12).
-inline uint8_t GetAlpha(const uint8_t *src, int rowBytes, int x, int y) {
+inline uint8_t GetAlpha(const uint8_t *src, size_t rowBytes, int x, int y) {
     SkASSERT(x >= 0 && x < 12);
     SkASSERT(y >= 0 && y < 12);
     SkASSERT(rowBytes >= 12);
     return *(src + y*rowBytes + x);
 }
 
-inline uint8_t GetAlphaTranspose(const uint8_t *src, int rowBytes, int x, int y) {
+inline uint8_t GetAlphaTranspose(const uint8_t *src, size_t rowBytes, int x, int y) {
     return GetAlpha(src, rowBytes, y, x);
 }
 
 // Output the 16 bytes stored in top and bottom and advance the pointer. The bytes
 // are stored as the integers are represented in memory, so they should be swapped
 // if necessary.
 static inline void send_packing(uint8_t** dst, const uint64_t top, const uint64_t bottom) {
     uint64_t* dst64 = reinterpret_cast<uint64_t*>(*dst);
     dst64[0] = top;
     dst64[1] = bottom;
     *dst += 16;
 }
 
 // Compresses an ASTC block, by looking up the proper contributions from
 // k6x5To12x12Table and computing an index from the associated values.
-typedef uint8_t (*GetAlphaProc)(const uint8_t* src, int rowBytes, int x, int y);
+typedef uint8_t (*GetAlphaProc)(const uint8_t* src, size_t rowBytes, int x, int y);
 
 template<GetAlphaProc getAlphaProc>
-static void compress_a8_astc_block(uint8_t** dst, const uint8_t* src, int rowBytes) {
+static void compress_a8_astc_block(uint8_t** dst, const uint8_t* src, size_t rowBytes) {
     // Check for single color
     bool constant = true;
     const uint32_t firstInt = *(reinterpret_cast<const uint32_t*>(src));
     for (int i = 0; i < 12; ++i) {
         const uint32_t *rowInt = reinterpret_cast<const uint32_t *>(src + i*rowBytes);
         constant = constant && (rowInt[0] == firstInt);
         constant = constant && (rowInt[1] == firstInt);
         constant = constant && (rowInt[2] == firstInt);
     }
 
@@ skipping 1858 matching lines @@
         SkFAIL("Implement me!");
     }
 #endif
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace SkTextureCompressor {
 
 bool CompressA8To12x12ASTC(uint8_t* dst, const uint8_t* src,
-                           int width, int height, int rowBytes) {
+                           int width, int height, size_t rowBytes) {
     if (width < 0 || ((width % 12) != 0) || height < 0 || ((height % 12) != 0)) {
         return false;
     }
 
     uint8_t** dstPtr = &dst;
     for (int y = 0; y < height; y += 12) {
         for (int x = 0; x < width; x += 12) {
             compress_a8_astc_block<GetAlpha>(dstPtr, src + y*rowBytes + x, rowBytes);
         }
     }
@@ skipping 39 matching lines @@
             read_astc_block(&data, src);
             decompress_astc_block(reinterpret_cast<uint8_t*>(colorPtr + x), dstRowBytes, data);
 
             // ASTC encoded blocks are 16 bytes (128 bits) large.
             src += 16;
         }
     }
 }
 
 }  // SkTextureCompressor