diff options
author | ztenghui <ztenghui@google.com> | 2013-07-15 16:04:32 -0700 |
---|---|---|
committer | ztenghui <ztenghui@google.com> | 2013-07-15 16:04:32 -0700 |
commit | 9448b353e8cb1936fb62262b8c4962cfd3765bab (patch) | |
tree | ebbd615e368992c6ac80b233d89ab53bc1b86343 /src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | |
parent | d4d6505a75371dbfac01beaa2059e0b2075e990f (diff) | |
download | android_packages_apps_Snap-9448b353e8cb1936fb62262b8c4962cfd3765bab.tar.gz android_packages_apps_Snap-9448b353e8cb1936fb62262b8c4962cfd3765bab.tar.bz2 android_packages_apps_Snap-9448b353e8cb1936fb62262b8c4962cfd3765bab.zip |
Add equality check into FilterCurveRep
Consequently add equality check support in Spline and ControlPoint.
bug:9468909
Change-Id: I8078b994beac4056ca92e76da0e15d618389e56e
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index 08d8c45eb..ed09fb116 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -198,7 +198,7 @@ public class MasterImage implements RenderingRequestCaller { return false; } int sw = SMALL_BITMAP_DIM; - int sh = (int) (sw * (float) mOriginalBitmapLarge.getHeight() / (float) mOriginalBitmapLarge + int sh = (int) (sw * (float) mOriginalBitmapLarge.getHeight() / mOriginalBitmapLarge .getWidth()); mOriginalBitmapSmall = Bitmap.createScaledBitmap(mOriginalBitmapLarge, sw, sh, true); mZoomOrientation = mOrientation; @@ -325,7 +325,7 @@ public class MasterImage implements RenderingRequestCaller { if (loadedPreset == null) { return mPreset.hasModifications(); } else { - return !mPreset.equals(getLoadedPreset()); + return !mPreset.equals(loadedPreset); } } } |