Changeset 6747 in josm

Timestamp:

2014-01-20T19:32:25+01:00 (10 years ago)

Author:

bastiK

Message:

#8581 - Embedded SVG leads to very high memory consumption

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/session/SessionReader.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -373 +373 @@
                     deps.putVoid(idx);
                     String depStr = e.getAttribute("depends");
-                    if (depStr != null) {
+                    if (depStr != null && !depStr.isEmpty()) {
                         for (String sd : depStr.split(",")) {
                             Integer d = null;

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

@@ -396 +396 @@
                 return null;
 
-            try {
-                if (name.startsWith("data:")) {
-                    Matcher m = dataUrlPattern.matcher(name);
-                    if (m.matches()) {
-                        String mediatype = m.group(1);
-                        String base64 = m.group(2);
-                        String data = m.group(3);
-                        byte[] bytes = ";base64".equals(base64)
-                                ? Base64.decodeBase64(data)
-                                        : URLDecoder.decode(data, "utf-8").getBytes();
-                                if (mediatype != null && mediatype.contains("image/svg+xml")) {
-                                    URI uri = getSvgUniverse().loadSVG(new StringReader(new String(bytes)), name);
-                                    return new ImageResource(getSvgUniverse().getDiagram(uri));
-                                } else {
-                                    try {
-                                        return new ImageResource(ImageIO.read(new ByteArrayInputStream(bytes)));
-                                    } catch (IOException e) {
-                                        Main.warn("IOException while reading image: "+e.getMessage());
-                                    }
-                                }
-                    }
-                }
-            } catch (UnsupportedEncodingException ex) {
-                throw new RuntimeException(ex.getMessage(), ex);
+            if (name.startsWith("data:")) {
+                String url = name;
+                ImageResource ir = cache.get(url);
+                if (ir != null) return ir;
+                ir = getIfAvailableDataUrl(url);
+                if (ir != null) {
+                    cache.put(url, ir);
+                }
+                return ir;
             }
 
@@ -535 +520 @@
         } finally {
             Utils.close(is);
+        }
+    }
+
+    private static ImageResource getIfAvailableDataUrl(String url) {
+        try {
+            Matcher m = dataUrlPattern.matcher(url);
+            if (m.matches()) {
+                String mediatype = m.group(1);
+                String base64 = m.group(2);
+                String data = m.group(3);
+                byte[] bytes = ";base64".equals(base64)
+                        ? Base64.decodeBase64(data)
+                                : URLDecoder.decode(data, "utf-8").getBytes();
+                if (mediatype != null && mediatype.contains("image/svg+xml")) {
+                    URI uri = getSvgUniverse().loadSVG(new StringReader(new String(bytes)), url);
+                    return new ImageResource(getSvgUniverse().getDiagram(uri));
+                } else {
+                    try {
+                        return new ImageResource(ImageIO.read(new ByteArrayInputStream(bytes)));
+                    } catch (IOException e) {
+                        Main.warn("IOException while reading image: "+e.getMessage());
+                    }
+                }
+            }
+            return null;
+        } catch (UnsupportedEncodingException ex) {
+            throw new RuntimeException(ex.getMessage(), ex);
         }
     }