Changeset 11397 in josm for trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

Timestamp:

2016-12-14T15:50:53+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -504 +504 @@
                         if (e.hasThumbnail()) {
                             Dimension d = scaledDimension(e.getThumbnail());
-                            Rectangle target = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
-                            if (clip.intersects(target)) {
-                                tempG.drawImage(e.getThumbnail(), target.x, target.y, target.width, target.height, null);
+                            if (d != null) {
+                                Rectangle target = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+                                if (clip.intersects(target)) {
+                                    tempG.drawImage(e.getThumbnail(), target.x, target.y, target.width, target.height, null);
+                                }
                             }
                         } else { // thumbnail not loaded yet
@@ -540 +542 @@
                 if (useThumbs && e.hasThumbnail()) {
                     Dimension d = scaledDimension(e.getThumbnail());
-                    imgWidth = d.width;
-                    imgHeight = d.height;
+                    if (d != null) {
+                        imgWidth = d.width;
+                        imgHeight = d.height;
+                    } else {
+                        imgWidth = -1;
+                        imgHeight = -1;
+                    }
                 } else {
                     imgWidth = selectedIcon.getIconWidth();
@@ -756 +763 @@
                 if (useThumbs && img.hasThumbnail()) {
                     Dimension d = scaledDimension(img.getThumbnail());
-                    r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+                    if (d != null)
+                        r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+                    else
+                        r = null;
                 } else {
                     r = new Rectangle(p.x - icon.getIconWidth() / 2,
@@ -763 +773 @@
                                       icon.getIconHeight());
                 }
-                if (r.contains(evt.getPoint())) {
+                if (r != null && r.contains(evt.getPoint())) {
                     return img;
                 }
@@ -861 +871 @@
                     if (useThumbs && e.hasThumbnail()) {
                         Dimension d = scaledDimension(e.getThumbnail());
-                        r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+                        if (d != null)
+                            r = new Rectangle(p.x - d.width / 2, p.y - d.height / 2, d.width, d.height);
+                        else
+                            r = null;
                     } else {
                         r = new Rectangle(p.x - icon.getIconWidth() / 2,
@@ -868 +881 @@
                                 icon.getIconHeight());
                     }
-                    if (r.contains(ev.getPoint())) {
+                    if (r != null && r.contains(ev.getPoint())) {
                         clearOtherCurrentPhotos();
                         currentPhoto = i;