Changeset 5830 in josm for trunk/src

Timestamp:

2013-04-06T15:07:36+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8577 - Exception with empty SVG as image

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (1 diff)
• ImageResource.java (modified) (1 diff)

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

@@ -867 +867 @@
             width = (int) Math.round(realWidth * scaleX);
         }
+        if (width == 0 || height == 0) {
+            return null;
+        }
         BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = img.createGraphics();

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

@@ -55 +55 @@
         if (svg != null) {
             img = ImageProvider.createImageFromSvg(svg, dim);
+            if (img == null) {
+                return null;
+            }
             imgCache.put(dim, img);
             return new ImageIcon(img);