diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-23 21:42:02 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-09-23 21:45:04 -0700 |
| commit | 9e52a04b99ec1ebb943d1ccb2531d733af5cfedb (patch) | |
| tree | feef09fbb76a2bc286e6e5cc3abe688ffcbe7e9d /src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | |
| parent | 105fbcf3289491aa4f590057e304fee33f1c88ca (diff) | |
| download | android_packages_apps_Gallery2-9e52a04b99ec1ebb943d1ccb2531d733af5cfedb.tar.gz android_packages_apps_Gallery2-9e52a04b99ec1ebb943d1ccb2531d733af5cfedb.tar.bz2 android_packages_apps_Gallery2-9e52a04b99ec1ebb943d1ccb2531d733af5cfedb.zip | |
Fix crash in caching pipeline
Geometry filters wrongly collapsed with other filters
bug:10903204
Change-Id: Iaee3082e605f4cdaba236df014fb41a4975d05d6
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java index fc83e4f8c..0fb157d7b 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java @@ -271,7 +271,8 @@ public class FilterRepresentation { } public boolean canMergeWith(FilterRepresentation representation) { - if (representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) { + if (getFilterType() == FilterRepresentation.TYPE_GEOMETRY + && representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) { return true; } return false; |