Changeset 34169 in osm for applications/editors/josm/plugins/piclayer/src

Timestamp:

2018-04-27T00:06:11+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm16230 - add robustness when drawing image

File:

• applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java (modified) (3 diffs)

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java

@@ -249 +249 @@
 
             // Draw picture
-            g.drawImage(image, -image.getWidth(null) / 2, -image.getHeight(null) / 2, null);
+            int width = image.getWidth(null);
+            int height = image.getHeight(null);
+            try {
+                g.drawImage(image, -width / 2, -height / 2, null);
+            } catch (RuntimeException e) {
+                Logging.error(e);
+            }
 
             // Draw additional rectangle for the active pic layer
@@ -255 +261 @@
                 g.setColor(new Color(0xFF0000));
                 g.drawRect(
-                    -image.getWidth(null) / 2,
-                    -image.getHeight(null) / 2,
-                    image.getWidth(null),
-                    image.getHeight(null)
+                    -width / 2,
+                    -height / 2,
+                    width,
+                    height
                 );
             }
@@ -283 +289 @@
             }
         } else {
-            // TODO: proper logging
-            System.out.println("PicLayerAbstract::paint - general drawing error (image is null or Graphics not 2D");
+            Logging.error("PicLayerAbstract::paint - general drawing error (image is null or Graphics not 2D");
         }
     }