Merge "Pass the ImagePreset to ImageFilter" into gb-ub-photos-bryce

2 files changed, 1 insertions, 7 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index 0aa449303..8ac191de7 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -24,7 +24,6 @@ public class FilterRepresentation implements Cloneable {
     private static final String LOGTAG = "FilterRepresentation";
     private String mName;
     private int mPriority = TYPE_NORMAL;
-    private ImagePreset mPreset;
     private Class mFilterClass;
     private int mTextId = 0;
     private int mEditorId = BasicEditor.ID;
@@ -101,10 +100,6 @@ public class FilterRepresentation implements Cloneable {
         return mPriority;
     }
 
-    public void setImagePreset(ImagePreset preset) {
-        mPreset = preset;
-    }
-
     public boolean isNil() {
         return false;
     }
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 0582b34bc..3ee55ada5 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -76,7 +76,6 @@ public class ImagePreset {
             }
             for (int i = 0; i < source.mFilters.size(); i++) {
                 FilterRepresentation representation = source.mFilters.elementAt(i).clone();
-                representation.setImagePreset(this);
                 addFilter(representation);
             }
         } catch (java.lang.CloneNotSupportedException e) {
@@ -355,7 +354,6 @@ public class ImagePreset {
             mFilters.add(representation);
             setHistoryName(representation.getName());
         }
-        representation.setImagePreset(this);
     }
 
     public FilterRepresentation getRepresentation(FilterRepresentation filterRepresentation) {
@@ -391,6 +389,7 @@ public class ImagePreset {
         if (mBorder != null && mDoApplyGeometry) {
             ImageFilter filter = FiltersManager.getManager().getFilterForRepresentation(mBorder);
             filter.useRepresentation(mBorder);
+            filter.setImagePreset(this);
             bitmap = filter.apply(bitmap, mScaleFactor, mQuality);
         }
         return bitmap;