be more forgiving when fileDirectory.SampleFormat does not have all v…

…alues populated, such as in bioformats ome tif files
geotiffjs · May 12, 2023 · e2aed8b · e2aed8b
1 parent f15d770
commit e2aed8b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/geotiffimage.js b/src/geotiffimage.js
@@ -295,8 +295,7 @@ class GeoTIFFImage {
   }
 
   getReaderForSample(sampleIndex) {
-    const format = this.fileDirectory.SampleFormat
-      ? this.fileDirectory.SampleFormat[sampleIndex] : 1;
+    const format = this.getSampleFormat(sampleIndex);
     const bitsPerSample = this.fileDirectory.BitsPerSample[sampleIndex];
     switch (format) {
       case 1: // unsigned integer data
@@ -339,7 +338,8 @@ class GeoTIFFImage {
 
   getSampleFormat(sampleIndex = 0) {
     return this.fileDirectory.SampleFormat
-      ? this.fileDirectory.SampleFormat[sampleIndex] : 1;
+      ? (this.fileDirectory.SampleFormat[sampleIndex] ?? Math.max.apply(null, this.fileDirectory.SampleFormat))
+      : 1;
   }
 
   getBitsPerSample(sampleIndex = 0) {