Changeset 13397 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2018-02-10T00:13:49+01:00 (6 years ago)

Author:

michael2402

Message:

Fix #15878: Implement colorfullness filter for indexed images.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessorTest.java

@@ -8 +8 @@
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.DataBuffer;
+import java.awt.image.IndexColorModel;
 
 import org.junit.Rule;
@@ -22 +24 @@
 
     private static final int TEST_IMAGE_SIZE = 5;
+
+    private static final int[] PALETTE = {
+            Color.BLACK.getRGB(),
+            Color.WHITE.getRGB(),
+            Color.GRAY.getRGB(),
+            Color.GREEN.getRGB(),
+            Color.RED.getRGB(),
+            Color.BLUE.getRGB(),
+            0xff908050,
+            0xff908070,
+            0xff908070,
+            0xff908070,
+            0xfff02080,
+    };
+
+    private static final IndexColorModel COLOR_MODEL = new IndexColorModel(8, PALETTE.length, PALETTE, 0, true, 255, DataBuffer.TYPE_BYTE);
 
     /**
@@ -79 +97 @@
                     BufferedImage.TYPE_3BYTE_BGR,
                     BufferedImage.TYPE_4BYTE_ABGR,
-                    BufferedImage.TYPE_4BYTE_ABGR_PRE }) {
+                    BufferedImage.TYPE_4BYTE_ABGR_PRE,
+                    BufferedImage.TYPE_BYTE_INDEXED }) {
                 assertTrue(runProcessing(data, type));
             }
@@ -104 +123 @@
 
     private BufferedImage createImage(Color color, int type) {
-        BufferedImage image = new BufferedImage(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, type);
+        BufferedImage image = type == BufferedImage.TYPE_BYTE_INDEXED
+                ? new BufferedImage(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, type, COLOR_MODEL)
+                : new BufferedImage(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, type);
         Graphics2D graphics = image.createGraphics();
         graphics.setColor(color);
         graphics.fillRect(0, 0, TEST_IMAGE_SIZE, TEST_IMAGE_SIZE);
+        assertEquals(color.getRGB(), image.getRGB(1, 1));
         return image;
     }