From 0a624bb8db70f1e71ca511756b886c68f32fedbe Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Wed, 28 Nov 2012 22:14:20 -0800
Subject: [PATCH] Fix potential crash (regression introduced with fix for
 7406402)

bug:7406402
Change-Id: I7ba92b4cb4fe2976583eba54a5bd25a29eae9d5c
---
 src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java    | 3 +++
 .../gallery3d/filtershow/filters/ImageFilterParametricBorder.java      | 3 +++
 2 files changed, 6 insertions(+)

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;
-- 
2.11.0