Changeset 17782 in josm for trunk/src/org

Timestamp:

2021-04-14T20:44:16+02:00 (4 years ago)

Author:

simon04

Message:

fix #20035 - Geotagged images are pixelated on retina displays (patch by *Martin*, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/geoimage/ImageDisplay.java (modified) (2 diffs)
• tools/HiDPISupport.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java

@@ -39 +39 @@
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ExifReader;
+import org.openstreetmap.josm.tools.HiDPISupport;
 import org.openstreetmap.josm.tools.ImageProcessor;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -819 +820 @@
                     if (bi != null) {
                         r.x = r.y = 0;
-
+                        double hiDPIScale = HiDPISupport.getHiDPIScale();
+                        int width = (int) (target.width * hiDPIScale);
+                        int height = (int) (target.height * hiDPIScale);
                         // See https://community.oracle.com/docs/DOC-983611 - The Perils of Image.getScaledInstance()
                         // Pre-scale image when downscaling by more than two times to avoid aliasing from default algorithm
-                        bi = ImageProvider.createScaledImage(bi, target.width, target.height,
-                                RenderingHints.VALUE_INTERPOLATION_BILINEAR);
-                        r.width = target.width;
-                        r.height = target.height;
+                        bi = ImageProvider.createScaledImage(bi, width, height, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
+                        r.width = width;
+                        r.height = height;
                         image = bi;
                     }

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

@@ -176 +176 @@
      * @return the GUI scale for HiDPI mode, a value of 1.0 means standard mode.
      */
-    static double getHiDPIScale() {
+    public static double getHiDPIScale() {
         if (GraphicsEnvironment.isHeadless())
             return 1.0;