Fix geometry xforms & minor bug.

Bug: 7376048

Fixed geometry transform.  Fixed minor bug where the foldername
for saved edited images was incorrect.

Change-Id: I901df11cf71cd987b354dd7821fef7a484b0cbd3

1 files changed, 0 insertions, 19 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
index 2c7ed2dd8..04057681f 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGeometry.java
@@ -63,21 +63,6 @@ public class ImageFilterGeometry extends ImageFilter {
     native protected void nativeApplyFilterStraighten(Bitmap src, int srcWidth, int srcHeight,
             Bitmap dst, int dstWidth, int dstHeight, float straightenAngle);
 
-    public Matrix buildMatrix(RectF r) {
-        float dx = r.width() / 2;
-        float dy = r.height() / 2;
-        if (mGeometry.hasSwitchedWidthHeight()) {
-            float temp = dx;
-            dx = dy;
-            dy = temp;
-        }
-        float w = r.left * 2 + r.width();
-        float h = r.top * 2 + r.height();
-        Matrix m = mGeometry.buildGeometryMatrix(w, h, 1f, dx, dy, false);
-
-        return m;
-    }
-
     @Override
     public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
         // TODO: implement bilinear or bicubic here... for now, just use
@@ -94,16 +79,12 @@ public class ImageFilterGeometry extends ImageFilter {
             temp = Bitmap.createBitmap(cropBounds.width(), cropBounds.height(), mConfig);
         }
 
-        Matrix drawMatrix = buildMatrix(crop);
-        /*
         RectF rp = mGeometry.getPhotoBounds();
         RectF rc = mGeometry.getPreviewCropBounds();
-        // TODO: fix this method instead of calling the above buildMatrix()
         Matrix drawMatrix = mGeometry.buildTotalXform(rp.width(), rp.height(), rc.width(),
                 rc.height(), rc.left, rc.top,
                 mGeometry.getRotation(), mGeometry.getStraightenRotation(),
                 bitmap.getWidth() / rp.width(), null);
-        */
         Canvas canvas = new Canvas(temp);
         Paint paint = new Paint();
         paint.setAntiAlias(true);