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

Timestamp:

2012-01-19T19:58:08+01:00 (12 years ago)

Author:

bastiK

Message:

make identity of map icons depend on the name and not the image data (see #6797)

File:

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

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

@@ -760 +760 @@
      * @return the image after rotating.
      */
-    public static ImageIcon createRotatedImage(Component c, Icon icon, double rotatedAngle) {
+    public static Image createRotatedImage(Component c, Image img, double rotatedAngle) {
         // convert rotatedAngle to a value from 0 to 360
         double originalAngle = rotatedAngle % 360;
@@ -775 +775 @@
         double radian = Math.toRadians(angle);
 
-        int iw = icon.getIconWidth();
-        int ih = icon.getIconHeight();
+        int iw = img.getWidth(null);
+        int ih = img.getHeight(null);
         int w;
         int h;
@@ -802 +802 @@
 
         g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC);
-        icon.paintIcon(c, g2d, -cx, -cy);
+        g2d.drawImage(img, -cx, -cy, c);
 
         g2d.dispose();
-        return new ImageIcon(image);
+        new ImageIcon(image); // load completely
+        return image;
     }