Even more win64 warning fixes

tests/PackBitsTest.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 "SkPackBits.h"
 #include "Test.h"
 
@@ skipping 25 matching lines @@
         size_t dstSize = SkPackBits::Pack16(gTests[i].fSrc,
                                             gTests[i].fCount, dst);
         uint16_t src[100];
         int srcCount = SkPackBits::Unpack16(dst, dstSize, src);
         bool match = gTests[i].fCount == srcCount && memcmp(gTests[i].fSrc, src,
                                     gTests[i].fCount * sizeof(uint16_t)) == 0;
         REPORTER_ASSERT(reporter, match);
     }
 
     for (int n = 1000; n; n--) {
-        size_t size = 50;
+        int size = 50;
         uint16_t src[100], src2[100];
         uint8_t dst[200];
         rand_fill(src, size);
 
         size_t dstSize = SkPackBits::Pack16(src, size, dst);
         size_t maxSize = SkPackBits::ComputeMaxSize16(size);
         REPORTER_ASSERT(reporter, maxSize >= dstSize);
 
-        size_t srcCount = SkPackBits::Unpack16(dst, dstSize, src2);
+        int srcCount = SkPackBits::Unpack16(dst, dstSize, src2);
         REPORTER_ASSERT(reporter, size == srcCount);
         bool match = memcmp(src, src2, size * sizeof(uint16_t)) == 0;
         REPORTER_ASSERT(reporter, match);
     }
 }
 
 static const uint8_t gTest80[] = { 0, 0, 1, 1 };
 static const uint8_t gTest81[] = { 1, 2, 3, 4, 5, 6 };
 static const uint8_t gTest82[] = { 0, 0, 0, 1, 2, 3, 3, 3 };
 static const uint8_t gTest83[] = { 0, 0, 0, 0, 0, 0, 1, 2, 3, 3, 3, 0, 0, 1 };
@@ skipping 23 matching lines @@
                                            gTests[i].fCount, dst);
         REPORTER_ASSERT(reporter, dstSize <= maxSize);
         uint8_t src[100];
         int srcCount = SkPackBits::Unpack8(dst, dstSize, src);
         bool match = gTests[i].fCount == srcCount &&
                     memcmp(gTests[i].fSrc, src,
                            gTests[i].fCount * sizeof(uint8_t)) == 0;
         REPORTER_ASSERT(reporter, match);
     }
 
-    for (size_t size = 1; size <= 512; size += 1) {
+    for (uint32_t size = 1; size <= 512; size += 1) {
         for (int n = 100; n; n--) {
             uint8_t src[600], src2[600];
             uint8_t dst[600];
             rand_fill(src, size);
 
             size_t dstSize = SkPackBits::Pack8(src, size, dst);
             size_t maxSize = SkPackBits::ComputeMaxSize8(size);
             REPORTER_ASSERT(reporter, maxSize >= dstSize);
 
             size_t srcCount = SkPackBits::Unpack8(dst, dstSize, src2);
             REPORTER_ASSERT(reporter, size == srcCount);
             bool match = memcmp(src, src2, size * sizeof(uint8_t)) == 0;
             REPORTER_ASSERT(reporter, match);
 
             for (int j = 0; j < 100; j++) {
-                size_t skip = gRand.nextU() % size;
-                size_t write = gRand.nextU() % size;
+                uint32_t skip = gRand.nextU() % size;
+                uint32_t write = gRand.nextU() % size;
                 if (skip + write > size) {
                     write = size - skip;
                 }
                 SkPackBits::Unpack8(src, skip, write, dst);
                 bool match = memcmp(src, src2 + skip, write) == 0;
                 REPORTER_ASSERT(reporter, match);
             }
         }
     }
 }
 
 DEF_TEST(PackBits, reporter) {
     test_pack8(reporter);
     test_pack16(reporter);
 }