Changeset 1183 in josm

Timestamp:

Dec 27, 2008 12:26:33 PM (4 years ago)

Author:

stoecker

Message:

apply patch from #526, close #84

File:

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

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

@@ -16 +16 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -522 +523 @@
 
     private static Icon loadScaledImage(File f, int maxSize) {
-        Image img = new ImageIcon(f.getPath()).getImage();
+        Image img = Toolkit.getDefaultToolkit().createImage(f.getPath());
+        while (img.getWidth(null) < 0 || img.getHeight(null) < 0) {
+          try {
+            Thread.sleep(10);
+          } catch(InterruptedException ie) {}
+        }
         int w = img.getWidth(null);
         int h = img.getHeight(null);
@@ -536 +542 @@
 
     private static BufferedImage createResizedCopy(Image originalImage,
-            int scaledWidth, int scaledHeight)
+    int scaledWidth, int scaledHeight)
     {
         BufferedImage scaledBI = new BufferedImage(scaledWidth, scaledHeight, BufferedImage.TYPE_INT_RGB);
         Graphics2D g = scaledBI.createGraphics();
-
-        g.drawImage(originalImage, 0, 0, scaledWidth, scaledHeight, null);
+        while (!g.drawImage(originalImage, 0, 0, scaledWidth, scaledHeight, null))
+        {
+          try {
+            Thread.sleep(10);
+          } catch(InterruptedException ie) {}
+        }
         g.dispose();
         return scaledBI;