Fix potential crash

(regression introduced with fix for 7406402)

bug:7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
index a310358..1d198e4 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
@@ -51,6 +51,9 @@ public class ImageFilterBorder extends ImageFilter {
         if (!isBorderFilter) {
             return false;
         }
+        if (!(filter instanceof ImageFilterBorder)) {
+            return false;
+        }
         ImageFilterBorder borderFilter = (ImageFilterBorder) filter;
         if (mNinePatch != borderFilter.mNinePatch) {
             return false;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
index 3d69546..ade3cb2 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java
@@ -56,6 +56,9 @@ public class ImageFilterParametricBorder extends ImageFilter {
         if (!isBorderFilter) {
             return false;
         }
+        if (!(filter instanceof ImageFilterParametricBorder)) {
+            return false;
+        }
         ImageFilterParametricBorder borderFilter = (ImageFilterParametricBorder) filter;
         if (borderFilter.mBorderColor != mBorderColor) {
             return false;