diff options
-rw-r--r-- | bench/DeferredSurfaceCopyBench.cpp | 1 | ||||
-rw-r--r-- | bench/PerlinNoiseBench.cpp | 1 | ||||
-rw-r--r-- | gm/xfermodes2.cpp | 12 |
3 files changed, 6 insertions, 8 deletions
diff --git a/bench/DeferredSurfaceCopyBench.cpp b/bench/DeferredSurfaceCopyBench.cpp index 9c23b671d4..ac58856ed4 100644 --- a/bench/DeferredSurfaceCopyBench.cpp +++ b/bench/DeferredSurfaceCopyBench.cpp @@ -84,4 +84,3 @@ static SkBenchmark* Fact1(void* p) { return new DeferredSurfaceCopyBench(p, true static BenchRegistry gReg0(Fact0); static BenchRegistry gReg1(Fact1); - diff --git a/bench/PerlinNoiseBench.cpp b/bench/PerlinNoiseBench.cpp index 3275302d6a..d151825210 100644 --- a/bench/PerlinNoiseBench.cpp +++ b/bench/PerlinNoiseBench.cpp @@ -57,4 +57,3 @@ private: /////////////////////////////////////////////////////////////////////////////// DEF_BENCH( return new PerlinNoiseBench(p); ) - diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 1ed6cd4867..51c69f6f17 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -98,20 +98,20 @@ private: SkAutoLockPixels bgAlp(bg); memcpy(bg.getPixels(), kCheckData, sizeof(kCheckData)); bg.setIsOpaque(true); - + fBG.reset(SkShader::CreateBitmapShader(bg, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode)); SkMatrix lm; lm.setScale(SkIntToScalar(16), SkIntToScalar(16)); fBG->setLocalMatrix(lm); - + SkBitmap dstBmp; dstBmp.setConfig(SkBitmap::kARGB_8888_Config, kSize, kSize); dstBmp.allocPixels(); SkAutoLockPixels dstAlp(dstBmp); SkPMColor* pixels = reinterpret_cast<SkPMColor*>(dstBmp.getPixels()); - + for (int y = 0; y < kSize; ++y) { int c = y * (1 << kShift); SkPMColor rowColor = SkPackARGB32(c, c, 0, c/2); @@ -127,7 +127,7 @@ private: srcBmp.allocPixels(); SkAutoLockPixels srcAlp(srcBmp); pixels = reinterpret_cast<SkPMColor*>(srcBmp.getPixels()); - + for (int x = 0; x < kSize; ++x) { int c = x * (1 << kShift); SkPMColor colColor = SkPackARGB32(c, 0, c, c/2); @@ -139,12 +139,12 @@ private: SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)); } - + enum { kShift = 2, kSize = 256 >> kShift, }; - + SkAutoTUnref<SkShader> fBG; SkAutoTUnref<SkShader> fSrc; SkAutoTUnref<SkShader> fDst; |