summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2014-12-08 17:03:30 -0500
committerMike Reed <reed@google.com>2014-12-08 17:03:30 -0500
commit70ffbf9e8288296ef7009c8297bcb6da6a7f73b2 (patch)
treefa454643313db595ce727f47b04479be868cef81
parentdd4b3c74b1d2618b32c4128e9f3445c9284afdda (diff)
downloadframeworks_base-70ffbf9e8288296ef7009c8297bcb6da6a7f73b2.zip
frameworks_base-70ffbf9e8288296ef7009c8297bcb6da6a7f73b2.tar.gz
frameworks_base-70ffbf9e8288296ef7009c8297bcb6da6a7f73b2.tar.bz2
drawBitmapMatrix is deprecated, code work-around
Change-Id: I53d827ecb74c2b131645eaf3edfd748722c5078d
-rw-r--r--core/jni/android/graphics/SkiaCanvas.cpp4
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,