Changeset 16998 in josm for trunk

Timestamp:

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

Author:

simon04

Message:

see #19706, see #19725 - ImageProvider: improve resize quality for raster images

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (1 diff)
• ImageResizeMode.java (modified) (2 diffs)
• ImageResource.java (modified) (1 diff)

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

@@ -1501 +1501 @@
                 Logging.log(Logging.LEVEL_ERROR, "Unable to load svg:", ex);
             }
-        });
+        }, null);
     }
 

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

@@ -4 +4 @@
 import java.awt.Dimension;
 import java.awt.Graphics2D;
+import java.awt.Image;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
@@ -87 +88 @@
      * @param icon the dimensions of the image to resize
      * @param renderer the rendering function
+     * @param sourceIcon the source icon to draw
      * @return a new buffered image
      */
-    BufferedImage createBufferedImage(Dimension dim, Dimension icon, Consumer<Graphics2D> renderer) {
+    BufferedImage createBufferedImage(Dimension dim, Dimension icon, Consumer<Graphics2D> renderer, Image sourceIcon) {
         final Dimension real = computeDimension(dim, icon);
         final BufferedImage bufferedImage = new BufferedImage(real.width, real.height, BufferedImage.TYPE_INT_ARGB);
         final Graphics2D g = bufferedImage.createGraphics();
         g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        prepareGraphics(icon, bufferedImage, g);
-        renderer.accept(g);
+        if (renderer != null) {
+            prepareGraphics(icon, bufferedImage, g);
+            renderer.accept(g);
+        } else if (sourceIcon != null) {
+            sourceIcon = sourceIcon.getScaledInstance(real.width, real.height, Image.SCALE_SMOOTH);
+            g.drawImage(sourceIcon, 0, 0, null);
+        } else {
+            throw new NullPointerException("renderer or sourceIcon");
+        }
         return bufferedImage;
     }

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

@@ -187 +187 @@
                 ImageIcon icon = new ImageIcon(baseImage);
                 img = resizeMode.createBufferedImage(dim, new Dimension(icon.getIconWidth(), icon.getIconHeight()),
-                        g -> g.drawImage(icon.getImage(), 0, 0, null));
+                        null, icon.getImage());
             }
             if (overlayInfo != null) {