Improve Progress, ImageUtils

[fanfix.git] / src / be / nikiroo / utils / ImageUtils.java

diff --git a/src/be/nikiroo/utils/ImageUtils.java b/src/be/nikiroo/utils/ImageUtils.java
index afeb5d34dd924ff4f5dd4102e548ef2a3015b1d8..9f1e06f36806d57c3876dc38b6400d4d4b371412 100644 (file)
--- a/src/be/nikiroo/utils/ImageUtils.java
+++ b/src/be/nikiroo/utils/ImageUtils.java
@@ -101,7 +101,7 @@ public class ImageUtils {
 
                return fileString;
        }
-       
+
        /**
         * Convert the given Base64 representation of an image into an {@link Image}
         * object.
@@ -136,9 +136,17 @@ public class ImageUtils {
        static public BufferedImage fromStream(InputStream in) throws IOException {
                MarkableFileInputStream tmpIn = null;
                File tmp = null;
-               try {
-                       in.reset();
-               } catch (IOException e) {
+
+               boolean repack = !in.markSupported();
+               if (!repack) {
+                       try {
+                               in.reset();
+                       } catch (IOException e) {
+                               repack = true;
+                       }
+               }
+
+               if (repack) {
                        tmp = File.createTempFile(".tmp-image", ".tmp");
                        tmp.deleteOnExit();
                        IOUtils.write(in, tmp);