diff options
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
5 files changed, 17 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java index 666eff99e..58c6f6fde 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMetadata.java @@ -242,18 +242,20 @@ public class GeometryMetadata { public Matrix buildTotalXform(float pwidth, float pheight, float cwidth, float cheight, float cleft, float ctop, float rotation, float straighten, float scale, RectF dst) { - Matrix m = getFlipMatrix(pwidth, pheight); - m.postRotate(rotation + straighten, pwidth / 2, pheight / 2); - Matrix m1 = new Matrix(); - m1.setRotate(rotation, pwidth / 2, pheight / 2); + float s_pwidth = pwidth * scale; + float s_pheight = pheight * scale; + Matrix m = getFlipMatrix(s_pwidth, s_pheight); + m.postRotate(rotation + straighten, s_pwidth / 2, s_pheight / 2); + Matrix m1 = getFlipMatrix(s_pwidth, s_pheight); + m1.postRotate(rotation, s_pwidth / 2, s_pheight / 2); // find new top left for crop. - RectF crop = new RectF(cleft, ctop, cleft + cwidth, ctop + cheight); + RectF crop = new RectF(cleft * scale, ctop * scale, (cleft + cwidth) * scale, + (ctop + cheight) * scale); if (!m1.mapRect(crop)) return null; if (dst != null) dst.set(crop); m.postTranslate(-crop.left, -crop.top); - m.postScale(scale, scale); return m; } } diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java index a57868ce9..c740977bb 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java @@ -87,7 +87,7 @@ public class ImageCrop extends ImageGeometry { @Override public String getName() { - return "Crop"; + return getContext().getString(R.string.crop); } private boolean switchCropBounds(int moving_corner, RectF dst) { diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java index f6cd9b7e2..931ef86d2 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageFlip.java @@ -23,6 +23,7 @@ import android.graphics.Paint; import android.graphics.RectF; import android.util.AttributeSet; +import com.android.gallery3d.R; import com.android.gallery3d.filtershow.imageshow.GeometryMetadata.FLIP; public class ImageFlip extends ImageGeometry { @@ -42,7 +43,7 @@ public class ImageFlip extends ImageGeometry { @Override public String getName() { - return "Mirror"; + return getContext().getString(R.string.mirror); } @Override diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java index c88e51d76..0d458ca45 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageRotate.java @@ -22,6 +22,8 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.util.AttributeSet; +import com.android.gallery3d.R; + public class ImageRotate extends ImageGeometry { private float mBaseAngle = 0; @@ -40,7 +42,7 @@ public class ImageRotate extends ImageGeometry { @Override public String getName() { - return "Rotation"; + return getContext().getString(R.string.rotate); } private static final Paint gPaint = new Paint(); diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java index 4f29c0f81..0f70b23ed 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageStraighten.java @@ -24,6 +24,8 @@ import android.graphics.Path; import android.graphics.RectF; import android.util.AttributeSet; +import com.android.gallery3d.R; + public class ImageStraighten extends ImageGeometry { private float mBaseAngle = 0; @@ -42,7 +44,7 @@ public class ImageStraighten extends ImageGeometry { @Override public String getName() { - return "Straighten"; + return getContext().getString(R.string.straighten); } @Override |