diff options
author | John Hoford <hoford@google.com> | 2013-02-27 08:41:19 -0800 |
---|---|---|
committer | John Hoford <hoford@google.com> | 2013-02-27 17:32:01 -0800 |
commit | 63cc04c3b51d544598c8af5c8c16a29b1e902a26 (patch) | |
tree | 36a75fe6a9765e0c332f840a50d761511ce7b5c2 /src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | |
parent | 7c3ff29f5d187a9f8c660f8571a43f5a91b46836 (diff) | |
download | android_packages_apps_Snap-63cc04c3b51d544598c8af5c8c16a29b1e902a26.tar.gz android_packages_apps_Snap-63cc04c3b51d544598c8af5c8c16a29b1e902a26.tar.bz2 android_packages_apps_Snap-63cc04c3b51d544598c8af5c8c16a29b1e902a26.zip |
refactor the geometry code
Change-Id: I5b0381ec5e127aabf37924af64fbeb490755bc9a
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index 9eafe2236..4ca74300c 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -17,6 +17,7 @@ package com.android.gallery3d.filtershow.imageshow; import android.graphics.*; +import android.util.Log; import com.android.gallery3d.filtershow.FilterShowActivity; import com.android.gallery3d.filtershow.HistoryAdapter; @@ -208,7 +209,8 @@ public class MasterImage implements RenderingRequestCaller { if (force || mGeometryOnlyPreset == null) { ImagePreset newPreset = new ImagePreset(mPreset); newPreset.setDoApplyFilters(false); - if (mGeometryOnlyPreset == null + newPreset.setDoApplyGeometry(true); + if (force || mGeometryOnlyPreset == null || !newPreset.same(mGeometryOnlyPreset)) { mGeometryOnlyPreset = newPreset; RenderingRequest.post(mLoader.getOriginalBitmapLarge(), @@ -217,8 +219,9 @@ public class MasterImage implements RenderingRequestCaller { } if (force || mFiltersOnlyPreset == null) { ImagePreset newPreset = new ImagePreset(mPreset); + newPreset.setDoApplyFilters(true); newPreset.setDoApplyGeometry(false); - if (mFiltersOnlyPreset == null + if (force || mFiltersOnlyPreset == null || !newPreset.same(mFiltersOnlyPreset)) { mFiltersOnlyPreset = newPreset; RenderingRequest.post(mLoader.getOriginalBitmapLarge(), @@ -330,6 +333,7 @@ public class MasterImage implements RenderingRequestCaller { } public void notifyGeometryChange() { + updatePresets(true); for (GeometryListener listener : mGeometryListeners) { listener.geometryChanged(); } |