Changeset 10862 in josm for trunk/src/com/drew/metadata/exif/makernotes/CanonMakernoteDescriptor.java

Timestamp:

2016-08-20T20:58:03+02:00 (10 years ago)

Author:

Don-vip

Message:

update to metadata-extractor 2.9.1

File:

• trunk/src/com/drew/metadata/exif/makernotes/CanonMakernoteDescriptor.java (modified) (4 diffs)

trunk/src/com/drew/metadata/exif/makernotes/CanonMakernoteDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2015 Drew Noakes
+ * Copyright 2002-2016 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -24 +24 @@
 import com.drew.lang.annotations.Nullable;
 import com.drew.metadata.TagDescriptor;
+
+import java.text.DecimalFormat;
 
 import static com.drew.metadata.exif.makernotes.CanonMakernoteDirectory.*;
@@ -138 +140 @@
     public String getSerialNumberDescription()
     {
+        // http://www.ozhiker.com/electronics/pjmt/jpeg_info/canon_mn.html
         Integer value = _directory.getInteger(TAG_CANON_SERIAL_NUMBER);
         if (value == null)
@@ -673 +676 @@
             return "Self timer not used";
         } else {
-            // TODO find an image that tests this calculation
-            return Double.toString((double)value * 0.1d) + " sec";
+            DecimalFormat format = new DecimalFormat("0.##");
+            return format.format((double)value * 0.1d) + " sec";
         }
     }