am 3871fdb9: Merge "Fix unpremul setting in BitmapRegionDecoder." into klp-dev

* commit '3871fdb966846d9026500696e48ccc64349eedb4':
  Fix unpremul setting in BitmapRegionDecoder.
This commit is contained in:
Leon Scroggins III
2013-08-26 15:05:15 -07:00
committed by Android Git Automerger

View File

@@ -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);