diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-08-20 16:02:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-20 16:02:48 -0700 |
| commit | 7a21f20b07c1364a40f9deaecd8bc8a28d98f0ab (patch) | |
| tree | e3c99b3087e62bc82f338b64c205f83a1d4a7cfe | |
| parent | e9224a13bccfdc1fb834533a3c3e364c9caad9e2 (diff) | |
| parent | 901f3aea8c5644c567618410f9062d96d2527e70 (diff) | |
| download | android_packages_apps_Gallery2-7a21f20b07c1364a40f9deaecd8bc8a28d98f0ab.tar.gz android_packages_apps_Gallery2-7a21f20b07c1364a40f9deaecd8bc8a28d98f0ab.tar.bz2 android_packages_apps_Gallery2-7a21f20b07c1364a40f9deaecd8bc8a28d98f0ab.zip | |
am 901f3aea: am 1ee2d47e: am 82f3ed2c: Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
* commit '901f3aea8c5644c567618410f9062d96d2527e70':
Revert to loading 8888 bitmaps
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 5695ef53e..9a494d823 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -184,7 +184,6 @@ public abstract class ImageFilterRS extends ImageFilter { public Allocation loadScaledResourceAlpha(int resource, int inSampleSize) { Resources res = getEnvironment().getPipeline().getResources(); final BitmapFactory.Options options = new BitmapFactory.Options(); - options.inPreferredConfig = Bitmap.Config.ALPHA_8; options.inSampleSize = inSampleSize; Bitmap bitmap = BitmapFactory.decodeResource( res, @@ -197,7 +196,6 @@ public abstract class ImageFilterRS extends ImageFilter { public Allocation loadScaledResourceAlpha(int resource, int w, int h, int inSampleSize) { Resources res = getEnvironment().getPipeline().getResources(); final BitmapFactory.Options options = new BitmapFactory.Options(); - options.inPreferredConfig = Bitmap.Config.ALPHA_8; options.inSampleSize = inSampleSize; Bitmap bitmap = BitmapFactory.decodeResource( res, |