Changeset 3862 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2011-02-06T15:48:58+01:00 (14 years ago)

Author:

bastiK

Message:

mapcss: fill-image

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (8 diffs)

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

@@ -52 +52 @@
 
     /**
+     * remember whether the image has been sanitized
+     */
+    private static class ImageWrapper {
+        Image img;
+        boolean sanitized;
+
+        public ImageWrapper(Image img, boolean sanitized) {
+            this.img = img;
+            this.sanitized = sanitized;
+        }
+    }
+
+    /**
      * The icon cache
      */
-    private static Map<String, Image> cache = new HashMap<String, Image>();
+    private static Map<String, ImageWrapper> cache = new HashMap<String, ImageWrapper>();
 
     /**
@@ -84 +97 @@
     }
 
-    public static final ImageIcon getIfAvailable(String[] dirs, String id, String subdir, String name) {
+    public static ImageIcon getIfAvailable(String[] dirs, String id, String subdir, String name) {
         return getIfAvailable(Arrays.asList(dirs), id, subdir, name);
     }
@@ -95 +108 @@
     public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name) {
         return getIfAvailable(dirs, id, subdir, name, null);
+    }
+
+    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive) {
+        return getIfAvailable(dirs, id, subdir, name, archive, false);
     }
 
@@ -106 +123 @@
      * @param name      The name of the image. If it contains no '.', a png extension is added.
      * @param archive   A zip file where the image is located.
-     */
-    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive) {
+     * @param sanitize  If the image should be repainted to a new BufferedImage to work
+     *                  around certain issues.
+     */
+    public static ImageIcon getIfAvailable(Collection<String> dirs, String id, String subdir, String name, File archive, boolean sanitize) {
+        ImageWrapper iw = getIfAvailableImpl(dirs, id, subdir, name, archive);
+        if (iw == null)
+            return null;
+        if (sanitize && !iw.sanitized) {
+            iw.img = sanitize(iw.img);
+            iw.sanitized = true;
+        }
+        return new ImageIcon(iw.img);
+    }
+
+    private static ImageWrapper getIfAvailableImpl(Collection<String> dirs, String id, String subdir, String name, File archive) {
         if (name == null)
             return null;
         if (name.startsWith("http://")) {
-            Image img = cache.get(name);
-            if (img == null) {
+            ImageWrapper iw = cache.get(name);
+            if (iw == null) {
                 try {
                     MirroredInputStream is = new MirroredInputStream(name, new File(Main.pref.getPreferencesDir(),
                     "images").toString());
-                    img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
-                    cache.put(name, img);
+                    Image img = Toolkit.getDefaultToolkit().createImage(is.getFile().toURI().toURL());
+                    iw = new ImageWrapper(img, false);
+                    cache.put(name, iw);
                 } catch (IOException e) {
                 }
             }
-            return img == null ? null : new ImageIcon(img);
+            return iw;
         }
         if (subdir == null) {
@@ -139 +170 @@
         }
 
-        Image img = cache.get(cache_name);
-        if (img == null) {
+        ImageWrapper iw = cache.get(cache_name);
+        if (iw == null) {
             if(archive != null)
             {
@@ -162 +193 @@
                                 size -= l;
                             }
-                            img = Toolkit.getDefaultToolkit().createImage(buf);
+                            Image img = Toolkit.getDefaultToolkit().createImage(buf);
+                            iw = new ImageWrapper(img, false);
                         } finally {
                             if (is != null) {
@@ -185 +217 @@
             // and don't bother to create a URL unless we're actually
             // creating the image.
-            if(img == null)
+            if(iw == null)
             {
                 URL path = getImageUrl(full_name, dirs);
                 if (path == null)
                     return null;
-                img = Toolkit.getDefaultToolkit().createImage(path);
-            }
-            cache.put(cache_name, img);
-        }
-
-        return new ImageIcon(img);
+                Image img = Toolkit.getDefaultToolkit().createImage(path);
+                iw = new ImageWrapper(img, false);
+            }
+            cache.put(cache_name, iw);
+        }
+
+        return iw;
     }
 
@@ -405 +438 @@
         return get("data", type.getAPIName());
     }
+
+    public static BufferedImage sanitize(Image img) {
+        (new ImageIcon(img)).getImage(); // load competely
+        int width = img.getWidth(null);
+        int height = img.getHeight(null);
+        BufferedImage result = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
+        result.getGraphics().drawImage(img, 0, 0, null);
+        return result;
+    }
 }