diff options
author | nicolasroard <nicolasroard@google.com> | 2013-02-13 11:23:56 -0800 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-02-13 11:25:07 -0800 |
commit | bfa696afec98657e7fa321522d60fcc514ff2637 (patch) | |
tree | 69dd78c8e5ce45d0bb577bc3849464e6a5855a33 /src | |
parent | 94327736e3e16d5d7c8dae084c09b8e41496dd03 (diff) | |
download | android_packages_apps_Snap-bfa696afec98657e7fa321522d60fcc514ff2637.tar.gz android_packages_apps_Snap-bfa696afec98657e7fa321522d60fcc514ff2637.tar.bz2 android_packages_apps_Snap-bfa696afec98657e7fa321522d60fcc514ff2637.zip |
Pass the ImagePreset to ImageFilter
Change-Id: I4c195a5eb6055c3bb43fed60e76751ed133ab725
Diffstat (limited to 'src')
3 files changed, 5 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/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java index 00499cb74..256f5d671 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java @@ -54,6 +54,10 @@ public class ImageFilter implements Cloneable { return mImagePreset; } + public void setImagePreset(ImagePreset imagePreset) { + mImagePreset = imagePreset; + } + public void useRepresentation(FilterRepresentation representation) { } 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; |