X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FImage.java;h=ace43dedc59d52b596442575ac75fefae2ef99a7;hb=f04d5e49e91832e122617fbbaa5cdb053459a7e7;hp=6edc1051ab7b910c0b47733407c99d804a08a8fe;hpb=82fcfcde9722e9e3b3eb713cf1f2bcb35fefaa7e;p=fanfix.git

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
index 6edc105..ace43de 100644
--- a/src/be/nikiroo/utils/Image.java
+++ b/src/be/nikiroo/utils/Image.java
@@ -7,6 +7,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import be.nikiroo.utils.streams.MarkableFileInputStream;
+
 /**
  * This class represents an image data.
  * 
@@ -76,14 +78,35 @@ public class Image implements Closeable {
 		IOUtils.write(in, data);
 	}
 
+	/**
+	 * Generate an {@link InputStream} for this {@link Image}.
+	 * <p>
+	 * This {@link InputStream} will (always) be a new one, and <b>you</b> are
+	 * responsible for it.
+	 * <p>
+	 * Note: take care that the {@link InputStream} <b>must not</b> live past
+	 * the {@link Image} life time!
+	 * 
+	 * @return the stream
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	public InputStream newInputStream() throws IOException {
+		return new MarkableFileInputStream(new FileInputStream(data));
+	}
+
 	/**
 	 * <b>Read</b> the actual image data, as a byte array.
+	 * <p>
+	 * Note: if possible, prefer the {@link Image#newInputStream()} method, as
+	 * it can be more efficient.
 	 * 
 	 * @return the image data
 	 */
 	public byte[] getData() {
 		try {
-			FileInputStream in = new FileInputStream(data);
+			InputStream in = newInputStream();
 			try {
 				return IOUtils.toByteArray(in);
 			} finally {
@@ -97,11 +120,18 @@ 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() {
-		return Base64.encodeBytes(getData());
+		try {
+			return StringUtils.base64(getData(), false);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
 	}
 
 	/**