Mercurial > hg > digilib
changeset 1693:dbe534cdb5f6
New ImageIO-JNR plugin option.
Can be activated with "mvn -Dimageio=jnr".
Uses BSBs ImageIO-JNR plugin from https://github.com/dbmdz/imageio-jnr
Needs native libraries installed separately.
| author | Robert Casties <casties@mpiwg-berlin.mpg.de> |
|---|---|
| date | Sat, 07 Apr 2018 20:05:20 +0200 |
| parents | 72215ed088ac |
| children | e0297fc99e80 |
| files | common/pom.xml common/src/main/java/digilib/image/ImageLoaderDocuImage.java pom.xml |
| diffstat | 3 files changed, 30 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/pom.xml Mon Mar 26 20:50:06 2018 +0200 +++ b/common/pom.xml Sat Apr 07 20:05:20 2018 +0200 @@ -67,6 +67,29 @@ </dependency> </dependencies> </profile> + <profile> + <id>imageio-jnr</id> + <!-- use BSBs ImageIO-JNR plugin from https://github.com/dbmdz/imageio-jnr --> + <activation> + <!-- <activeByDefault>true</activeByDefault> --> + <property> + <name>imageio</name> + <value>jnr</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>de.digitalcollections.imageio</groupId> + <artifactId>imageio-turbojpeg</artifactId> + <version>0.2.5</version> + </dependency> + <dependency> + <groupId>de.digitalcollections.imageio</groupId> + <artifactId>imageio-openjpeg</artifactId> + <version>0.2.5</version> + </dependency> + </dependencies> + </profile> </profiles> <dependencies>
--- a/common/src/main/java/digilib/image/ImageLoaderDocuImage.java Mon Mar 26 20:50:06 2018 +0200 +++ b/common/src/main/java/digilib/image/ImageLoaderDocuImage.java Sat Apr 07 20:05:20 2018 +0200 @@ -400,11 +400,15 @@ throw new FileOpException("Can't find Reader to load File!"); } ImageReader reader = readers.next(); + if (reader == null) { + throw new FileOpException("Error getting Reader to load File!"); + } logger.debug("ImageIO: this reader: " + reader.getClass()); /* - * while (readers.hasNext()) { logger.debug("ImageIO: next reader: " + - * readers.next().getClass()); } - */ + while (readers.hasNext()) { + logger.debug("ImageIO: next reader: " + readers.next().getClass()); + } + */ reader.setInput(istream); return reader; }