diff options
| author | Nicolas Roard <nicolasroard@google.com> | 2012-10-25 19:21:45 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-25 19:21:46 -0700 |
| commit | 6a03661ca41acfd5f4cc804338d930a024955e4e (patch) | |
| tree | 0f8236eb6ecd72dd7b49a34d2d2013d15f0a03ba /src/com | |
| parent | 73c4d73f5042087d6258ced03124957045567fd7 (diff) | |
| parent | 4684dda756ec425ab1d0058d6294581efeb35ffc (diff) | |
| download | android_packages_apps_Snap-6a03661ca41acfd5f4cc804338d930a024955e4e.tar.gz android_packages_apps_Snap-6a03661ca41acfd5f4cc804338d930a024955e4e.tar.bz2 android_packages_apps_Snap-6a03661ca41acfd5f4cc804338d930a024955e4e.zip | |
Merge "Do not add crop into preset if in inital setup" into gb-ub-photos-arches
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java index f99e61473..6bdc527be 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageGeometry.java @@ -367,11 +367,13 @@ public abstract class ImageGeometry extends ImageSlave { getImagePreset().setGeometry(mLocalGeometry); resetImageCaches(this); } else { - ImagePreset copy = new ImagePreset(getImagePreset()); - copy.setGeometry(mLocalGeometry); - copy.setHistoryName(getName()); - copy.setIsFx(false); - setImagePreset(copy, true); + if (mLocalGeometry.hasModifications()) { + ImagePreset copy = new ImagePreset(getImagePreset()); + copy.setGeometry(mLocalGeometry); + copy.setHistoryName(getName()); + copy.setIsFx(false); + setImagePreset(copy, true); + } } invalidate(); } |