Merge pull request #4115 from dgault/JPegTurbo-RevertRTE

Revert RunTimeException when JPEGTurbo cannot be loaded

components/formats-bsd/src/loci/formats/in/TileJPEGReader.java

@@ -147,6 +147,7 @@ public void reopenFile() throws IOException {
       service = null;
       throw new IOException("Could not initialize JPEG service", se);
     }
+    if (!service.isLibraryLoaded()) throw new IOException("JPEG service failed to load Turbo JPEG library");
   }
 
 }

components/formats-bsd/src/loci/formats/services/JPEGTurboService.java

@@ -58,5 +58,7 @@ byte[] getTile(byte[] buf, int xCoordinate, int yCoordinate, int width,
   byte[] getTile(int xTile, int yTile) throws IOException;
 
   void close() throws IOException;
+
+  boolean isLibraryLoaded();
 
 }

components/formats-bsd/src/loci/formats/services/JPEGTurboServiceImpl.java

@@ -106,9 +106,6 @@ public JPEGTurboServiceImpl() {
     logger.setLevel(Level.SEVERE);
     if (!libraryLoaded) {
       libraryLoaded = NativeLibraryUtil.loadNativeLibrary(TJ.class, "turbojpeg");
-      if (!libraryLoaded) {
-        throw new RuntimeException("TurboJPEG could not be loaded");
-      }
     }
   }
 
@@ -383,6 +380,11 @@ public void close() throws IOException {
     header = null;
   }
 
+  @Override
+  public boolean isLibraryLoaded() {
+    return libraryLoaded;
+  }
+
   // -- Helper methods --
 
   private byte[] getFixedHeader() throws IOException {

components/formats-gpl/src/loci/formats/in/HamamatsuVMSReader.java

@@ -157,6 +157,7 @@ public byte[] openBytes(int no, byte[] buf, int x, int y, int w, int h)
 
     if (service == null) {
       service = new JPEGTurboServiceImpl();
+      if (!service.isLibraryLoaded()) throw new IOException("JPEG service failed to load Turbo JPEG library");
     }
 
     try {

components/formats-gpl/src/loci/formats/in/NDPIReader.java

@@ -329,6 +329,7 @@ public int getOptimalTileHeight() {
   /* @see loci.formats.FormatReader#initFile(String) */
   @Override
   protected void initFile(String id) throws FormatException, IOException {
+    if (!service.isLibraryLoaded()) throw new IOException("JPEG service failed to load Turbo JPEG library");
     RandomAccessInputStream s = new RandomAccessInputStream(id);
     use64Bit = s.length() >= Math.pow(2, 32);
     s.close();