Changeset 13648 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-04-19T21:36:20+02:00 (7 years ago)

Author:

Don-vip

Message:

see #16204 - allow to load embedded images by disabling ImageIO cache in case of SecurityException

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1656 +1656 @@
         }
 
-        ImageInputStream stream = ImageIO.createImageInputStream(input);
+        ImageInputStream stream = createImageInputStream(input);
         if (stream == null) {
             throw new IIOException("Can't create an ImageInputStream!");
@@ -1706 +1706 @@
         CheckParameterUtil.ensureParameterNotNull(input, "input");
 
-        ImageInputStream stream = ImageIO.createImageInputStream(input);
+        ImageInputStream stream = createImageInputStream(input);
         BufferedImage bi = read(stream, readMetadata, enforceTransparency);
         if (bi == null) {
@@ -1750 +1750 @@
 
         try (InputStream istream = Utils.openStream(input)) {
-            ImageInputStream stream = ImageIO.createImageInputStream(istream);
+            ImageInputStream stream = createImageInputStream(istream);
             BufferedImage bi = read(stream, readMetadata, enforceTransparency);
             if (bi == null) {
@@ -2016 +2016 @@
         return buffImage;
     }
+
+    private static ImageInputStream createImageInputStream(Object input) throws IOException {
+        try {
+            return ImageIO.createImageInputStream(input);
+        } catch (SecurityException e) {
+            if (ImageIO.getUseCache()) {
+                ImageIO.setUseCache(false);
+                return ImageIO.createImageInputStream(input);
+            }
+            throw new IOException(e);
+        }
+    }
 }