summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-02-13 11:23:56 -0800
committernicolasroard <nicolasroard@google.com>2013-02-13 11:25:07 -0800
commitdf95aa00f20a521a9eb830548d0bda6869a8704b (patch)
treef28cf20a7db722d920ea2f499469553bc32cfca7 /src
parent835173d0e6fd90a8298d28f7688fa1bb5cb80c64 (diff)
downloadandroid_packages_apps_Snap-df95aa00f20a521a9eb830548d0bda6869a8704b.tar.gz
android_packages_apps_Snap-df95aa00f20a521a9eb830548d0bda6869a8704b.tar.bz2
android_packages_apps_Snap-df95aa00f20a521a9eb830548d0bda6869a8704b.zip
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java5
-rw-r--r--src/com/android/gallery3d/filtershow/presets/ImagePreset.java3
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;