Changeset 12723 in josm for trunk/src

Timestamp:

2017-09-04T19:22:41+02:00 (7 years ago)

Author:

bastiK

Message:

see #9995 - fix double scaling with gui.scale Einstein option (change extracted from a patch by strump)

File:

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

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

@@ -59 +59 @@
     public ImageResource(Image img) {
         CheckParameterUtil.ensureParameterNotNull(img);
-        baseImage = scaleBaseImageIfNeeded(img);
-    }
-
-    /** Scale image according to screen DPI if needed.
-     *
-     * @param img an image loaded from file (it's width and height are virtual pixels)
-     * @return original img if virtual size is the same as real size or new image resized to real pixels
-     */
-    private static Image scaleBaseImageIfNeeded(Image img) {
-        int imgWidth = img.getWidth(null);
-        int imgHeight = img.getHeight(null);
-        int realWidth = GuiSizesHelper.getSizeDpiAdjusted(imgWidth);
-        int realHeight = GuiSizesHelper.getSizeDpiAdjusted(imgHeight);
-        if (realWidth != -1 && realHeight != -1 && imgWidth != realWidth && imgHeight != realHeight) {
-            Image realImage = img.getScaledInstance(realWidth, realHeight, Image.SCALE_SMOOTH);
-            BufferedImage bimg = new BufferedImage(realWidth, realHeight, BufferedImage.TYPE_INT_ARGB);
-            bimg.getGraphics().drawImage(realImage, 0, 0, null);
-            return bimg;
-        }
-        return img;
+        baseImage = img;
     }
 
@@ -162 +143 @@
         return getImageIcon(dim, true);
     }
-    
+
     /**
      * Get an ImageIcon object for the image of this resource.
@@ -229 +210 @@
             } catch (NoClassDefFoundError e) {
                 return new ImageIcon(img);
-            } 
+            }
         }
     }