Changeset 17363 in josm for trunk

Timestamp:

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

Author:

simon04

Message:

see #20141 - Extract BufferedImageCacheEntry.pngEncoded

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/BufferedImageCacheEntry.java (modified) (2 diffs)
• gui/layer/geoimage/ThumbsLoader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java

@@ -4 +4 @@
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 
 import javax.imageio.ImageIO;
@@ -28 +30 @@
     public BufferedImageCacheEntry(byte[] content) {
         super(content);
+    }
+
+    /**
+     * Encodes the given image as PNG and returns a cache entry
+     * @param img the image
+     * @return a cache entry for the PNG encoded image
+     * @throws UncheckedIOException if an I/O error occurs
+     */
+    public static BufferedImageCacheEntry pngEncoded(BufferedImage img) {
+        try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+            ImageIO.write(img, "png", output);
+            return new BufferedImageCacheEntry(output.toByteArray());
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 

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);