2 files changed, 4 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
index adb6922ea..647b101a1 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java
@@ -107,9 +107,6 @@ public class GeometryMetadata extends FilterRepresentation {
     }
 
     public void set(GeometryMetadata g) {
-        if (g == null) {
-            return;
-        }
         mScaleFactor = g.mScaleFactor;
         mRotation = g.mRotation;
         mStraightenRotation = g.mStraightenRotation;
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();
     }
-
 }