From 490f87c92ff1618591d1932f23613740e79dcb4b Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 16 Apr 2016 12:16:40 +0100 Subject: Move stream closing into Base64Encoding --- .../org/zwobble/mammoth/internal/conversion/DocumentToHtml.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java') diff --git a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java index 268d942..19af0bc 100644 --- a/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java +++ b/src/main/java/org/zwobble/mammoth/internal/conversion/DocumentToHtml.java @@ -10,7 +10,6 @@ import org.zwobble.mammoth.internal.util.Base64Encoding; import org.zwobble.mammoth.internal.util.Lists; import java.io.IOException; -import java.io.InputStream; import java.util.*; import static org.zwobble.mammoth.internal.util.Lists.*; @@ -208,7 +207,7 @@ public class DocumentToHtml { try { Map attributes = new HashMap<>(); - String base64 = imageToBase64(image); + String base64 = Base64Encoding.streamToBase64(image::open); String src = "data:" + contentType + ";base64," + base64; attributes.put("src", src); @@ -225,12 +224,6 @@ public class DocumentToHtml { }); } - private static String imageToBase64(Image image) throws IOException { - try (InputStream stream = image.open()) { - return Base64Encoding.streamToBase64(stream); - } - } - private String generateNoteHtmlId(NoteType noteType, String noteId) { return generateId(noteTypeToIdFragment(noteType) + "-" + noteId); } -- cgit v1.2.3