X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fjpeg%2FExifGateway.java;h=c11ba2e69ec7c3f1d7ead5bd7a549ec3ea6ce318;hb=8c8868ae29b3252f02e094c02307384cf61ba667;hp=c60afb299822c623f7a4abe77a78e485e50bdc00;hpb=140e9d165f85c3d4f0435a311e091209313faa2a;p=GpsPrune.git
diff --git a/tim/prune/jpeg/ExifGateway.java b/tim/prune/jpeg/ExifGateway.java
index c60afb2..c11ba2e 100644
--- a/tim/prune/jpeg/ExifGateway.java
+++ b/tim/prune/jpeg/ExifGateway.java
@@ -1,9 +1,7 @@
package tim.prune.jpeg;
import java.io.File;
-
import javax.swing.JOptionPane;
-
import tim.prune.I18nManager;
/**
@@ -12,10 +10,8 @@ import tim.prune.I18nManager;
* to the external libmetadata-extractor-java library
* instead of the included modified routines.
*
- * To use the internal routines, set the USE_INTERNAL_LIBRARY flag to true
- * and include the internal classes in the compiled jar.
- * To use the external library, set the USE_INTERNAL_LIBRARY flag to false
- * and do not export the internal classes.
+ * Switching between internal and external libraries is
+ * handled by the ExifLibrarySwitch
*/
public abstract class ExifGateway
{
@@ -51,7 +47,10 @@ public abstract class ExifGateway
return data;
}
}
- catch (LinkageError nolib) {}
+ catch (LinkageError nolib) {
+ System.err.println("Link: " + nolib.getMessage());
+ nolib.printStackTrace();
+ }
// Not successful - warn if necessary
if (!_exifFailWarned)
{
@@ -71,4 +70,39 @@ public abstract class ExifGateway
if (_exifLibrary == null || !_exifLibrary.looksOK()) {key = key + ".failed";}
return key;
}
+
+
+ /**
+ * @param inNumerator numerator from Rational
+ * @param inDenominator denominator from Rational
+ * @return the value of the specified number as a positive double
.
+ * Prevents interpretation of 32 bit numbers as negative, and forces a positive answer
+ */
+ public static final double convertToPositiveValue(int inNumerator, int inDenominator)
+ {
+ if (inDenominator == 0) return 0.0;
+ double numeratorDbl = inNumerator;
+ double denomDbl = inDenominator;
+ if (inNumerator >= 0)
+ return numeratorDbl / denomDbl;
+ final double correction = Math.pow(2.0, 32);
+ numeratorDbl += correction;
+ if (inDenominator < 0) denomDbl += correction;
+ return numeratorDbl / denomDbl;
+ }
+
+
+ /**
+ * @param inNumerator numerator from Rational
+ * @param inDenominator denominator from Rational
+ * @return the value of the specified number as a positive double
.
+ * Forces a positive answer
+ */
+ public static final double convertToPositiveValue(long inNumerator, long inDenominator)
+ {
+ if (inDenominator == 0L) return 0.0;
+ final double numeratorDbl = inNumerator;
+ final double denomDbl = inDenominator;
+ return numeratorDbl / denomDbl;
+ }
}