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

#628: Stabilized build + better dependency scopes and module names in interop modules

Browse Source
This commit is contained in:
Harald Kuhr 2021-09-17 20:32:25 +02:00
parent 3e1f85c4dc
commit 1c59057c30
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imageio/imageio-jpeg-jai-interop/pom.xml
View File

@ -13,7 +13,7 @@
</description> </description>
<properties> <properties>
<project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name> <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jaiinterop</project.jpms.module.name>
</properties> </properties>
<build> <build>
@ -33,6 +33,7 @@
<groupId>com.github.jai-imageio</groupId> <groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId> <artifactId>jai-imageio-core</artifactId>
<version>1.4.0</version> <version>1.4.0</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

2
imageio/imageio-jpeg-jep262-interop/pom.xml
View File

@ -13,7 +13,7 @@
</description> </description>
<properties> <properties>
<project.jpms.module.name>com.twelvemonkeys.imageio.jep262interop</project.jpms.module.name> <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jep262interop</project.jpms.module.name>
</properties> </properties>
<build> <build>

3
imageio/imageio-tiff-jai-interop/pom.xml
View File

@ -13,7 +13,7 @@
</description> </description>
<properties> <properties>
<project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name> <project.jpms.module.name>com.twelvemonkeys.imageio.tiff.jaiinterop</project.jpms.module.name>
</properties> </properties>
<build> <build>
@ -33,6 +33,7 @@
<groupId>com.github.jai-imageio</groupId> <groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId> <artifactId>jai-imageio-core</artifactId>
<version>1.4.0</version> <version>1.4.0</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.twelvemonkeys.imageio</groupId> <groupId>com.twelvemonkeys.imageio</groupId>

27
imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java
View File

@ -30,12 +30,12 @@
package com.twelvemonkeys.imageio.plugins.tiff.jaiinterop; package com.twelvemonkeys.imageio.plugins.tiff.jaiinterop;
import static org.junit.Assert.assertEquals; import com.twelvemonkeys.imageio.metadata.tiff.Rational;
import static org.junit.Assert.assertNotNull; import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
import java.awt.image.BufferedImage; import org.junit.Test;
import java.util.Arrays;
import java.util.Iterator;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.ImageTypeSpecifier; import javax.imageio.ImageTypeSpecifier;
@ -43,13 +43,12 @@ import javax.imageio.ImageWriter;
import javax.imageio.metadata.IIOMetadata; import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataFormatImpl; import javax.imageio.metadata.IIOMetadataFormatImpl;
import javax.imageio.metadata.IIOMetadataNode; import javax.imageio.metadata.IIOMetadataNode;
import java.awt.image.BufferedImage;
import java.util.Arrays;
import java.util.Iterator;
import org.junit.Test; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import com.twelvemonkeys.imageio.metadata.tiff.Rational;
import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
/** /**
* Tests our TIFFImageMetadata works with JAI TIFFImageWriter. * Tests our TIFFImageMetadata works with JAI TIFFImageWriter.
@ -61,10 +60,10 @@ import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
public class TIFFImageMetadataJAInteroperabilityTest { public class TIFFImageMetadataJAInteroperabilityTest {
private static final String JAI_TIFF_PROVIDER_CLASS_NAME = "com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriterSpi"; private static final String JAI_TIFF_PROVIDER_CLASS_NAME = "com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriterSpi";
private ImageWriter getJAIImageWriter() { private ImageWriter createImageWriter() {
Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("TIFF"); Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("TIFF");
if (writers.hasNext()) { while (writers.hasNext()) {
ImageWriter writer = writers.next(); ImageWriter writer = writers.next();
if (JAI_TIFF_PROVIDER_CLASS_NAME.equals(writer.getOriginatingProvider().getClass().getName())) { if (JAI_TIFF_PROVIDER_CLASS_NAME.equals(writer.getOriginatingProvider().getClass().getName())) {
@ -84,7 +83,7 @@ public class TIFFImageMetadataJAInteroperabilityTest {
new TIFFEntry(TIFF.TAG_Y_RESOLUTION, new Rational(200)))); new TIFFEntry(TIFF.TAG_Y_RESOLUTION, new Rational(200))));
ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY); ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY);
ImageWriter writer = getJAIImageWriter(); ImageWriter writer = createImageWriter();
IIOMetadata converted = writer.convertImageMetadata(ourMetadata, type, null); IIOMetadata converted = writer.convertImageMetadata(ourMetadata, type, null);
assertNotNull(converted); assertNotNull(converted);

2
imageio/imageio-tiff-jdk-interop/pom.xml
View File

@ -13,7 +13,7 @@
</description> </description>
<properties> <properties>
<project.jpms.module.name>com.twelvemonkeys.imageio.jdkinterop</project.jpms.module.name> <project.jpms.module.name>com.twelvemonkeys.imageio.tiff.jdkinterop</project.jpms.module.name>
</properties> </properties>
<build> <build>