| Index: bench/BitmapScaleBench.cpp
|
| diff --git a/bench/BitmapScaleBench.cpp b/bench/BitmapScaleBench.cpp
|
| index 62f8d1b6328bbbc830a9ceefe80fc6513d7bca60..cc2a33a894944eee279214c94d86412c47df10ec 100644
|
| --- a/bench/BitmapScaleBench.cpp
|
| +++ b/bench/BitmapScaleBench.cpp
|
| @@ -20,7 +20,7 @@ class BitmapScaleBench: public SkBenchmark {
|
| SkString fName;
|
|
|
| public:
|
| - BitmapScaleBench(void *param, int is, int os) : INHERITED(param) {
|
| + BitmapScaleBench( int is, int os) {
|
| fInputSize = is;
|
| fOutputSize = os;
|
|
|
| @@ -88,7 +88,7 @@ private:
|
|
|
| class BitmapFilterScaleBench: public BitmapScaleBench {
|
| public:
|
| - BitmapFilterScaleBench(void *param, int is, int os) : INHERITED(param, is, os) {
|
| + BitmapFilterScaleBench( int is, int os) : INHERITED(is, os) {
|
| setName( "filter" );
|
| }
|
| protected:
|
| @@ -103,12 +103,12 @@ private:
|
| typedef BitmapScaleBench INHERITED;
|
| };
|
|
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 10, 90);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 30, 90);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 80, 90);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 90);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 80);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 30);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 90, 10);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 256, 64);)
|
| -DEF_BENCH(return new BitmapFilterScaleBench(p, 64, 256);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(10, 90);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(30, 90);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(80, 90);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(90, 90);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(90, 80);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(90, 30);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(90, 10);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(256, 64);)
|
| +DEF_BENCH(return new BitmapFilterScaleBench(64, 256);)
|
|
|