Changeset 9281 in josm

Timestamp:

2016-01-03T16:51:43+01:00 (8 years ago)

Author:

stoecker

Message:

fix #10684 - fix SVG upscaling

File:

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

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

@@ -160 +160 @@
         float realWidth;
         float realHeight;
+        int maxWidth = maxSize.width;
+        int maxHeight = maxSize.height;
         if (svg != null) {
             realWidth = svg.getWidth();
             realHeight = svg.getHeight();
-            /* extend small images to the possible maximum, may get reduced later again */
-            if (maxSize.width != -1 && realWidth < maxSize.width) {
-                realHeight *= maxSize.width/realWidth;
-                realWidth = maxSize.width;
-            }
-            if (maxSize.height != -1 && realHeight < maxSize.height) {
-                realWidth *= maxSize.height/realHeight;
-                realHeight = maxSize.height;
-            }
         } else {
             if (baseImage == null) throw new AssertionError();
@@ -177 +170 @@
             realWidth = icon.getIconWidth();
             realHeight = icon.getIconHeight();
+            if (realWidth <= maxWidth) {
+                maxWidth = -1;
+            }
+            if (realHeight <= maxHeight) {
+                maxHeight = -1;
+            }
         }
-        int maxWidth = maxSize.width;
-        int maxHeight = maxSize.height;
-
-        if (realWidth <= maxWidth) {
-            maxWidth = -1;
-        }
-        if (realHeight <= maxHeight) {
-            maxHeight = -1;
-        }
-
+        
         if (maxWidth == -1 && maxHeight == -1)
             return getImageIcon(DEFAULT_DIMENSION);