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

Timestamp:

2017-10-25T23:26:40+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #15476 - Antialiased text and better resize quality when viewing photos

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (5 diffs)

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

@@ -13 +13 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.RenderingHints;
 import java.awt.Toolkit;
 import java.awt.event.MouseEvent;
@@ -28 +29 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.ExifReader;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -461 +463 @@
     }
 
+    /**
+     * Sets the On-Screen-Display text.
+     * @param text text to display on top of the image
+     */
     public void setOsdText(String text) {
         this.osdText = text;
@@ -478 +484 @@
             visibleRect = this.visibleRect;
             errorLoading = this.errorLoading;
+        }
+
+        if (g instanceof Graphics2D) {
+            ((Graphics2D) g).setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         }
 
@@ -502 +512 @@
         } else {
             Rectangle target = calculateDrawImageRectangle(visibleRect, size);
-            g.drawImage(image,
-                    target.x, target.y, target.x + target.width, target.y + target.height,
-                    visibleRect.x, visibleRect.y, visibleRect.x + visibleRect.width, visibleRect.y + visibleRect.height,
-                    null);
+            // 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
+            if (selectedRect == null && (target.width < visibleRect.width/2 || target.height < visibleRect.height/2)) {
+                BufferedImage buffImage = ImageProvider.toBufferedImage(image);
+                g.drawImage(ImageProvider.createScaledImage(buffImage, target.width, target.height, RenderingHints.VALUE_INTERPOLATION_BILINEAR),
+                        target.x, target.y, target.x + target.width, target.y + target.height,
+                        visibleRect.x, visibleRect.y, visibleRect.x + target.width, visibleRect.y + target.height,
+                        null);
+            } else {
+                g.drawImage(image,
+                        target.x, target.y, target.x + target.width, target.y + target.height,
+                        visibleRect.x, visibleRect.y, visibleRect.x + visibleRect.width, visibleRect.y + visibleRect.height,
+                        null);
+            }
             if (selectedRect != null) {
                 Point topLeft = img2compCoord(visibleRect, selectedRect.x, selectedRect.y, size);