Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-02 02:55:28 -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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/src/main/java/com/twelvemonkeys/contrib/tiff/TIFFUtilities.java
View File

@ -46,7 +46,9 @@ import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
import java.awt.*;
import java.awt.geom.AffineTransform;
import java.awt.image.AffineTransformOp;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@ -261,7 +263,7 @@ public class TIFFUtilities {
orientationTransform.translate(-cW, -cH);
break;
case TIFFExtension.ORIENTATION_BOTRIGHT:
// rotated 180<EFBFBD>
// rotated 180
orientationTransform.quadrantRotate(2, cW, cH);
break;
case TIFFExtension.ORIENTATION_BOTLEFT:
@ -278,7 +280,7 @@ public class TIFFUtilities {
flipExtends = true;
break;
case TIFFExtension.ORIENTATION_RIGHTTOP:
// rotated 90<EFBFBD>
// rotated 90
orientationTransform.quadrantRotate(1, cW, cH);
flipExtends = true;
break;
@ -290,7 +292,7 @@ public class TIFFUtilities {
flipExtends = true;
break;
case TIFFExtension.ORIENTATION_LEFTBOT:
// rotated 270<EFBFBD>
// rotated 270
orientationTransform.quadrantRotate(3, cW, cH);
flipExtends = true;
break;
@ -307,12 +309,9 @@ public class TIFFUtilities {
}
AffineTransform transform = AffineTransform.getTranslateInstance((newW - w) / 2.0, (newH - h) / 2.0);
transform.concatenate(orientationTransform);
BufferedImage output = new BufferedImage(newW, newH, input.getType());
((Graphics2D) output.getGraphics()).drawImage(input, transform, null);
return output;
transform.concatenate(orientationTransform);
AffineTransformOp transformOp = new AffineTransformOp(transform, null);
return transformOp.filter(input, null);
}
public static class TIFFPage {