Second wave of Win64 warning cleanup

bench/FontCacheBench.cpp

Index: bench/FontCacheBench.cpp
===================================================================
--- bench/FontCacheBench.cpp	(revision 11775)
+++ bench/FontCacheBench.cpp	(working copy)
@@ -15,7 +15,7 @@
 #include "gUniqueGlyphIDs.h"
 #define gUniqueGlyphIDs_Sentinel    0xFFFF
 
-static int count_glyphs(const uint16_t start[]) {
+static size_t count_glyphs(const uint16_t start[]) {

[bsalomon, 2013/10/15 17:35:20]

this one looks like an int count to me, rest lgtm

[robertphillips, 2013/10/15 17:47:53]

Done.

     const uint16_t* curr = start;
     while (*curr != gUniqueGlyphIDs_Sentinel) {
         curr += 1;
@@ -134,7 +134,7 @@
                     int glyphs = 0;
                     const uint16_t* array = gUniqueGlyphIDs;
                     while (*array != gUniqueGlyphIDs_Sentinel) {
-                        int count = SkMin32(count_glyphs(array), limit);
+                        int count = static_cast<int>(SkTMin<size_t>(count_glyphs(array), limit));
                         collisions += count_collisions(array, count, gRec[i].fHasher, hashMask);
                         glyphs += count;
                         array += count + 1;    // skip the sentinel