Revert "Slipping in a small bug fix for my previous patch"
This reverts commit 1908ef0441e37c98b00ffe6c0a89d247393aeead.
git-svn-id: http://skia.googlecode.com/svn/trunk@10215 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/bbh_shootout.cpp b/tools/bbh_shootout.cpp
index ca29586..d86e5ff 100644
--- a/tools/bbh_shootout.cpp
+++ b/tools/bbh_shootout.cpp
@@ -265,7 +265,7 @@
int argc,
char **argv,
const BenchmarkControl& benchControl,
- Histogram* histogram) {
+ Histogram** histogram) {
static const SkString timeFormat("%f");
TimerData timerData(timeFormat, timeFormat);
@@ -280,8 +280,8 @@
benchControl.fFunction(benchControl.fType, benchControl.fTileSize, path, pic, &timer);
timerData.appendTimes(&timer, argc - 1 == index);
- histogram[index - 1].fPath = path;
- histogram[index - 1].fCpuTime = SkDoubleToScalar(timer.fCpu);
+ histogram[index - 1]->fPath = path;
+ histogram[index - 1]->fCpuTime = SkDoubleToScalar(timer.fCpu);
}
const SkString timerResult = timerData.getResult(
@@ -321,13 +321,14 @@
return -1;
}
- Histogram histograms[argc - 1][kNumBenchmarks];
+ Histogram* histograms[kNumBenchmarks];
for (size_t i = 0; i < kNumBenchmarks; ++i) {
+ histograms[i] = SkNEW_ARRAY(Histogram, argc - 1);
bool success = benchmark_loop(
argc, argv,
BenchmarkControl::Make(i),
- histograms[i]);
+ &histograms[i]);
if (!success) {
SkDebugf("benchmark_loop failed at index %d", i);
}