Remove or move java.awt dependencies

[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / Cbz.java

diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index 77a4008068f4a6ec1b3ea876701dea70b0a830fb..b6524acac90fbb16d3ffd6e7621c84c4f518883a 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -16,7 +15,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Story;
-import be.nikiroo.utils.ImageUtils;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -76,7 +75,7 @@ class Cbz extends Epub {
 
                ZipInputStream zipIn = new ZipInputStream(getInput());
 
-               Map<String, BufferedImage> images = new HashMap<String, BufferedImage>();
+               Map<String, Image> images = new HashMap<String, Image>();
                for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
                                .getNextEntry()) {
                        if (!entry.isDirectory()
@@ -92,7 +91,7 @@ class Cbz extends Epub {
                                if (imageEntry) {
                                        String uuid = meta.getUuid() + "_" + entry.getName();
                                        try {
-                                               images.put(uuid, ImageUtils.fromStream(zipIn));
+                                               images.put(uuid, new Image(zipIn));
                                        } catch (Exception e) {
                                                Instance.getTraceHandler().error(e);
                                        }