diff options
| author | Leon Scroggins III <scroggo@google.com> | 2013-08-26 20:47:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-26 20:47:23 +0000 |
| commit | 3871fdb966846d9026500696e48ccc64349eedb4 (patch) | |
| tree | c5267c79164763a83b3e594f327e835ee50189cd /core | |
| parent | b2cc1d54aad84293c32c9c1e8727895d160898f9 (diff) | |
| parent | 2cc409ae52a2a50f54195579a000e98f403de9be (diff) | |
| download | frameworks_base-3871fdb966846d9026500696e48ccc64349eedb4.zip frameworks_base-3871fdb966846d9026500696e48ccc64349eedb4.tar.gz frameworks_base-3871fdb966846d9026500696e48ccc64349eedb4.tar.bz2 | |
Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android/graphics/BitmapRegionDecoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index 0c0ebbb..8867a11 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -217,7 +217,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, SkBitmapRegionDecoder *b gOptions_preferQualityOverSpeedFieldID); // Get the bitmap for re-use if it exists. tileBitmap = env->GetObjectField(options, gOptions_bitmapFieldID); - requireUnpremultiplied = env->GetBooleanField(options, gOptions_premultipliedFieldID); + requireUnpremultiplied = !env->GetBooleanField(options, gOptions_premultipliedFieldID); } decoder->setDitherImage(doDither); |