Changeset 17363 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

Timestamp:

2020-11-26T22:24:24+01:00 (3 years ago)

Author:

simon04

Message:

see #20141 - Extract BufferedImageCacheEntry.pngEncoded

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

@@ -9 +9 @@
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.ArrayList;
 import java.util.Collection;
-
-import javax.imageio.ImageIO;
 
 import org.apache.commons.jcs3.access.behavior.ICacheAccess;
@@ -165 +163 @@
 
         if (!cacheOff && cache != null) {
-            try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
-                ImageIO.write(scaledBI, "png", output);
-                cache.put(cacheIdent, new BufferedImageCacheEntry(output.toByteArray()));
-            } catch (IOException e) {
+            try {
+                cache.put(cacheIdent, BufferedImageCacheEntry.pngEncoded(scaledBI));
+            } catch (UncheckedIOException e) {
                 Logging.warn("Failed to save geoimage thumb to cache");
                 Logging.warn(e);