From f024156f35ecfe1c8104eb871b27ae7ce3dca669 Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Tue, 19 Mar 2013 14:46:17 -0700
Subject: Fix some startup issues, performance issues on ICS

Change-Id: Iccbcc5a78bf4feb5614e1c420022ef8440606baf
---
 .../filtershow/imageshow/GeometryMetadata.java       | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java')

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
-- 
cgit v1.2.3