Changeset 14816 in josm for trunk/src/org

Timestamp:

2019-02-25T20:03:10+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17387 - add more details when NegativeArraySizeException occurs to be sure it's caused by ​https://bugs.openjdk.java.net/browse/JDK-4690476

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/imagery/ReprojectionTile.java (modified) (2 diffs)
• tools/ImageWarp.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java

@@ -18 +18 @@
 import org.openstreetmap.josm.tools.ImageWarp;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -166 +167 @@
             transform = pointTransform;
         }
-        BufferedImage imageOut = ImageWarp.warp(
-                imageIn, getDimension(pbTargetAligned, scale),
-                transform, interpolation);
-        synchronized (this) {
-            this.image = imageOut;
-            this.anchor = new TileAnchor(p00Img, p11Img);
-            this.nativeScale = scale;
-            this.maxZoomReached = scaleFix != null;
+        Dimension targetDim = getDimension(pbTargetAligned, scale);
+        try {
+            BufferedImage imageOut = ImageWarp.warp(imageIn, targetDim, transform, interpolation);
+            synchronized (this) {
+                this.image = imageOut;
+                this.anchor = new TileAnchor(p00Img, p11Img);
+                this.nativeScale = scale;
+                this.maxZoomReached = scaleFix != null;
+            }
+        } catch (NegativeArraySizeException e) {
+            // See #17387 - https://bugs.openjdk.java.net/browse/JDK-4690476
+            throw BugReport.intercept(e).put("targetDim", targetDim);
         }
     }

trunk/src/org/openstreetmap/josm/tools/ImageWarp.java

@@ -9 +9 @@
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
@@ -181 +182 @@
                             break;
                         default:
-                            throw new AssertionError();
+                            throw new AssertionError(Objects.toString(interpolation));
                     }
                     imgTarget.setRGB(i, j, rgba);