Merge pull request #4197 from dgault/ics-null-imagename

ICS: Fix NPE when image name is empty
ome · Jun 18, 2024 · 7ca9980 · 7ca9980
2 parents a1d05e4 + 30dc860
commit 7ca9980
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/components/formats-bsd/src/loci/formats/in/ICSReader.java b/components/formats-bsd/src/loci/formats/in/ICSReader.java
@@ -1479,10 +1479,12 @@ else if (labels.equalsIgnoreCase("x y t")) {
     MetadataTools.populatePixels(store, this, true);
 
     // populate Image data
-    imageName = imageName.replace('/', File.separatorChar);
-    imageName = imageName.replace('\\', File.separatorChar);
-    imageName = imageName.substring(imageName.lastIndexOf(File.separator) + 1);
-    store.setImageName(imageName, 0);
+    if (imageName != null) {
+      imageName = imageName.replace('/', File.separatorChar);
+      imageName = imageName.replace('\\', File.separatorChar);
+      imageName = imageName.substring(imageName.lastIndexOf(File.separator) + 1);
+      store.setImageName(imageName, 0);
+    }
 
     if (date != null) store.setImageAcquisitionDate(new Timestamp(date), 0);