From 1a07da3cd8060d49afabd11df33044ff9d05b48e Mon Sep 17 00:00:00 2001
From: Nicolas Roard <nicolasroard@google.com>
Date: Thu, 28 Feb 2013 06:00:05 +0000
Subject: Revert "Cleanup ImagePreset"

This reverts commit 0f0765676e5be73c7187a44ee88e500ab691bf01

Change-Id: Id5a7eec61cdac3d57c8c4c790d24adf258410545
---
 src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')

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();
     }
-
 }
-- 
cgit v1.2.3