Changeset 18503 in josm for trunk/src/org

Timestamp:

2022-06-28T23:19:33+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22170: AIOOBE in org.openstreetmap.josm.gui.util.imagery.CameraPlane

File:

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

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

@@ -698 +698 @@
         IImageViewer currentImageViewer;
         BufferedImage currentImage;
-        VisRect currentVisibleRect;
         boolean currentErrorLoading;
 
@@ -705 +704 @@
             currentEntry = this.entry;
             currentOldEntry = this.oldEntry;
-            currentVisibleRect = this.visibleRect;
             currentErrorLoading = this.errorLoading;
         }
@@ -717 +715 @@
         if (currentImage != null && (currentEntry != null || currentOldEntry != null)) {
             currentImageViewer = this.getIImageViewer(currentEntry);
+            // This must be after the getIImageViewer call, since we may be switching image viewers. This is important,
+            // since an image viewer on switch may change the visible rectangle.
+            VisRect currentVisibleRect;
+            synchronized (this) {
+                currentVisibleRect = this.visibleRect;
+            }
             Rectangle r = new Rectangle(currentVisibleRect);
             Rectangle target = calculateDrawImageRectangle(currentVisibleRect, size);