# HG changeset patch
# User Robert Casties <casties@mpiwg-berlin.mpg.de>
# Date 1523124320 -7200
# Node ID dbe534cdb5f6ebbc5ddce2d5fb8fbd93a2ef0934
# Parent  72215ed088acb7e69695318503bc723f4a1a253e
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.

diff -r 72215ed088ac -r dbe534cdb5f6 common/pom.xml
--- 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>
diff -r 72215ed088ac -r dbe534cdb5f6 common/src/main/java/digilib/image/ImageLoaderDocuImage.java
--- 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;
     }
diff -r 72215ed088ac -r dbe534cdb5f6 pom.xml
--- a/pom.xml	Mon Mar 26 20:50:06 2018 +0200
+++ b/pom.xml	Sat Apr 07 20:05:20 2018 +0200
@@ -187,8 +187,6 @@
       </modules>
     </profile>
   </profiles>
-  <repositories>
-  </repositories>
 
   <dependencyManagement>
     <dependencies>