diff options
| author | Derek Sollenberger <djsollen@google.com> | 2015-05-07 19:28:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 19:28:31 +0000 |
| commit | 7b753cf12e471e15a4b1c1b710393b40502a8bb7 (patch) | |
| tree | ac1f9770d0bbd14548f96dfbc8d62858dfeee749 /core | |
| parent | d11ad51d119aaa826d988fbc7f6c626afff00983 (diff) | |
| parent | 2a94a10bec186d832c2b95675cb6dc27b012c2d0 (diff) | |
| download | frameworks_base-7b753cf12e471e15a4b1c1b710393b40502a8bb7.zip frameworks_base-7b753cf12e471e15a4b1c1b710393b40502a8bb7.tar.gz frameworks_base-7b753cf12e471e15a4b1c1b710393b40502a8bb7.tar.bz2 | |
Merge "Update the rowBytes when reconfiguring to match the new imageInfo." into mnc-dev
Diffstat (limited to 'core')
| -rwxr-xr-x | core/jni/android/graphics/Bitmap.cpp | 2 |
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() { |