X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FEpub.java;h=0bd09bdc4f24e7560fda61e40ef4e82c0e5c227c;hb=326093dc53fa48019c94f59bd006b307d755b392;hp=f6a0b410338a3a1a7635601be402054fe5c761d1;hpb=2206ef66ee00ad42d806f04a7b7ad6f8cb2d8828;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java
index f6a0b41..0bd09bd 100644
--- a/src/be/nikiroo/fanfix/supported/Epub.java
+++ b/src/be/nikiroo/fanfix/supported/Epub.java
@@ -12,12 +12,12 @@ import java.util.Map.Entry;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import javax.imageio.ImageIO;
-
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.IOUtils;
+import be.nikiroo.utils.ImageUtils;
 import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for EPUB files created with this program (as we need some
@@ -62,22 +62,22 @@ class Epub extends InfoText {
 	}
 
 	@Override
-	protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-			throws IOException {
+	protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+			Progress pg) throws IOException {
 		if (fakeIn != null) {
 			fakeIn.reset();
-			return super.getChapters(fakeSource, fakeIn);
+			return super.getChapters(fakeSource, fakeIn, pg);
 		}
 
 		return null;
 	}
 
 	@Override
-	protected String getChapterContent(URL source, InputStream in, int number)
-			throws IOException {
+	protected String getChapterContent(URL source, InputStream in, int number,
+			Progress pg) throws IOException {
 		if (fakeIn != null) {
 			fakeIn.reset();
-			return super.getChapterContent(fakeSource, fakeIn, number);
+			return super.getChapterContent(fakeSource, fakeIn, number, pg);
 		}
 
 		return null;
@@ -115,7 +115,7 @@ class Epub extends InfoText {
 					// Cover
 					if (getCover()) {
 						try {
-							cover = ImageIO.read(zipIn);
+							cover = ImageUtils.fromStream(zipIn);
 						} catch (Exception e) {
 							Instance.syserr(e);
 						}
@@ -141,7 +141,7 @@ class Epub extends InfoText {
 		}
 
 		if (tmpInfo.exists()) {
-			meta = InfoReader.readMeta(tmpInfo);
+			meta = InfoReader.readMeta(tmpInfo, true);
 			if (cover != null) {
 				meta.setCover(cover);
 			}