Changeset 16060 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2020-03-07T20:20:26+01:00 (4 years ago)

Author:

simon04

Message:

see #18871 - ImageProvider.getPadded: fix/improve performance

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageResource;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -33 +34 @@
      */
     private Image img;
+    private ImageResource imageResource;
 
     /**
@@ -108 +110 @@
             return getImage();
         }
+    }
+
+    /**
+     * Get the image resource associated with this MapImage object.
+     * @return the image resource
+     */
+    public ImageResource getImageResource() {
+        return imageResource;
     }
 
@@ -139 +149 @@
                 .setHeight(height)
                 .setOptional(true)
-                .getAsync(result -> {
+                .getResourceAsync(result -> {
                     synchronized (this) {
+                        imageResource = result;
                         if (result == null) {
                             source.logWarning(tr("Failed to locate image ''{0}''", name));
@@ -146 +157 @@
                             img = noIcon == null ? null : noIcon.getImage();
                         } else {
-                            img = rescale(result.getImage());
+                            img = rescale(result.getImageIcon().getImage());
                         }
                         if (temporary) {