From 01e45aa43d68445a0fb22a63f4ba1ebf1cdf8435 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sun, 28 Apr 2019 19:20:08 +0200 Subject: [PATCH] VERSION + fix custom image --- VERSION | 2 +- src/be/nikiroo/utils/serial/SerialUtils.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 8f820de..1a71b82 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.2-dev +4.7.2-streamify-dev diff --git a/src/be/nikiroo/utils/serial/SerialUtils.java b/src/be/nikiroo/utils/serial/SerialUtils.java index 52bc43a..a6a02a8 100644 --- a/src/be/nikiroo/utils/serial/SerialUtils.java +++ b/src/be/nikiroo/utils/serial/SerialUtils.java @@ -174,7 +174,8 @@ public class SerialUtils { in.close(); } } finally { - encoded.close(); + encoded.flush(); + // Cannot close! } } @@ -186,7 +187,9 @@ public class SerialUtils { @Override protected Object fromStream(InputStream in) throws IOException { try { - return new Image(in); + // Cannot close it! + InputStream decoded = StringUtils.unbase64(in, false); + return new Image(decoded); } catch (IOException e) { throw new UnknownFormatConversionException(e.getMessage()); } -- 2.27.0