Exporter: fix typo when setting Channel.SamplesPerPixel

melissalinkert · melissalinkert · commit e818377881df · 2024-07-23T16:35:32.000-05:00
This caused a problem when exporting DICOM with multiple channels from ImageJ,
as the DICOM writer strictly requires non-null SamplesPerPixel on every Channel.
diff --git a/components/bio-formats-plugins/src/loci/plugins/out/Exporter.java b/components/bio-formats-plugins/src/loci/plugins/out/Exporter.java
@@ -505,7 +505,7 @@ else if (FormatTools.isSigned(originalType)) {
                     String lsid = MetadataTools.createLSID("Channel", 0, c);
                     store.setChannelID(lsid, 0, c);
                 }
-                store.setChannelSamplesPerPixel(new PositiveInteger(channels), 0, 0);
+                store.setChannelSamplesPerPixel(new PositiveInteger(channels), 0, c);
 
                 if (imp instanceof CompositeImage) {
                     luts[c] = ((CompositeImage) imp).getChannelLut(c + 1);

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ else if (FormatTools.isSigned(originalType)) {`
`505`	`505`	`String lsid = MetadataTools.createLSID("Channel", 0, c);`
`506`	`506`	`store.setChannelID(lsid, 0, c);`
`507`	`507`	`}`
`508`		`- store.setChannelSamplesPerPixel(new PositiveInteger(channels), 0, 0);`
	`508`	`+ store.setChannelSamplesPerPixel(new PositiveInteger(channels), 0, c);`
`509`	`509`
`510`	`510`	`if (imp instanceof CompositeImage) {`
`511`	`511`	`luts[c] = ((CompositeImage) imp).getChannelLut(c + 1);`