X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fui%2FImageUtilsAwt.java;h=6e9160f5c02f38964e343035d4cda7a7c7f34cff;hb=7b42695f536a88cfc5fed57e98687394e3c42fe9;hp=e1fcac7bd053e8b67d87a8ff5e95edb972bfffd0;hpb=805005449dacb1e7b825db63836bf100e472ddd0;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/ui/ImageUtilsAwt.java b/src/be/nikiroo/utils/ui/ImageUtilsAwt.java
index e1fcac7..6e9160f 100644
--- a/src/be/nikiroo/utils/ui/ImageUtilsAwt.java
+++ b/src/be/nikiroo/utils/ui/ImageUtilsAwt.java
@@ -3,7 +3,6 @@ package be.nikiroo.utils.ui;
 import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +22,7 @@ public class ImageUtilsAwt extends ImageUtils {
 	public void saveAsImage(Image img, File target, String format)
 			throws IOException {
 		try {
-			BufferedImage image = ImageUtilsAwt.fromImage(img);
+			BufferedImage image = fromImage(img);
 
 			boolean ok = false;
 			try {
@@ -34,9 +33,16 @@ public class ImageUtilsAwt extends ImageUtils {
 			}
 
 			// Some formats are not reliable
-			// Second change: PNG
+			// Second chance: PNG
 			if (!ok && !format.equals("png")) {
-				ok = ImageIO.write(image, "png", target);
+				try {
+					ok = ImageIO.write(image, "png", target);
+				} catch (IllegalArgumentException e) {
+					throw e;
+				} catch (Exception e) {
+					throw new IOException("Undocumented exception occured, "
+							+ "converting to IOException", e);
+				}
 			}
 
 			if (!ok) {
@@ -61,81 +67,93 @@ public class ImageUtilsAwt extends ImageUtils {
 	 * @throws IOException
 	 *             in case of IO error
 	 */
-	static public BufferedImage fromImage(Image img) throws IOException {
-		InputStream in = new ByteArrayInputStream(img.getData());
-
-		int orientation;
+	public static BufferedImage fromImage(Image img) throws IOException {
+		InputStream in = img.newInputStream();
+		BufferedImage image;
 		try {
-			orientation = getExifTransorm(in);
-		} catch (Exception e) {
-			// no EXIF transform, ok
-			orientation = -1;
-		}
+			int orientation;
+			try {
+				orientation = getExifTransorm(in);
+			} catch (Exception e) {
+				// no EXIF transform, ok
+				orientation = -1;
+			}
 
-		in.reset();
-		BufferedImage image = ImageIO.read(in);
+			in.reset();
 
-		if (image == null) {
-			throw new IOException("Failed to convert input to image");
-		}
+			try {
+				image = ImageIO.read(in);
+			} catch (IllegalArgumentException e) {
+				throw e;
+			} catch (Exception e) {
+				throw new IOException("Undocumented exception occured, "
+						+ "converting to IOException", e);
+			}
 
-		// Note: this code has been found on Internet;
-		// thank you anonymous coder.
-		int width = image.getWidth();
-		int height = image.getHeight();
-		AffineTransform affineTransform = new AffineTransform();
-
-		switch (orientation) {
-		case 1:
-			affineTransform = null;
-			break;
-		case 2: // Flip X
-			affineTransform.scale(-1.0, 1.0);
-			affineTransform.translate(-width, 0);
-			break;
-		case 3: // PI rotation
-			affineTransform.translate(width, height);
-			affineTransform.rotate(Math.PI);
-			break;
-		case 4: // Flip Y
-			affineTransform.scale(1.0, -1.0);
-			affineTransform.translate(0, -height);
-			break;
-		case 5: // - PI/2 and Flip X
-			affineTransform.rotate(-Math.PI / 2);
-			affineTransform.scale(-1.0, 1.0);
-			break;
-		case 6: // -PI/2 and -width
-			affineTransform.translate(height, 0);
-			affineTransform.rotate(Math.PI / 2);
-			break;
-		case 7: // PI/2 and Flip
-			affineTransform.scale(-1.0, 1.0);
-			affineTransform.translate(-height, 0);
-			affineTransform.translate(0, width);
-			affineTransform.rotate(3 * Math.PI / 2);
-			break;
-		case 8: // PI / 2
-			affineTransform.translate(0, width);
-			affineTransform.rotate(3 * Math.PI / 2);
-			break;
-		default:
-			affineTransform = null;
-			break;
-		}
+			if (image == null) {
+				throw new IOException("Failed to convert input to image");
+			}
 
-		if (affineTransform != null) {
-			AffineTransformOp affineTransformOp = new AffineTransformOp(
-					affineTransform, AffineTransformOp.TYPE_BILINEAR);
+			// Note: this code has been found on Internet;
+			// thank you anonymous coder.
+			int width = image.getWidth();
+			int height = image.getHeight();
+			AffineTransform affineTransform = new AffineTransform();
+
+			switch (orientation) {
+			case 1:
+				affineTransform = null;
+				break;
+			case 2: // Flip X
+				affineTransform.scale(-1.0, 1.0);
+				affineTransform.translate(-width, 0);
+				break;
+			case 3: // PI rotation
+				affineTransform.translate(width, height);
+				affineTransform.rotate(Math.PI);
+				break;
+			case 4: // Flip Y
+				affineTransform.scale(1.0, -1.0);
+				affineTransform.translate(0, -height);
+				break;
+			case 5: // - PI/2 and Flip X
+				affineTransform.rotate(-Math.PI / 2);
+				affineTransform.scale(-1.0, 1.0);
+				break;
+			case 6: // -PI/2 and -width
+				affineTransform.translate(height, 0);
+				affineTransform.rotate(Math.PI / 2);
+				break;
+			case 7: // PI/2 and Flip
+				affineTransform.scale(-1.0, 1.0);
+				affineTransform.translate(-height, 0);
+				affineTransform.translate(0, width);
+				affineTransform.rotate(3 * Math.PI / 2);
+				break;
+			case 8: // PI / 2
+				affineTransform.translate(0, width);
+				affineTransform.rotate(3 * Math.PI / 2);
+				break;
+			default:
+				affineTransform = null;
+				break;
+			}
+
+			if (affineTransform != null) {
+				AffineTransformOp affineTransformOp = new AffineTransformOp(
+						affineTransform, AffineTransformOp.TYPE_BILINEAR);
 
-			BufferedImage transformedImage = new BufferedImage(width, height,
-					image.getType());
-			transformedImage = affineTransformOp
-					.filter(image, transformedImage);
+				BufferedImage transformedImage = new BufferedImage(width,
+						height, image.getType());
+				transformedImage = affineTransformOp.filter(image,
+						transformedImage);
 
-			image = transformedImage;
+				image = transformedImage;
+			}
+			//
+		} finally {
+			in.close();
 		}
-		//
 
 		return image;
 	}