1 files changed, 9 insertions, 8 deletions

diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index ade775d09..698992ac9 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -212,13 +212,13 @@ public class ImageLoader {
             mOriginalBitmapLarge = rotateToPortrait(mOriginalBitmapLarge, mOrientation);
         }
         mZoomOrientation = mOrientation;
-        FilteringPipeline pipeline = FilteringPipeline.getPipeline();
-        pipeline.setOriginal(mOriginalBitmapLarge);
-        float previewScale = (float) mOriginalBitmapLarge.getWidth() / (float) getOriginalBounds().width();
-        pipeline.setPreviewScaleFactor(previewScale);
         warnListeners();
     }
 
+    public Bitmap decodeImage(int id, BitmapFactory.Options options) {
+        return BitmapFactory.decodeResource(mContext.getResources(), id, options);
+    }
+
     public static Bitmap rotateToPortrait(Bitmap bitmap, int ori) {
         Matrix matrix = new Matrix();
         int w = bitmap.getWidth();
@@ -280,7 +280,7 @@ public class ImageLoader {
         return null;
     }
 
-    static final int MAX_BITMAP_DIM = 2048;
+    static final int MAX_BITMAP_DIM = 900;
 
     private Bitmap loadScaledBitmap(Uri uri, int size) {
         InputStream is = null;
@@ -392,7 +392,7 @@ public class ImageLoader {
 
     public void saveImage(ImagePreset preset, final FilterShowActivity filterShowActivity,
             File destination) {
-        preset.setIsHighQuality(true);
+        preset.setQuality(ImagePreset.QUALITY_FINAL);
         preset.setScaleFactor(1.0f);
         new SaveCopyTask(mContext, mUri, destination, new SaveCopyTask.Callback() {
 
@@ -432,7 +432,7 @@ public class ImageLoader {
 
     public void returnFilteredResult(ImagePreset preset,
             final FilterShowActivity filterShowActivity) {
-        preset.setIsHighQuality(true);
+        preset.setQuality(ImagePreset.QUALITY_FINAL);
         preset.setScaleFactor(1.0f);
 
         BitmapTask.Callbacks<ImagePreset> cb = new BitmapTask.Callbacks<ImagePreset>() {
@@ -448,7 +448,7 @@ public class ImageLoader {
 
             @Override
             public Bitmap onExecute(ImagePreset param) {
-                if (param == null) {
+                if (param == null || mUri == null) {
                     return null;
                 }
                 Bitmap bitmap = loadMutableBitmap(mContext, mUri);
@@ -456,6 +456,7 @@ public class ImageLoader {
                     Log.w(LOGTAG, "Failed to save image!");
                     return null;
                 }
+                bitmap = param.applyGeometry(bitmap);
                 return param.apply(bitmap);
             }
         };