Changeset 323 in josm

Timestamp:

2007-09-16T04:37:42+02:00 (17 years ago)

Author:

framm

Message:

• fixed GeoImageLayer to release memory after thubmnails are built. This was always the intended behavoour but did not work properly, leading to memory shortage when working with large/many images.

File:

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

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

@@ -10 +10 @@
 import java.awt.Cursor;
 import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.GridBagLayout;
 import java.awt.Image;
@@ -20 +21 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.KeyEvent;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -509 +511 @@
                         h = maxSize;
                 }
-                return new ImageIcon(img.getScaledInstance(w, h, Image.SCALE_SMOOTH));
+                return new ImageIcon(createResizedCopy(img, w, h));
+        }
+        
+        private static BufferedImage createResizedCopy(Image originalImage, 
+                        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); 
+                g.dispose();
+                return scaledBI;
         }
 }