Changeset 13657 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-04-22T02:41:42+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16212 - NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• gui/mappaint/styleelement/MapImage.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -440 +440 @@
                 }
             } else {
-                Image img = fillImage.getImage(disabled);
-                // TexturePaint requires BufferedImage -> get base image from
-                // possible multi-resolution image
-                img = HiDPISupport.getBaseImage(img);
-                TexturePaint texture = new TexturePaint((BufferedImage) img,
-                        new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
-                g.setPaint(texture);
+                // TexturePaint requires BufferedImage -> get base image from possible multi-resolution image
+                Image img = HiDPISupport.getBaseImage(fillImage.getImage(disabled));
+                if (img != null) {
+                    g.setPaint(new TexturePaint((BufferedImage) img,
+                            new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight())));
+                } else {
+                    Logging.warn("Unable to get image from " + fillImage);
+                }
                 Float alpha = fillImage.getAlphaFloat();
                 if (!Utils.equalsEpsilon(alpha, 1f)) {

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

@@ -112 +112 @@
     private Image getDisabled() {
         if (disabledImgCache != null)
-                return disabledImgCache;
+            return disabledImgCache;
         if (img == null)
             getImage(); // fix #7498 ?