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

Commit 6e9123a6 authored Nov 28, 2012 by nicolasroard Committed by Android (Google) Code Review Nov 28, 2012

Merge "Fix flashing in geometry panel" into gb-ub-photos-arches

parents 68e4ae64 78cabea7

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -130,6 +130,9 @@ public class ImageFilter implements Cloneable {
		}

		public boolean same(ImageFilter filter) {
		if (filter == null) {
		return false;
		}
		if (!filter.getName().equalsIgnoreCase(getName())) {
		return false;
		}

src/com/android/gallery3d/filtershow/presets/ImagePreset.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,7 @@ public class ImagePreset {
		return false;
		}

		if (mImageBorder != preset.mImageBorder) {
		if (mDoApplyGeometry && mImageBorder != preset.mImageBorder) {
		return false;
		}

		@@ -292,7 +292,7 @@ public class ImagePreset {
		}
		}

		if (mImageBorder != null) {
		if (mImageBorder != null && mDoApplyGeometry) {
		bitmap = mImageBorder.apply(bitmap, mScaleFactor, mIsHighQuality);
		}