Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev

2012-04-26 13:37:11 -07:00
parent 002f53770a 8f8d9fb52c
commit dcb1eab429
1 changed files with 1 additions and 0 deletions
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -322,6 +322,7 @@ static jobject doDecode(JNIEnv* env, SkStream* stream, jobject padding,
        const float sy = scaledHeight / float(decoded->height());

        bitmap->setConfig(decoded->getConfig(), scaledWidth, scaledHeight);
+        bitmap->setIsOpaque(decoded->isOpaque());
        bitmap->allocPixels(&javaAllocator, NULL);
        bitmap->eraseColor(0);