Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 12:05:29 -04:00
Code Issues Projects Releases Wiki Activity

#490: Now allows writing using standard TIFF writer in Java 9+

Browse Source
This commit is contained in:
Harald Kuhr 2020-01-17 16:43:27 +01:00
parent 278ce6ef33
commit d2b58ed20e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/Paths.java
View File

@ -62,6 +62,7 @@ import java.util.Map;
import static com.twelvemonkeys.lang.Validate.isTrue; import static com.twelvemonkeys.lang.Validate.isTrue;
import static com.twelvemonkeys.lang.Validate.notNull; import static com.twelvemonkeys.lang.Validate.notNull;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
@ -279,6 +280,7 @@ public final class Paths {
ImageWriteParam param = writer.getDefaultWriteParam(); ImageWriteParam param = writer.getDefaultWriteParam();
IIOMetadata metadata = writer.getDefaultImageMetadata(type, param); IIOMetadata metadata = writer.getDefaultImageMetadata(type, param);
List<String> metadataFormats = asList(metadata.getMetadataFormatNames());
byte[] pathResource = new AdobePathWriter(clipPath).writePathResource(); byte[] pathResource = new AdobePathWriter(clipPath).writePathResource();
@ -286,7 +288,10 @@ public final class Paths {
param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
param.setCompressionType("Deflate"); param.setCompressionType("Deflate");
String metadataFormat = "com_sun_media_imageio_plugins_tiff_image_1.0"; // Check if the format is that of the bundled TIFF writer, otherwise use JAI format
String metadataFormat = metadataFormats.contains("javax_imageio_tiff_image_1.0")
? "javax_imageio_tiff_image_1.0"
: "com_sun_media_imageio_plugins_tiff_image_1.0"; // Fails in mergeTree, if not supported
IIOMetadataNode root = new IIOMetadataNode(metadataFormat); IIOMetadataNode root = new IIOMetadataNode(metadataFormat);
IIOMetadataNode ifd = new IIOMetadataNode("TIFFIFD"); IIOMetadataNode ifd = new IIOMetadataNode("TIFFIFD");
@ -350,7 +355,7 @@ public final class Paths {
return builder.toString(); return builder.toString();
} }
builder.append(", "); builder.append(","); // NOTE: The javax_imageio_tiff_image_1.0 format does not allow whitespace here...
} }
} }