diff --git a/gradle.properties b/gradle.properties index 38dacb0..a0bec02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = org.xbib.graphics name = graphics -version = 5.3.4 +version = 5.3.5 diff --git a/graphics-pdfbox/build.gradle b/graphics-pdfbox/build.gradle index dc2afd2..db7b71a 100644 --- a/graphics-pdfbox/build.gradle +++ b/graphics-pdfbox/build.gradle @@ -2,6 +2,7 @@ dependencies { api libs.pdfbox api project(':graphics-zxing') runtimeOnly libs.pdfbox.jbig2 + runtimeOnly libs.jai.jpeg2000 testImplementation testLibs.jfreechart testImplementation project(':graphics-svg') } diff --git a/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JBig2Test.java b/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JBig2Test.java index 2fdbec5..a955c44 100644 --- a/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JBig2Test.java +++ b/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JBig2Test.java @@ -3,18 +3,19 @@ package org.xbib.graphics.pdfbox.test; import org.junit.jupiter.api.Test; import javax.imageio.ImageIO; -import java.util.logging.Level; -import java.util.logging.Logger; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class JBig2Test { - private static final Logger logger = Logger.getLogger(JBig2Test.class.getName()); - @Test public void checkPlugins() { ImageIO.scanForPlugins(); - for (String suffix : ImageIO.getReaderFileSuffixes()) { - logger.log(Level.INFO, "ImageIO suffix: " + suffix); - } + Set set = new LinkedHashSet<>(); + Collections.addAll(set, ImageIO.getReaderFileSuffixes()); + assertTrue(set.contains("jbig2")); } } diff --git a/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JPEG2000Test.java b/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JPEG2000Test.java new file mode 100644 index 0000000..4b9702b --- /dev/null +++ b/graphics-pdfbox/src/test/java/org/xbib/graphics/pdfbox/test/JPEG2000Test.java @@ -0,0 +1,23 @@ +package org.xbib.graphics.pdfbox.test; + +import org.junit.jupiter.api.Test; + +import javax.imageio.ImageIO; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class JPEG2000Test { + + @Test + public void checkPlugins() { + ImageIO.scanForPlugins(); + Set set = new LinkedHashSet<>(); + Collections.addAll(set, ImageIO.getReaderFileSuffixes()); + assertTrue(set.contains("jp2")); + } +} diff --git a/settings.gradle b/settings.gradle index 7b530eb..4c1c0db 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,6 +23,7 @@ dependencyResolutionManagement { library('jna', 'net.java.dev.jna', 'jna').version('5.14.0') library('pdfbox', 'org.apache.pdfbox', 'pdfbox').version('4.0.0-SNAPSHOT') library('pdfbox.jbig2', 'org.apache.pdfbox', 'jbig2-imageio').version('3.0.4') + library('jai-jpeg2000', 'com.github.jai-imageio', 'jai-imageio-jpeg2000').version('1.4.0') library('datastructures-settings', 'org.xbib', 'settings-datastructures').versionRef('datastructures') library('datastructures-settings-json', 'org.xbib', 'settings-datastructures-json').versionRef('datastructures') library('datastructures-settings-yaml', 'org.xbib', 'settings-datastructures-yaml').versionRef('datastructures')