BBHs: void* data -> unsigned data

src/core/SkRTree.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkRTree_DEFINED
 #define SkRTree_DEFINED
@@ skipping 45 matching lines @@
      * better proportioned tiles of rectangles.
      */
     static SkRTree* Create(int minChildren, int maxChildren, SkScalar aspectRatio = 1,
             bool orderWhenBulkLoading = true);
     virtual ~SkRTree();
 
     /**
      * Insert a node, consisting of bounds and a data value into the tree, if we don't immediately
      * need to use the tree; we may allow the insert to be deferred (this can allow us to bulk-load
      * a large batch of nodes at once, which tends to be faster and produce a better tree).
-     *  @param data The data value
+     *  @param opIndex The data value
      *  @param bounds The corresponding bounding box
      *  @param defer Can this insert be deferred? (this may be ignored)
      */
-    virtual void insert(void* data, const SkRect& bounds, bool defer = false) SK_OVERRIDE;
+    virtual void insert(unsigned opIndex, const SkRect& bounds, bool defer = false) SK_OVERRIDE;
 
     /**
      * If any inserts have been deferred, this will add them into the tree
      */
     virtual void flushDeferredInserts() SK_OVERRIDE;
 
     /**
      * Given a query rectangle, populates the passed-in array with the elements it intersects
      */
-    virtual void search(const SkRect& query, SkTDArray<void*>* results) const SK_OVERRIDE;
+    virtual void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE;
 
     virtual void clear() SK_OVERRIDE;
     bool isEmpty() const { return 0 == fCount; }
 
     /**
      * Gets the depth of the tree structure
      */
     virtual int getDepth() const SK_OVERRIDE {
         return this->isEmpty() ? 0 : fRoot.fChild.subtree->fLevel + 1;
     }
 
     /**
      * This gets the insertion count (rather than the node count)
      */
     virtual int getCount() const SK_OVERRIDE { return fCount; }
 
-    virtual void rewindInserts() SK_OVERRIDE;
-
 private:
 
     struct Node;
 
     /**
      * A branch of the tree, this may contain a pointer to another interior node, or a data value
      */
     struct Branch {
         union {
             Node* subtree;
-            void* data;
+            unsigned opIndex;
         } fChild;
         SkIRect fBounds;
     };
 
     /**
      * A node in the tree, has between fMinChildren and fMaxChildren (the root is a special case)
      */
     struct Node {
         uint16_t fNumChildren;
         uint16_t fLevel;
@@ skipping 35 matching lines @@
 
     /**
      * Recursively descend the tree to find an insertion position for 'branch', updates
      * bounding boxes on the way up.
      */
     Branch* insert(Node* root, Branch* branch, uint16_t level = 0);
 
     int chooseSubtree(Node* root, Branch* branch);
     SkIRect computeBounds(Node* n);
     int distributeChildren(Branch* children);
-    void search(Node* root, const SkIRect query, SkTDArray<void*>* results) const;
+    void search(Node* root, const SkIRect query, SkTDArray<unsigned>* results) const;
 
     /**
      * This performs a bottom-up bulk load using the STR (sort-tile-recursive) algorithm, this
      * seems to generally produce better, more consistent trees at significantly lower cost than
      * repeated insertions.
      *
      * This consumes the input array.
      *
      * TODO: Experiment with other bulk-load algorithms (in particular the Hilbert pack variant,
      * which groups rects by position on the Hilbert curve, is probably worth a look). There also
@@ skipping 16 matching lines @@
     SkTDArray<Branch> fDeferredInserts;
     SkScalar fAspectRatio;
     bool fSortWhenBulkLoading;
 
     Node* allocateNode(uint16_t level);
 
     typedef SkBBoxHierarchy INHERITED;
 };
 
 #endif