Changeset 17828 in josm for trunk/src/org/openstreetmap

Timestamp:

2021-04-26T20:42:29+02:00 (4 years ago)

Author:

simon04

Message:

see #20659 - Image viewer: apply filters when loading, not when rendering

This fixes:

• ineffective colorfulness filter
• performance when panning/zooming

File:

• trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java (modified) (6 diffs)

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

@@ -60 +60 @@
     /** The image currently displayed */
     private transient BufferedImage image;
+
+    /** The image currently displayed after applying {@link #imageProcessor} */
+    private transient BufferedImage processedImage;
 
     /**
@@ -380 +383 @@
 
                         ImageDisplay.this.image = img;
+                        updateProcessedImage();
                         // This will clear the loading info box
                         ImageDisplay.this.oldEntry = ImageDisplay.this.entry;
@@ -745 +749 @@
             if (entry == null) {
                 image = null;
+                updateProcessedImage();
                 this.oldEntry = null;
             }
@@ -778 +783 @@
     @Override
     public void filterChanged() {
+        updateProcessedImage();
         repaint();
+    }
+
+    private void updateProcessedImage() {
+        processedImage = image == null ? null : imageProcessor.process(image);
     }
 
@@ -790 +800 @@
 
         synchronized (this) {
-            image = this.image;
+            image = this.processedImage;
             entry = this.entry;
             oldEntry = this.oldEntry;
@@ -840 +850 @@
             }
 
-            if (image != null) {
-                image = imageProcessor.process(image);
-            }
-
             g.drawImage(image,
                     target.x, target.y, target.x + target.width, target.y + target.height,