Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d9b166b authored Nov 28, 2012 by nicolasroard Committed by Android Git Automerger Nov 28, 2012

am 466f3d9b: am 0a624bb8: Fix potential crash (regression introduced with fix for 7406402)

* commit '466f3d9b':
  Fix potential crash (regression introduced with fix for 7406402)

parents 92b91af5 466f3d9b

src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,9 @@ public class ImageFilterBorder extends ImageFilter {
	if (!isBorderFilter) {		if (!isBorderFilter) {
	return false;		return false;
	}		}
			if (!(filter instanceof ImageFilterBorder)) {
			return false;
			}
	ImageFilterBorder borderFilter = (ImageFilterBorder) filter;		ImageFilterBorder borderFilter = (ImageFilterBorder) filter;
	if (mNinePatch != borderFilter.mNinePatch) {		if (mNinePatch != borderFilter.mNinePatch) {
	return false;		return false;

src/com/android/gallery3d/filtershow/filters/ImageFilterParametricBorder.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,9 @@ public class ImageFilterParametricBorder extends ImageFilter {
	if (!isBorderFilter) {		if (!isBorderFilter) {
	return false;		return false;
	}		}
			if (!(filter instanceof ImageFilterParametricBorder)) {
			return false;
			}
	ImageFilterParametricBorder borderFilter = (ImageFilterParametricBorder) filter;		ImageFilterParametricBorder borderFilter = (ImageFilterParametricBorder) filter;
	if (borderFilter.mBorderColor != mBorderColor) {		if (borderFilter.mBorderColor != mBorderColor) {
	return false;		return false;