Ticket #1954: FixCrashBug.patch

src/wmsplugin/GeorefImage.java

@@ -52 +52 @@
         EastNorth ma = new EastNorth(max.east()+dx, max.north()+dy);
         Point minPt = nc.getPoint(mi), maxPt = nc.getPoint(ma);
 
-        // downloadAndPaintVisible in WMSLayer.java requests visible images only
-        // so this path is never hit. 
         /* this is isVisible() but taking dx, dy into account */
-        /*if(!(g.hitClip(minPt.x, maxPt.y, maxPt.x - minPt.x, minPt.y - maxPt.y))) {
+        if(!(g.hitClip(minPt.x, maxPt.y, maxPt.x - minPt.x, minPt.y - maxPt.y))) {
             return false;
-        }*/
+        }
         
         // Width and height flicker about 2 pixels due to rounding errors, typically only 1
         int width = Math.abs(maxPt.x-minPt.x);
@@ -65 +63 @@
         int diffx = reImgHash.width - width;
         int diffy = reImgHash.height - height;
         
+        // This happens if you zoom outside the world
+        if(width == 0 || height == 0)
+            return false;
+        
         // We still need to re-render if the requested size is larger (otherwise we'll have black lines)
         // If it's only up to two pixels smaller, just draw the old image, the errors are minimal
         // but the performance improvements when moving are huge