Third wave of Win64 warning cleanup

tests/BitmapCopyTest.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "Test.h"
 #include "SkBitmap.h"
 #include "SkRect.h"
@@ skipping 397 matching lines @@
                 default:
                     break;
             }
             if (sizeFail) {
                 SkString str;
                 str.printf("getSafeSize64() wrong size: %s",
                     getSkConfigName(tstSafeSize));
                 reporter->reportFailed(str);
             }
 
-            size_t subW, subH;
+            int subW, subH;
             // Set sizes to be height = 2 to force the last row of the
             // source to be used, thus verifying correct operation if
             // the bitmap is an extracted subset.
             if (gPairs[i].fConfig == SkBitmap::kA1_Config) {
                 // If one-bit per pixel, use 9 pixels to force more than
                 // one byte per row.
                 subW = 9;
                 subH = 2;
             } else {
                 // All other configurations are at least one byte per pixel,
@@ skipping 36 matching lines @@
                 srcReady = src.copyTo(&subset, src.getConfig());
             }
 
             // Not all configurations will generate a valid 'subset'.
             if (srcReady) {
 
                 // Allocate our target buffer 'buf' for all copies.
                 // To simplify verifying correctness of copies attach
                 // buf to a SkBitmap, but copies are done using the
                 // raw buffer pointer.
-                const uint32_t bufSize = subH *
+                const size_t bufSize = subH *
                     SkBitmap::ComputeRowBytes(src.getConfig(), subW) * 2;
                 SkAutoMalloc autoBuf (bufSize);
                 uint8_t* buf = static_cast<uint8_t*>(autoBuf.get());
 
                 SkBitmap bufBm; // Attach buf to this bitmap.
                 bool successExpected;
 
                 // Set up values for each pixel being copied.
                 Coordinates coords(subW * subH);
-                for (size_t x = 0; x < subW; ++x)
-                    for (size_t y = 0; y < subH; ++y)
+                for (int x = 0; x < subW; ++x)
+                    for (int y = 0; y < subH; ++y)
                     {
                         int index = y * subW + x;
                         SkASSERT(index < coords.length);
                         coords[index]->fX = x;
                         coords[index]->fY = y;
                     }
 
                 writeCoordPixels(subset, coords);
 
                 // Test #1 ////////////////////////////////////////////
@@ skipping 98 matching lines @@
                         false);
 
 #endif
             }
         } // for (size_t copyCase ...
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("BitmapCopy", TestBitmapCopyClass, TestBitmapCopy)