diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-03-19 14:46:17 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-03-19 14:47:40 -0700 |
| commit | f024156f35ecfe1c8104eb871b27ae7ce3dca669 (patch) | |
| tree | d21709a2802363275e7181dd909aaf173666363e /src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java | |
| parent | f3c6bd763c84f5a99f57dffe38a345514583dfb1 (diff) | |
| download | android_packages_apps_Snap-f024156f35ecfe1c8104eb871b27ae7ce3dca669.tar.gz android_packages_apps_Snap-f024156f35ecfe1c8104eb871b27ae7ce3dca669.tar.bz2 android_packages_apps_Snap-f024156f35ecfe1c8104eb871b27ae7ce3dca669.zip | |
Fix some startup issues, performance issues on ICS
Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java index b64cf567e..90099939a 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java @@ -181,19 +181,27 @@ public class GeometryMetadata extends FilterRepresentation { return mPhotoBounds.contains(cropBounds); } + private boolean compareRectF(RectF a, RectF b) { + return ((int) a.left == (int) b.left) + && ((int) a.right == (int) b.right) + && ((int) a.top == (int) b.top) + && ((int) a.bottom == (int) b.bottom); + } + @Override public boolean equals(FilterRepresentation o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) + if (o == null || !(o instanceof GeometryMetadata)) return false; GeometryMetadata d = (GeometryMetadata) o; - return (mScaleFactor == d.mScaleFactor && - mRotation == d.mRotation && - mStraightenRotation == d.mStraightenRotation && - mFlip == d.mFlip && - mCropBounds.equals(d.mCropBounds) && mPhotoBounds.equals(d.mPhotoBounds)); + return (mScaleFactor == d.mScaleFactor + && mRotation == d.mRotation + && mStraightenRotation == d.mStraightenRotation + && mFlip == d.mFlip + && compareRectF(mCropBounds, d.mCropBounds) + && compareRectF(mPhotoBounds, d.mPhotoBounds)); } @Override |