Changeset 4938 in josm for trunk

Timestamp:

2012-02-15T18:39:05+01:00 (13 years ago)

Author:

xeen

Message:

use ImageIO instead of Toolkit’s createImage. PNGs without alpha channel should not get a transparent background anymore. See #1576

File:

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

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

@@ -36 +36 @@
 import java.util.zip.ZipFile;
 
+import javax.imageio.ImageIO;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -51 +52 @@
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
+
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGException;
@@ -400 +402 @@
                     return svg == null ? null : new ImageResource(svg);
                 case OTHER:
-                    Image img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
-                    return img == null ? null : new ImageResource(img, false);
+                    BufferedImage img = null;
+                    try {
+                        img = ImageIO.read(is.getFile().toURI().toURL());
+                    } catch (IOException e) {}
+                    return img == null ? null : new ImageResource(img, true);
                 default:
                     throw new AssertionError();
@@ -466 +471 @@
                                 size -= l;
                             }
-                            Image img = Toolkit.getDefaultToolkit().createImage(buf);
+                            BufferedImage img = null;
+                            try {
+                                img = ImageIO.read(new ByteArrayInputStream(buf));
+                            } catch (IOException e) {}
                             return img == null ? null : new ImageResource(img, false);
                         default:
@@ -497 +505 @@
                 return svg == null ? null : new ImageResource(svg);
             case OTHER:
-                Image img = Toolkit.getDefaultToolkit().createImage(path);
-                return img == null ? null : new ImageResource(img, false);
+                BufferedImage img = null;
+                try {
+                    img = ImageIO.read(path);
+                } catch (IOException e) {}
+                return img == null ? null : new ImageResource(img, true);
             default:
                 throw new AssertionError();