More win64 warning fixes

src/core/SkDistanceFieldGen.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 "SkDistanceFieldGen.h"
 #include "SkPoint.h"
 
@@ skipping 443 matching lines @@
         currData += 2;
         currEdge += 2;
     }
 
     return true;
 }
 
 // assumes an 8-bit image and distance field
 bool SkGenerateDistanceFieldFromA8Image(unsigned char* distanceField,
                                         const unsigned char* image,
-                                        int width, int height, int rowBytes) {
+                                        int width, int height, size_t rowBytes) {
     SkASSERT(distanceField);
     SkASSERT(image);
 
     // create temp data
     SkAutoSMalloc<1024> copyStorage((width+2)*(height+2)*sizeof(char));
     unsigned char* copyPtr = (unsigned char*) copyStorage.get();
 
     // we copy our source image into a padded copy to ensure we catch edge transitions
     // around the outside
     const unsigned char* currSrcScanLine = image;
     sk_bzero(copyPtr, (width+2)*sizeof(char));
     unsigned char* currDestPtr = copyPtr + width + 2;
     for (int i = 0; i < height; ++i) {
         *currDestPtr++ = 0;
         memcpy(currDestPtr, currSrcScanLine, rowBytes);
         currSrcScanLine += rowBytes;
         currDestPtr += width;
         *currDestPtr++ = 0;
     }
     sk_bzero(currDestPtr, (width+2)*sizeof(char));
 
     return generate_distance_field_from_image(distanceField, copyPtr, width, height);
 }
 
 // assumes a 1-bit image and 8-bit distance field
 bool SkGenerateDistanceFieldFromBWImage(unsigned char* distanceField,
                                         const unsigned char* image,
-                                        int width, int height, int rowBytes) {
+                                        int width, int height, size_t rowBytes) {
     SkASSERT(distanceField);
     SkASSERT(image);
 
     // create temp data
     SkAutoSMalloc<1024> copyStorage((width+2)*(height+2)*sizeof(char));
     unsigned char* copyPtr = (unsigned char*) copyStorage.get();
 
     // we copy our source image into a padded copy to ensure we catch edge transitions
     // around the outside
     const unsigned char* currSrcScanLine = image;
     sk_bzero(copyPtr, (width+2)*sizeof(char));
     unsigned char* currDestPtr = copyPtr + width + 2;
     for (int i = 0; i < height; ++i) {
         *currDestPtr++ = 0;
         int rowWritesLeft = width;
         const unsigned char *maskPtr = currSrcScanLine;
         while (rowWritesLeft > 0) {
             unsigned mask = *maskPtr++;
             for (int i = 7; i >= 0 && rowWritesLeft; --i, --rowWritesLeft) {
                 *currDestPtr++ = (mask & (1 << i)) ? 0xff : 0;
             }
         }
         currSrcScanLine += rowBytes;
         *currDestPtr++ = 0;
     }
     sk_bzero(currDestPtr, (width+2)*sizeof(char));
 
     return generate_distance_field_from_image(distanceField, copyPtr, width, height);
 }