Merge pull request #1275 from melissalinkert/nd2-5.0.4-dev_5_0

Performance and position count fixes for ND2
ome · Aug 25, 2014 · 608008b · 608008b
2 parents 2fb7671 + fa6ba9a
commit 608008b
Show file tree

Hide file tree

Showing 2 changed files with 164 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));
         }
       }