commit 9880607151ca7c2dc6b1a4b9756938bd71913ab5
author bsalomon <bsalomon@google.com> Fri Dec 12 15:11:17 2014 -0800
committer Commit bot <commit-bot@chromium.org> Fri Dec 12 15:11:18 2014 -0800
tree 2f1cd6ca7cb985a7d9e21e9dd250bf8115f278e8
parent b927c3cbff0688954fa66a39a6dd5ef85f0b5d48

Even more win64 warning fixes

Review URL: https://codereview.chromium.org/800993002

tests/PackBitsTest.cpp

diff --git a/tests/PackBitsTest.cpp b/tests/PackBitsTest.cpp
index 2af4f18..ce4e8be 100644
--- a/tests/PackBitsTest.cpp
+++ b/tests/PackBitsTest.cpp
@@ -43,7 +43,7 @@
     }
 
     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);
@@ -52,7 +52,7 @@
         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);
@@ -96,7 +96,7 @@
         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];
@@ -112,8 +112,8 @@
             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;
                 }