X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FImage.java;h=2e9c9f83a39bfd4fcdeef8d351071d8284e9af61;hb=refs%2Fheads%2Fwoops;hp=f2b94991417ff922dba3a8c00713fe7202912657;hpb=a6a73de36765b85947ac885529da82d3e7189269;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
index f2b9499..2e9c9f8 100644
--- a/src/be/nikiroo/utils/Image.java
+++ b/src/be/nikiroo/utils/Image.java
@@ -3,9 +3,10 @@ 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 java.io.OutputStream;
+import java.io.Serializable;
 
 import be.nikiroo.utils.streams.MarkableFileInputStream;
 
@@ -14,7 +15,9 @@ import be.nikiroo.utils.streams.MarkableFileInputStream;
  * 
  * @author niki
  */
-public class Image implements Closeable {
+public class Image implements Closeable, Serializable {
+	static private final long serialVersionUID = 1L;
+
 	static private File tempRoot;
 	static private TempFiles tmpRepository;
 	static private long count = 0;
@@ -81,7 +84,7 @@ public class Image implements Closeable {
 	 *             in case of I/O error
 	 */
 	public InputStream newInputStream() throws IOException {
-		return new MarkableFileInputStream(new FileInputStream(data));
+		return new MarkableFileInputStream(data);
 	}
 
 	/**
@@ -155,6 +158,44 @@ public class Image implements Closeable {
 		}
 	}
 
+	/**
+	 * Write this {@link Image} for serialization purposes; that is, write the
+	 * content of the backing temporary file.
+	 * 
+	 * @param out
+	 *            the {@link OutputStream} to write to
+	 * 
+	 * @throws IOException
+	 *             in case of I/O error
+	 */
+	private void writeObject(java.io.ObjectOutputStream out) throws IOException {
+		InputStream in = newInputStream();
+		try {
+			IOUtils.write(in, out);
+		} finally {
+			in.close();
+		}
+	}
+
+	/**
+	 * Read an {@link Image} written by
+	 * {@link Image#writeObject(java.io.ObjectOutputStream)}; that is, create a
+	 * new temporary file with the saved content.
+	 * 
+	 * @param in
+	 *            the {@link InputStream} to read from
+	 * @throws IOException
+	 *             in case of I/O error
+	 * @throws ClassNotFoundException
+	 *             will not be thrown by this method
+	 */
+	@SuppressWarnings("unused")
+	private void readObject(java.io.ObjectInputStream in) throws IOException,
+			ClassNotFoundException {
+		data = getTemporaryFile();
+		IOUtils.write(in, data);
+	}
+
 	/**
 	 * Change the temporary root directory used by the program.
 	 * <p>