Changeset 4961 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2012-02-16T21:21:17+01:00 (12 years ago)

Author:

stoecker

Message:

see #1576 - switch ImageResource complete to BufferedImage, fix last accidential checkin

File:

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

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

@@ -279 +279 @@
                         return new ImageResource(getSvgUniverse().getDiagram(uri));
                     } else {
-                        return new ImageResource(new ImageIcon(bytes).getImage());
+                        try {
+                            return new ImageResource(ImageIO.read(new ByteArrayInputStream(bytes)));
+                        } catch (IOException e) {}
                     }
                 }
@@ -751 +753 @@
     }
 
-    public static Image createImageFromSvg(SVGDiagram svg, Dimension dim) {
+    public static BufferedImage createImageFromSvg(SVGDiagram svg, Dimension dim) {
         float realWidth = svg.getWidth();
         float realHeight = svg.getHeight();
@@ -772 +774 @@
             width = (int) Math.round(realWidth * scaleX);
         }
-        Image img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        Graphics2D g = ((BufferedImage) img).createGraphics();
+        BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        Graphics2D g = img.createGraphics();
         g.setClip(0, 0, width, height);
         if (scaleX != null) {