summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2015-05-07 13:56:14 -0400
committerDerek Sollenberger <djsollen@google.com>2015-05-07 14:26:01 -0400
commit2a94a10bec186d832c2b95675cb6dc27b012c2d0 (patch)
tree9f0b6ac17d74b02901195d2c12a01883fad2bf11 /core
parentc7e56e9df155b678e604ad6402150397d2665f95 (diff)
downloadframeworks_base-2a94a10bec186d832c2b95675cb6dc27b012c2d0.zip
frameworks_base-2a94a10bec186d832c2b95675cb6dc27b012c2d0.tar.gz
frameworks_base-2a94a10bec186d832c2b95675cb6dc27b012c2d0.tar.bz2
Update the rowBytes when reconfiguring to match the new imageInfo.
bug: 20872840 Change-Id: Ic98a9d16e095c27ddcc193a18641732c1ee4bad0
Diffstat (limited to 'core')
-rwxr-xr-xcore/jni/android/graphics/Bitmap.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 9babe82..2785c48 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -224,7 +224,7 @@ void Bitmap::reconfigure(const SkImageInfo& info, size_t rowBytes,
}
void Bitmap::reconfigure(const SkImageInfo& info) {
- reconfigure(info, mPixelRef->rowBytes(), mPixelRef->colorTable());
+ reconfigure(info, info.minRowBytes(), nullptr);
}
void Bitmap::detachFromJava() {