Version 19, May 2018

[GpsPrune.git] / tim / prune / jpeg / InternalExifLibrary.java

diff --git a/tim/prune/jpeg/InternalExifLibrary.java b/tim/prune/jpeg/InternalExifLibrary.java
index c8b17089990bc405ada9492ab06bdc3937674200..377155fd2f862fc1a30f040fda7a16c52273b505 100644 (file)
--- a/tim/prune/jpeg/InternalExifLibrary.java
+++ b/tim/prune/jpeg/InternalExifLibrary.java
@@ -1,15 +1,15 @@
 package tim.prune.jpeg;
 
 import java.io.File;
+
 import tim.prune.jpeg.drew.ExifReader;
-import tim.prune.jpeg.drew.JpegException;
+import tim.prune.jpeg.drew.ExifException;
 
 /**
- * Class to act as a gateway into the internal exif library functions.
+ * Class to act as an entry point to the internal exif library functions.
  * This should be the only class with dependence on the jpeg.drew package.
- * Should not be included if external library will be used (eg Debian).
  */
-public class InternalExifLibrary implements ExifLibrary
+public class InternalExifLibrary
 {
        /**
         * Use the _internal_ exif library to get the data from the given file
@@ -20,23 +20,9 @@ public class InternalExifLibrary implements ExifLibrary
        {
                JpegData data = null;
                try {
-                       data = new ExifReader(inFile).extract();
+                       data = ExifReader.readMetadata(inFile);
                }
-               catch (JpegException jpe) {} // data remains null
+               catch (ExifException jpe) {} // data remains null
                return data;
        }
-
-       /**
-        * Check whether the exifreader class can be correctly resolved
-        * @return true if it looks ok
-        */
-       public boolean looksOK()
-       {
-               try {
-                       String test = ExifReader.class.getName();
-                       if (test != null) return true;
-               }
-               catch (LinkageError le) {}
-               return false;
-       }
 }