merge dev_5_0 -Dorg -Ssuccess-only: PR 1275 (Performance and position…

… count fixes for ND2)
ome · Aug 21, 2014 · 224c212 · 224c212
2 parents 4a28d34 + 06a268b
commit 224c212
Show file tree

Hide file tree

Showing 2 changed files with 163 additions and 69 deletions.
diff --git a/components/formats-gpl/src/loci/formats/in/ND2Handler.java b/components/formats-gpl/src/loci/formats/in/ND2Handler.java
@@ -858,6 +858,10 @@ else if (key.equals("Exposure")) {
           if (s.length > 1) {
             if (s[1].equals("ms")) time /= 1000;
           }
+          else {
+            // assume time is in milliseconds
+            time /= 1000;
+          }
           exposureTime.add(new Double(time));
         }
       }