BBHs: void* data -> unsigned data

bench/RTreeBench.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "SkCanvas.h"
@@ skipping 33 matching lines @@
         fTree->unref();
     }
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkRandom rand;
         for (int i = 0; i < loops; ++i) {
             for (int j = 0; j < NUM_BUILD_RECTS; ++j) {
-                fTree->insert(reinterpret_cast<void*>(j), fProc(rand, j, NUM_BUILD_RECTS),
-                              fBulkLoad);
+                fTree->insert(j, fProc(rand, j, NUM_BUILD_RECTS), fBulkLoad);
             }
             fTree->flushDeferredInserts();
             fTree->clear();
         }
     }
 private:
     SkBBoxHierarchy* fTree;
     MakeRectProc fProc;
     SkString fName;
     bool fBulkLoad;
@@ skipping 31 matching lines @@
     virtual ~RTreeQueryBench() {
         fTree->unref();
     }
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
     virtual void onPreDraw() SK_OVERRIDE {
         SkRandom rand;
         for (int j = 0; j < NUM_QUERY_RECTS; ++j) {
-            fTree->insert(reinterpret_cast<void*>(j),
-                          fProc(rand, j, NUM_QUERY_RECTS),
-                          fBulkLoad);
+            fTree->insert(j, fProc(rand, j, NUM_QUERY_RECTS), fBulkLoad);
         }
         fTree->flushDeferredInserts();
     }
 
     virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkRandom rand;
         for (int i = 0; i < loops; ++i) {
-            SkTDArray<void*> hits;
+            SkTDArray<unsigned> hits;
             SkRect query;
             switch(fQuery) {
                 case kSmall_QueryType:
                     query.fLeft   = rand.nextRangeF(0, GENERATE_EXTENTS);
                     query.fTop    = rand.nextRangeF(0, GENERATE_EXTENTS);
                     query.fRight  = query.fLeft + (GENERATE_EXTENTS / 20);
                     query.fBottom = query.fTop  + (GENERATE_EXTENTS / 20);
                     break;
                 case kLarge_QueryType:
                     query.fLeft   = rand.nextRangeF(0, GENERATE_EXTENTS);
@@ skipping 132 matching lines @@
                       &make_concentric_rects_increasing, true, SkRTree::Create(5, 16, 1, false)));
 )
 DEF_BENCH(
     return SkNEW_ARGS(RTreeQueryBench, ("concentric", &make_concentric_rects_increasing, true,
                       RTreeQueryBench::kRandom_QueryType, SkRTree::Create(5, 16)));
 )
 DEF_BENCH(
     return SkNEW_ARGS(RTreeQueryBench, ("(unsorted)concentric", &make_concentric_rects_increasing, true,
                       RTreeQueryBench::kRandom_QueryType, SkRTree::Create(5, 16, 1, false)));
 )