From: John Hoford <hoford@google.com>
Date: Tue, 16 Oct 2012 19:39:29 +0000 (-0700)
Subject: prevent original now acts like any other FX filter
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~766^2~186
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=20fb632c407a2dfb5ec769560c61deacc77b8764;p=android-x86%2Fpackages-apps-Camera2.git

prevent original now acts like any other FX filter

bug:7353358
Change-Id: Id4efa45ddb8a8a0ca6d201ffc0b45fdd2f3caabf
---

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 656d29aaf..abbd596ab 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -534,8 +534,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         mCurrentImageSmallFilter = filter;
 
         filter.setPreviousImageSmallFilter(null);
-        preset.setIsFx(true);
-        filter.setImagePreset(preset);
+        filter.setImageFilter(new ImageFilterFx(null,ImageFilterFx.ORIG));
 
         filter.setController(this);
         filter.setImageLoader(mImageLoader);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
index 1575b18bb..7d8f41537 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterFx.java
@@ -12,7 +12,7 @@ import java.util.Arrays;
 public class ImageFilterFx extends ImageFilter {
     private static final String TAG = "ImageFilterFx";
     Bitmap fxBitmap;
-
+    public static final String ORIG = "Original";
     public ImageFilterFx(Bitmap fxBitmap,String name) {
         setFilterType(TYPE_FX);
         mName = name;
@@ -29,6 +29,8 @@ public class ImageFilterFx extends ImageFilter {
     native protected void nativeApplyFilter(Bitmap bitmap, int w, int h,Bitmap  fxBitmap, int fxw, int fxh);
 
     public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
+        if (fxBitmap==null)
+            return bitmap;
 
         int w = bitmap.getWidth();
         int h = bitmap.getHeight();