Merge pull request #134 from henrypinkard/main

fix reading bug arising in MMStudio
micro-manager · Sep 7, 2023 · e6537ce · e6537ce
2 parents b27dfdb + e813858
commit e6537ce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/java/pom.xml b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.ndtiffstorage</groupId>
     <artifactId>NDTiffStorage</artifactId>
-    <version>2.15.1</version>
+    <version>2.15.2</version>
     <packaging>jar</packaging>
     <name>NDTiff Storage file format</name>
     <description>Java-based writer and reader used for NDTiffStorage format</description>

diff --git a/java/src/main/java/org/micromanager/ndtiffstorage/NDTiffStorage.java b/java/src/main/java/org/micromanager/ndtiffstorage/NDTiffStorage.java
@@ -997,8 +997,8 @@ public boolean hasImage(HashMap<String, Object> axes) {
    @Override
    public TaggedImage getImage(HashMap<String, Object> axes, int dsIndex) {
       //return a single tile from the full res image
-      if (fullResStorage_ == null || lowResStorages_ == null ||
-              (!lowResStorages_.containsKey(dsIndex) && dsIndex != 0) ){
+      if (fullResStorage_ == null || (tiled_ && lowResStorages_ == null) ||
+              (tiled_ && !lowResStorages_.containsKey(dsIndex) && dsIndex != 0) ){
          return null;
       }
       if (dsIndex == 0) {