Changeset 16997 in josm for trunk/src/org

Timestamp:

2020-09-02T19:58:37+02:00 (4 years ago)

Author:

simon04

Message:

see #19706, see #19725 - ImageProvider: re-activate upscaling of SVG images

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (1 diff)
• ImageResizeMode.java (modified) (1 diff)

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

@@ -1490 +1490 @@
             return null;
         }
+        if (resizeMode == ImageResizeMode.BOUNDED) {
+            resizeMode = ImageResizeMode.BOUNDED_UPSCALE;
+        }
         return resizeMode.createBufferedImage(dim, new Dimension((int) sourceWidth, (int) sourceHeight), g -> {
             try {

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

@@ -33 +33 @@
         @Override
         Dimension computeDimension(Dimension dim, Dimension icon) {
+            final int maxWidth = Math.min(dim.width, icon.width);
+            final int maxHeight = Math.min(dim.height, icon.height);
+            return BOUNDED_UPSCALE.computeDimension(new Dimension(maxWidth, maxHeight), icon);
+        }
+    },
+
+    BOUNDED_UPSCALE {
+        @Override
+        Dimension computeDimension(Dimension dim, Dimension icon) {
             CheckParameterUtil.ensureThat((dim.width > 0 || dim.width == -1) && (dim.height > 0 || dim.height == -1),
                     () -> dim + " is invalid");
-            final int maxWidth = Math.min(dim.width, icon.width);
-            final int maxHeight = Math.min(dim.height, icon.height);
+            final int maxWidth = dim.width;
+            final int maxHeight = dim.height;
             final Dimension spec;
             if (maxWidth == -1 || maxHeight == -1) {