Changeset 8832 in josm for trunk/src

Timestamp:

2015-10-07T21:26:40+02:00 (9 years ago)

Author:

simon04

Message:

fix #11942 - Make gamma correction more robust to mysterious image types

File:

• trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java (modified) (2 diffs)

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

@@ -11 +11 @@
 import java.awt.Graphics2D;
 import java.awt.GridBagLayout;
+import java.awt.Transparency;
 import java.awt.event.ActionEvent;
 import java.awt.font.FontRenderContext;
@@ -280 +281 @@
         }
 
-        private LookupOp getOp(int bands) {
-            if (gamma == 1) {
-                return null;
-            } else if (bands == 3) {
-                return op3;
-            } else if (bands == 4) {
-                return op4;
-            } else {
-                return null;
-            }
-        }
-
         @Override
         public BufferedImage process(BufferedImage image) {
-            final LookupOp op = getOp(image.getRaster().getNumBands());
-            final BufferedImage to = new BufferedImage(image.getWidth(), image.getHeight(), image.getType());
-            return op == null ? image : op.filter(image, to);
+            if (gamma == 1) {
+                return image;
+            }
+            try {
+                final int bands = image.getRaster().getNumBands();
+                if (image.getType() != BufferedImage.TYPE_CUSTOM && bands == 3) {
+                    return op3.filter(image, null);
+                } else if (image.getType() != BufferedImage.TYPE_CUSTOM && bands == 4) {
+                    return op4.filter(image, null);
+                }
+            } catch (IllegalArgumentException ignore) {
+            }
+            final int type = image.getTransparency() == Transparency.OPAQUE ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
+            final BufferedImage to = new BufferedImage(image.getWidth(), image.getHeight(), type);
+            to.getGraphics().drawImage(image, 0, 0, null);
+            return process(to);
         }
     }