summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/filters
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-08-20 22:58:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-20 22:58:10 +0000
commit82f3ed2cec637ce516cf0270dde8f910fe9f78e5 (patch)
treef4d8a213ecbfd6c90eefd7d7b95fee505999c655 /src/com/android/gallery3d/filtershow/filters
parent675948f8f6337fe2873067a74db789d46a41ec36 (diff)
parent1af7be9378009180f7873e177b430dbefae83edc (diff)
downloadandroid_packages_apps_Gallery2-82f3ed2cec637ce516cf0270dde8f910fe9f78e5.tar.gz
android_packages_apps_Gallery2-82f3ed2cec637ce516cf0270dde8f910fe9f78e5.tar.bz2
android_packages_apps_Gallery2-82f3ed2cec637ce516cf0270dde8f910fe9f78e5.zip
Merge "Revert to loading 8888 bitmaps" into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java2
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,