Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-05-01 00:00:02 -04:00
Code Issues Projects Releases Wiki Activity

TIFFUtilities.applyOrientation: Switch to AffineTrandformOp for executing the transformation.

Browse Source
This commit is contained in:
Schmidor
2016-01-13 00:17:32 +01:00
parent d9ba98fb8e
commit 342dbe7d83
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/src/main/java/com/twelvemonkeys/contrib/tiff/TIFFUtilities.java
+8 -9
View File
@@ -46,7 +46,9 @@ import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream; import javax.imageio.stream.ImageOutputStream;
import java.awt.*; import java.awt.*;
import java.awt.geom.AffineTransform; import java.awt.geom.AffineTransform;
import java.awt.image.AffineTransformOp;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@@ -261,7 +263,7 @@ public class TIFFUtilities {
orientationTransform.translate(-cW, -cH); orientationTransform.translate(-cW, -cH);
break; break;
case TIFFExtension.ORIENTATION_BOTRIGHT: case TIFFExtension.ORIENTATION_BOTRIGHT:
// rotated 180� // rotated 180
orientationTransform.quadrantRotate(2, cW, cH); orientationTransform.quadrantRotate(2, cW, cH);
break; break;
case TIFFExtension.ORIENTATION_BOTLEFT: case TIFFExtension.ORIENTATION_BOTLEFT:
@@ -278,7 +280,7 @@ public class TIFFUtilities {
flipExtends = true; flipExtends = true;
break; break;
case TIFFExtension.ORIENTATION_RIGHTTOP: case TIFFExtension.ORIENTATION_RIGHTTOP:
// rotated 90� // rotated 90
orientationTransform.quadrantRotate(1, cW, cH); orientationTransform.quadrantRotate(1, cW, cH);
flipExtends = true; flipExtends = true;
break; break;
@@ -290,7 +292,7 @@ public class TIFFUtilities {
flipExtends = true; flipExtends = true;
break; break;
case TIFFExtension.ORIENTATION_LEFTBOT: case TIFFExtension.ORIENTATION_LEFTBOT:
// rotated 270� // rotated 270
orientationTransform.quadrantRotate(3, cW, cH); orientationTransform.quadrantRotate(3, cW, cH);
flipExtends = true; flipExtends = true;
break; break;
@@ -307,12 +309,9 @@ public class TIFFUtilities {
} }
AffineTransform transform = AffineTransform.getTranslateInstance((newW - w) / 2.0, (newH - h) / 2.0); AffineTransform transform = AffineTransform.getTranslateInstance((newW - w) / 2.0, (newH - h) / 2.0);
transform.concatenate(orientationTransform); transform.concatenate(orientationTransform);
AffineTransformOp transformOp = new AffineTransformOp(transform, null);
BufferedImage output = new BufferedImage(newW, newH, input.getType()); return transformOp.filter(input, null);
((Graphics2D) output.getGraphics()).drawImage(input, transform, null);
return output;
} }
public static class TIFFPage { public static class TIFFPage {