diff options
| author | Mike Reed <reed@google.com> | 2014-12-10 18:02:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-10 18:02:12 +0000 |
| commit | d64d68d9c1c56d98e06d86b7438c46b108855c3b (patch) | |
| tree | 2f08bf8b27505b02b7a86a0fc99d34e00afeb6b6 | |
| parent | fe6a5ae92481d52093ae8accfbcda3793816d3ec (diff) | |
| parent | 70ffbf9e8288296ef7009c8297bcb6da6a7f73b2 (diff) | |
| download | frameworks_base-d64d68d9c1c56d98e06d86b7438c46b108855c3b.zip frameworks_base-d64d68d9c1c56d98e06d86b7438c46b108855c3b.tar.gz frameworks_base-d64d68d9c1c56d98e06d86b7438c46b108855c3b.tar.bz2 | |
Merge "drawBitmapMatrix is deprecated, code work-around"
| -rw-r--r-- | core/jni/android/graphics/SkiaCanvas.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/android/graphics/SkiaCanvas.cpp b/core/jni/android/graphics/SkiaCanvas.cpp index c7255a1..793d177 100644 --- a/core/jni/android/graphics/SkiaCanvas.cpp +++ b/core/jni/android/graphics/SkiaCanvas.cpp @@ -562,7 +562,9 @@ void SkiaCanvas::drawBitmap(const SkBitmap& bitmap, float left, float top, const } void SkiaCanvas::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, const SkPaint* paint) { - mCanvas->drawBitmapMatrix(bitmap, matrix, paint); + SkAutoCanvasRestore acr(mCanvas, true); + mCanvas->concat(matrix); + mCanvas->drawBitmap(bitmap, 0, 0, paint); } void SkiaCanvas::drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop, |