X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fui%2FImageUtilsAwt.java;h=4cf12c04cd0573629d90ed6e376be7c5ca6e7155;hb=505be508ae7d3fb48122be548b310a238cfb91eb;hp=0c69dc4482938ae02608be704167e23a8add13e0;hpb=e704a41477b85b6bb76dff4181df132176aec112;p=fanfix.git

diff --git a/src/be/nikiroo/utils/ui/ImageUtilsAwt.java b/src/be/nikiroo/utils/ui/ImageUtilsAwt.java
index 0c69dc4..4cf12c0 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;
@@ -12,6 +11,7 @@ import javax.imageio.ImageIO;
 
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * This class offer some utilities based around images and uses java.awt.
@@ -19,6 +19,13 @@ import be.nikiroo.utils.ImageUtils;
  * @author niki
  */
 public class ImageUtilsAwt extends ImageUtils {
+	@Override
+	protected boolean check() {
+		// Will not work if ImageIO is not available
+		ImageIO.getCacheDirectory();
+		return true;
+	}
+
 	@Override
 	public void saveAsImage(Image img, File target, String format)
 			throws IOException {
@@ -36,7 +43,14 @@ public class ImageUtilsAwt extends ImageUtils {
 			// Some formats are not reliable
 			// 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) {
@@ -62,80 +76,104 @@ public class ImageUtilsAwt extends ImageUtils {
 	 *             in case of IO error
 	 */
 	public static BufferedImage fromImage(Image img) throws IOException {
-		InputStream in = new ByteArrayInputStream(img.getData());
-
-		int orientation;
+		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) {
+				String extra = "";
+				if (img.getSize() <= 2048) {
+					try {
+						extra = ", content: "
+								+ new String(img.getData(), "UTF-8");
+					} catch (Exception e) {
+						extra = ", content unavailable";
+					}
+				}
+				String ssize = StringUtils.formatNumber(img.getSize());
+				throw new IOException(
+						"Failed to convert input to image, size was: " + ssize
+								+ extra);
+			}
+
+			// 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);
+			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;
 	}