From e8138580b9eebaa22800dcfdb4ec66596ed20023 Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:59:03 -0700
Subject: [PATCH] fix reading bug arising in MMStudio
---
java/pom.xml | 2 +-
.../java/org/micromanager/ndtiffstorage/NDTiffStorage.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/pom.xml b/java/pom.xml
index 70a8559..3551113 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -2,7 +2,7 @@
4.0.0
org.micro-manager.ndtiffstorage
NDTiffStorage
- 2.15.1
+ 2.15.2
jar
NDTiff Storage file format
Java-based writer and reader used for NDTiffStorage format
diff --git a/java/src/main/java/org/micromanager/ndtiffstorage/NDTiffStorage.java b/java/src/main/java/org/micromanager/ndtiffstorage/NDTiffStorage.java
index 47a337a..b70daf5 100644
--- 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 axes) {
@Override
public TaggedImage getImage(HashMap 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) {