Changeset 16872 in josm for trunk

Timestamp:

2020-08-12T13:03:59+02:00 (4 years ago)

Author:

stoecker

Message:

fix image display in MOTD, see #15240

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/GettingStarted.java (modified) (2 diffs)
• tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -34 +34 @@
 import org.openstreetmap.josm.io.OnlineResource;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Logging;
@@ -199 +201 @@
 
     static String fixImageLinks(String s) {
-        Matcher m = Pattern.compile("src=\"/browser/trunk/resources(/images/.*?\\.svg)\\?format=raw\"").matcher(s);
+        Matcher m = Pattern.compile("src=\"/browser/trunk/resources/images/(.*?)\\.(png|svg)\\?format=raw\"").matcher(s);
         StringBuffer sb = new StringBuffer();
         while (m.find()) {
             String im = m.group(1);
-            URL u = GettingStarted.class.getResource(im);
+            String u = new ImageProvider(im).setMaxSize(ImageSizes.HTMLINLINE).getDataURL();
             if (u != null) {
-                try {
-                    m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + Utils.betterJarUrl(u, u) + '\"'));
-                } catch (IOException e) {
-                    Logging.error(e);
-                }
+                m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + u + '\"'));
             }
         }

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

@@ -21 +21 @@
 import java.awt.image.ImageFilter;
 import java.awt.image.ImageProducer;
+import java.awt.image.RenderedImage;
 import java.awt.image.RGBImageFilter;
 import java.awt.image.WritableRaster;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -174 +176 @@
          * @since 13369
          */
-        STATUSLINE(18, 18);
+        STATUSLINE(18, 18),
+        /**
+         * HTML inline image
+         * @since 16872
+         */
+        HTMLINLINE(24, 24);
 
         private final int virtualWidth;
@@ -663 +670 @@
         else
             return ir.getImageIcon(new Dimension(virtualWidth, virtualHeight), multiResolution);
+    }
+
+    /**
+     * Execute the image request and scale result.
+     * @return the requested image as data: URL or null if the request failed
+     */
+    public String getDataURL() {
+        ImageIcon ii = get();
+        if (ii != null) {
+            final ByteArrayOutputStream os = new ByteArrayOutputStream();
+            try {
+                Image i = ii.getImage();
+                if(i instanceof RenderedImage) {
+                    ImageIO.write((RenderedImage)i, "png", os);
+                    return "data:image/png;base64,"+Base64.getEncoder().encodeToString(os.toByteArray());
+                }
+            } catch (final IOException ioe) {
+                return null;
+            }
+        }
+        return null;
     }