diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-05-07 15:09:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-07 15:09:54 -0700 |
| commit | f2911e2fdeda288cdccdba5d8523da8e49ca0d43 (patch) | |
| tree | fb3214dd1cc1bcd8d5a56f3d457f86eb751342ae /src/com | |
| parent | 9a08a17ab4f6def051119ea217961db14d202d1f (diff) | |
| parent | e9e777d2ea2d1b1bf7a1b8a563d9bd1b314ac744 (diff) | |
| download | android_packages_apps_Snap-f2911e2fdeda288cdccdba5d8523da8e49ca0d43.tar.gz android_packages_apps_Snap-f2911e2fdeda288cdccdba5d8523da8e49ca0d43.tar.bz2 android_packages_apps_Snap-f2911e2fdeda288cdccdba5d8523da8e49ca0d43.zip | |
am 6febbfc6: Merge "Avoid rounding errors from cropping uncropped images." into gb-ub-photos-bryce
* commit '6febbfc6c9c2d645f22fb200574fe14fa1201046':
Avoid rounding errors from cropping uncropped images.
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/presets/ImagePreset.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java index fa12f8729..84766958d 100644 --- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java +++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java @@ -203,7 +203,7 @@ public class ImagePreset { } for (int i = 0; i < mFilters.size(); i++) { FilterRepresentation filter = mFilters.elementAt(i); - if (!filter.isNil()) { + if (!filter.isNil() && !filter.getName().equalsIgnoreCase("none")) { return true; } } |