Changeset 13823 in josm

Timestamp:

2018-05-23T20:22:13+02:00 (6 years ago)

Author:

Don-vip

Message:

see #9984, see #16047 - Java 11 handles transparent PNG out of the box, disable JOSM mechanisms to force transparency on this version

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -1778 +1778 @@
      * @param enforceTransparency if {@code true}, makes sure to read image metadata and, if the image does not
      * provide an alpha channel but defines a {@code TransparentColor} metadata node, that the resulting image
-     * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color.
+     * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color. For Java < 11 only.
      *
      * @return a <code>BufferedImage</code> containing the decoded
@@ -1801 +1801 @@
         try {
             bi = reader.read(0, param);
-            if (bi.getTransparency() != Transparency.TRANSLUCENT && (readMetadata || enforceTransparency)) {
+            if (bi.getTransparency() != Transparency.TRANSLUCENT && (readMetadata || enforceTransparency) && Utils.getJavaVersion() < 11) {
                 Color color = getTransparentColor(bi.getColorModel(), reader);
                 if (color != null) {

trunk/test/unit/org/openstreetmap/josm/tools/ImageProviderTest.java

@@ -64 +64 @@
         assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, true, true).getTransparency());
         assertEquals(Transparency.TRANSLUCENT, ImageProvider.read(file, false, true).getTransparency());
-        assertEquals(Transparency.OPAQUE, ImageProvider.read(file, false, false).getTransparency());
-        assertEquals(Transparency.OPAQUE, ImageProvider.read(file, true, false).getTransparency());
+        long expectedTransparency = Utils.getJavaVersion() < 11 ? Transparency.OPAQUE : Transparency.TRANSLUCENT;
+        assertEquals(expectedTransparency, ImageProvider.read(file, false, false).getTransparency());
+        assertEquals(expectedTransparency, ImageProvider.read(file, true, false).getTransparency());
     }