Changeset 17144 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-10-10T18:41:23+02:00 (4 years ago)

Author:

simon04

Message:

fix #19751 - MapImage.rescale: use original SVG instead of rastered version

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -190 +190 @@
                     img = noIcon == null ? null : noIcon.getImage();
                 } else {
-                    img = rescale(result.getImageIcon(new Dimension(width, height)).getImage());
+                    img = result.getImageIcon(new Dimension(width, height)).getImage();
+                    if (img != null && mustRescale(img)) {
+                        // Scale down large images to 16x16 pixels if no size is explicitly specified
+                        img = result.getImageIconBounded(ImageProvider.ImageSizes.MAP.getImageDimension()).getImage();
+                    }
                 }
                 if (temporary) {
@@ -301 +305 @@
     }
 
-    /**
-     * Rescale excessively large images.
-     * @param image the unscaled image
-     * @return The scaled down version to 16x16 pixels if the image height and width exceeds 48 pixels and no size has been explicitly specified
-     */
-    private Image rescale(Image image) {
-        if (image == null) return null;
-        // Scale down large (.svg) images to 16x16 pixels if no size is explicitly specified
-        if (mustRescale(image)) {
-            return ImageProvider.createBoundedImage(image, 16);
-        } else {
-            return image;
-        }
-    }
-
     private boolean mustRescale(Image image) {
         return autoRescale && width == -1 && image.getWidth(null) > MAX_SIZE