Changeset 19675 in josm

Timestamp:

2026-11-02T19:30:23+01:00 (23 hours ago)

Author:

gaben

Message:

fix #24997 - AIOOBE in CameraPlane after resizing a zoomed-in 360° image viewer

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplayTest.java (modified) (3 diffs)

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

@@ -1051 +1051 @@
 
             maxVisibleRect.checkRectSize();
+            maxVisibleRect.checkRectPos();
             synchronized (this) {
                 this.visibleRect = maxVisibleRect;

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplayTest.java

@@ -10 +10 @@
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ComponentListener;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
@@ -26 +28 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.data.imagery.street_level.Projections;
 import org.openstreetmap.josm.gui.layer.geoimage.ImageDisplay.VisRect;
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
@@ -113 +116 @@
     }
 
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/24997">#24997</a>, shrinking a zoomed-in
+     * 360° image viewer must keep the visible rectangle inside the offscreen image.
+     */
+    @Test
+    void testNonRegression24997() {
+        final ImageDisplay imageDisplay = new ImageDisplay(new ImageryFilterSettings());
+        imageDisplay.setSize(800, 400);
+        imageDisplay.setImage0(new TestImageEntry(2000, 1000) {
+            @Override
+            public Projections getProjectionType() {
+                return Projections.EQUIRECTANGULAR;
+            }
+
+            @Override
+            public BufferedImage read(Dimension target) {
+                // Byte image, so that CameraPlane uses its fast byte mapping like for typical JPEG photos
+                return new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_3BYTE_BGR);
+            }
+        }).run();
+        // zoom in near the bottom right corner, so the visible rectangle is moved away from the origin
+        final MouseWheelEvent zoomIn = new MouseWheelEvent(imageDisplay, 0, 0, 0, 790, 390, 790, 390, 0,
+                false, MouseWheelEvent.WHEEL_UNIT_SCROLL, -1, -1, -1);
+        for (MouseWheelListener listener : imageDisplay.getMouseWheelListeners()) {
+            listener.mouseWheelMoved(zoomIn);
+        }
+
+        imageDisplay.setSize(600, 300);
+        final ComponentEvent resized = new ComponentEvent(imageDisplay, ComponentEvent.COMPONENT_RESIZED);
+        for (ComponentListener listener : imageDisplay.getComponentListeners()) {
+            listener.componentResized(resized);
+        }
+        final Graphics2D g = new BufferedImage(600, 300, BufferedImage.TYPE_INT_ARGB).createGraphics();
+        assertDoesNotThrow(() -> imageDisplay.paintComponent(g));
+    }
+
     private static class TestImageEntry extends ImageEntry {
         private final int width;