2 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java
index a310358ce..1d198e45c 100644
--- 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 3d6954691..ade3cb26b 100644
--- 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;