diff options
| -rw-r--r-- | bench/AAClipBench.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkBitmapProcState.cpp | 2 | ||||
| -rw-r--r-- | src/lazy/SkLazyPixelRef.cpp | 8 | ||||
| -rw-r--r-- | tests/ImageFilterTest.cpp | 26 |
4 files changed, 17 insertions, 20 deletions
diff --git a/bench/AAClipBench.cpp b/bench/AAClipBench.cpp index 856411ddc9..dfdae8e809 100644 --- a/bench/AAClipBench.cpp +++ b/bench/AAClipBench.cpp @@ -255,4 +255,3 @@ DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, false)); ) DEF_BENCH( return SkNEW_ARGS(AAClipBench, (true, true)); ) DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (false)); ) DEF_BENCH( return SkNEW_ARGS(NestedAAClipBench, (true)); ) - diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp index 9ecfc2280b..2b0e557610 100644 --- a/src/core/SkBitmapProcState.cpp +++ b/src/core/SkBitmapProcState.cpp @@ -332,7 +332,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) { return false; } } - + SkASSERT(fBitmap); bool trivialMatrix = (fInvMatrix.getType() & ~SkMatrix::kTranslate_Mask) == 0; diff --git a/src/lazy/SkLazyPixelRef.cpp b/src/lazy/SkLazyPixelRef.cpp index 870056091f..9e023c4a7c 100644 --- a/src/lazy/SkLazyPixelRef.cpp +++ b/src/lazy/SkLazyPixelRef.cpp @@ -178,15 +178,15 @@ bool SkLazyPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) { if (fErrorInDecoding) { return false; } - + SkBitmapFactory::Target target; (void)ComputeMinRowBytesAndSize(info, &target.fRowBytes); - + SkBitmap tmp; if (!init_from_info(&tmp, info, target.fRowBytes)) { return false; } - + target.fAddr = tmp.getPixels(); fErrorInDecoding = !fDecodeProc(fData->data(), fData->size(), &info, &target); if (fErrorInDecoding) { @@ -196,5 +196,3 @@ bool SkLazyPixelRef::onDecodeInto(int pow2, SkBitmap* bitmap) { *bitmap = tmp; return true; } - - diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 903741ca53..99b5a72866 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -37,20 +37,20 @@ public: for (int x = 0; x < kBitmapSize; x += i) { canvas.save(); canvas.translate(SkIntToScalar(x), SkIntToScalar(y)); - canvas.drawRect(SkRect::MakeXYWH(0, 0, - SkIntToScalar(i), + canvas.drawRect(SkRect::MakeXYWH(0, 0, + SkIntToScalar(i), SkIntToScalar(i)), darkPaint); - canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(i), - 0, - SkIntToScalar(i), + canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(i), + 0, + SkIntToScalar(i), SkIntToScalar(i)), lightPaint); - canvas.drawRect(SkRect::MakeXYWH(0, - SkIntToScalar(i), - SkIntToScalar(i), + canvas.drawRect(SkRect::MakeXYWH(0, + SkIntToScalar(i), + SkIntToScalar(i), SkIntToScalar(i)), lightPaint); - canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(i), - SkIntToScalar(i), - SkIntToScalar(i), + canvas.drawRect(SkRect::MakeXYWH(SkIntToScalar(i), + SkIntToScalar(i), + SkIntToScalar(i), SkIntToScalar(i)), darkPaint); canvas.restore(); } @@ -129,14 +129,14 @@ public: SkPoint3 target(location.fX, location.fY, location.fZ); // 3 ) large negative specular exponent value SkScalar specularExponent = SkFloatToScalar(-1000); - + SkPaint paint; paint.setImageFilter(SkLightingImageFilter::CreateSpotLitSpecular( location, target, specularExponent, SkFloatToScalar(180), 0xFFFFFFFF, SK_Scalar1, SK_Scalar1, SK_Scalar1, new SkBitmapSource(bitmap)))->unref(); SkCanvas canvas(result); - SkRect r = SkRect::MakeWH(SkIntToScalar(kBitmapSize), + SkRect r = SkRect::MakeWH(SkIntToScalar(kBitmapSize), SkIntToScalar(kBitmapSize)); canvas.drawRect(r, paint); } |