Fix rtree bench

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 "SkBenchmark.h"
 #include "SkCanvas.h"
@@ skipping 150 matching lines @@
 
 static inline SkIRect make_concentric_rects_decreasing(SkMWCRandom&, int index, int numRects) {
     SkIRect out = {0, 0, numRects - index, numRects - index};
     return out;
 }
 
 static inline SkIRect make_XYordered_rects(SkMWCRandom& rand, int index, int numRects) {
     SkIRect out;
     out.fLeft = index % GRID_WIDTH;
     out.fTop = index / GRID_WIDTH;
-    out.fRight  = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
-    out.fBottom = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fRight  = fLeft + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fBottom = fTop + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
     return out;
 }
 static inline SkIRect make_YXordered_rects(SkMWCRandom& rand, int index, int numRects) {
     SkIRect out;
     out.fLeft = index / GRID_WIDTH;
     out.fTop = index % GRID_WIDTH;
-    out.fRight  = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
-    out.fBottom = 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fRight  = fLeft + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
+    out.fBottom = fTop + 1 + rand.nextU() % (GENERATE_EXTENTS / 3);
     return out;
 }
 
 static inline SkIRect make_point_rects(SkMWCRandom& rand, int index, int numRects) {
     SkIRect out;
     out.fLeft   = rand.nextU() % GENERATE_EXTENTS;
     out.fTop    = rand.nextU() % GENERATE_EXTENTS;
     out.fRight  = out.fLeft + (GENERATE_EXTENTS / 200);
     out.fBottom = out.fTop + (GENERATE_EXTENTS / 200);
     return out;
@@ skipping 112 matching lines @@
 static BenchRegistry gReg8(Fact8);
 static BenchRegistry gReg7(Fact7);
 static BenchRegistry gReg6(Fact6);
 static BenchRegistry gReg5(Fact5);
 static BenchRegistry gReg4(Fact4);
 static BenchRegistry gReg3(Fact3);
 static BenchRegistry gReg2(Fact2);
 static BenchRegistry gReg1(Fact1);
 static BenchRegistry gReg0(Fact0);