From: Niki Roo <niki@nikiroo.be>
Date: Sun, 28 Apr 2019 17:20:15 +0000 (+0200)
Subject: Merge branch 'master' into streamify
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=f625b17522345692e737498597479b2207ef04ac;hp=01e45aa43d68445a0fb22a63f4ba1ebf1cdf8435

Merge branch 'master' into streamify
---

diff --git a/src/be/nikiroo/utils/Image.java b/src/be/nikiroo/utils/Image.java
index cfcaa74..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.
  * 
@@ -91,7 +93,7 @@ public class Image implements Closeable {
 	 *             in case of I/O error
 	 */
 	public InputStream newInputStream() throws IOException {
-		return new FileInputStream(data);
+		return new MarkableFileInputStream(new FileInputStream(data));
 	}
 
 	/**
diff --git a/src/be/nikiroo/utils/streams/BufferedInputStream.java b/src/be/nikiroo/utils/streams/BufferedInputStream.java
index af1e2ac..397f6fc 100644
--- a/src/be/nikiroo/utils/streams/BufferedInputStream.java
+++ b/src/be/nikiroo/utils/streams/BufferedInputStream.java
@@ -249,7 +249,7 @@ public class BufferedInputStream extends InputStream {
 		while (hasMoreData() && done < blen) {
 			preRead();
 			if (hasMoreData()) {
-				int now = Math.min(blen, stop) - start;
+				int now = Math.min(blen - done, stop - start);
 				if (now > 0) {
 					System.arraycopy(buffer, start, b, boff + done, now);
 					start += now;