diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-24 06:26:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-24 06:26:27 +0000 |
| commit | d04aaf626da8aea7f8f18341499e0b51a60e4d32 (patch) | |
| tree | f072c9f6139629acf8f79788529390288745f5a6 /src | |
| parent | 26f23e62096eb50344815e1b066e9a1efb629bb0 (diff) | |
| parent | 9e52a04b99ec1ebb943d1ccb2531d733af5cfedb (diff) | |
| download | android_packages_apps_Gallery2-d04aaf626da8aea7f8f18341499e0b51a60e4d32.tar.gz android_packages_apps_Gallery2-d04aaf626da8aea7f8f18341499e0b51a60e4d32.tar.bz2 android_packages_apps_Gallery2-d04aaf626da8aea7f8f18341499e0b51a60e4d32.zip | |
Merge "Fix crash in caching pipeline" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
| -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; |