X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FImage.java;h=58b1f5aeac05f71370365ac9c3a562f70f722797;hb=7194ac50b29064a013f177fc9cfc5aaa131a8ec4;hp=cfcaa74e2c1b8e2f1cd280f687afbfd7e8ad51bf;hpb=7b42695f536a88cfc5fed57e98687394e3c42fe9;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
index cfcaa74..58b1f5a 100644
--- a/src/be/nikiroo/utils/Image.java
+++ b/src/be/nikiroo/utils/Image.java
@@ -3,10 +3,11 @@ package be.nikiroo.utils;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import be.nikiroo.utils.streams.MarkableFileInputStream;
+
 /**
  * This class represents an image data.
  * 
@@ -49,19 +50,6 @@ public class Image implements Closeable {
 		}
 	}
 
-	/**
-	 * Create a new {@link Image} from its Base64 representation.
-	 * 
-	 * @param base64
-	 *            the {@link Image} in Base64 format
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
-	public Image(String base64) throws IOException {
-		this(Base64.decode(base64));
-	}
-
 	/**
 	 * Create a new {@link Image} from a stream.
 	 * 
@@ -77,7 +65,8 @@ public class Image implements Closeable {
 	}
 
 	/**
-	 * Generate an {@link InputStream} for this {@link Image}.
+	 * Generate an {@link InputStream} that you can {@link InputStream#reset()}
+	 * for this {@link Image}.
 	 * <p>
 	 * This {@link InputStream} will (always) be a new one, and <b>you</b> are
 	 * responsible for it.
@@ -91,7 +80,7 @@ public class Image implements Closeable {
 	 *             in case of I/O error
 	 */
 	public InputStream newInputStream() throws IOException {
-		return new FileInputStream(data);
+		return new MarkableFileInputStream(data);
 	}
 
 	/**
@@ -115,23 +104,6 @@ public class Image implements Closeable {
 		}
 	}
 
-	/**
-	 * Convert the given {@link Image} object into a Base64 representation of
-	 * the same {@link Image} object.
-	 * <p>
-	 * Note: if possible, prefer the {@link Image#newInputStream()} method, as
-	 * it can be more efficient.
-	 * 
-	 * @return the Base64 representation
-	 */
-	public String toBase64() {
-		try {
-			return StringUtils.base64(getData(), false);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	/**
 	 * Closing the {@link Image} will delete the associated temporary file on
 	 * disk.