summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2013-02-28 06:00:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-28 06:00:05 +0000
commit1a07da3cd8060d49afabd11df33044ff9d05b48e (patch)
treed5a58a682e4911c7fe1698643e9389a1d1e091d3 /src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
parentec5da88505d9b3c1562b13ce8448bc1a6b02ed27 (diff)
downloadandroid_packages_apps_Snap-1a07da3cd8060d49afabd11df33044ff9d05b48e.tar.gz
android_packages_apps_Snap-1a07da3cd8060d49afabd11df33044ff9d05b48e.tar.bz2
android_packages_apps_Snap-1a07da3cd8060d49afabd11df33044ff9d05b48e.zip
Revert "Cleanup ImagePreset"
This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01 Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/MasterImage.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index f3ac2e472..8a505fd4e 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -234,7 +234,8 @@ public class MasterImage implements RenderingRequestCaller {
public void updatePresets(boolean force) {
if (force || mGeometryOnlyPreset == null) {
ImagePreset newPreset = new ImagePreset(mPreset);
- newPreset.resetFilters();
+ newPreset.setDoApplyFilters(false);
+ newPreset.setDoApplyGeometry(true);
if (force || mGeometryOnlyPreset == null
|| !newPreset.same(mGeometryOnlyPreset)) {
mGeometryOnlyPreset = newPreset;
@@ -244,7 +245,8 @@ public class MasterImage implements RenderingRequestCaller {
}
if (force || mFiltersOnlyPreset == null) {
ImagePreset newPreset = new ImagePreset(mPreset);
- newPreset.resetGeometry();
+ newPreset.setDoApplyFilters(true);
+ newPreset.setDoApplyGeometry(false);
if (force || mFiltersOnlyPreset == null
|| !newPreset.same(mFiltersOnlyPreset)) {
mFiltersOnlyPreset = newPreset;
@@ -400,5 +402,4 @@ public class MasterImage implements RenderingRequestCaller {
mTranslation.y = 0;
needsUpdateFullResPreview();
}
-
}