Second wave of Win64 warning cleanup

bench/FontCacheBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkFontHost.h"
 #include "SkPaint.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 
 #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;
     }
     return curr - start;
 }
 
 class FontCacheBench : public SkBenchmark {
 public:
     FontCacheBench()  {}
@@ skipping 98 matching lines @@
         gDone = true;
 
         for (int hashBits = 6; hashBits <= 12; hashBits += 1) {
             int hashMask = ((1 << hashBits) - 1);
             for (int limit = 32; limit <= 1024; limit <<= 1) {
                 for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
                     int collisions = 0;
                     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
                     }
                     SkDebugf("hashBits [%d] limit [%d] collisions [%d / %d = %1.2g%%] using %s\n", hashBits, limit, collisions, glyphs,
                              collisions * 100.0 / glyphs, gRec[i].fName);
                 }
             }
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new FontCacheBench(); )
 
 // undefine this to run the efficiency test
 //DEF_BENCH( return new FontCacheEfficiency(); )