From d341f4c9ea4fe5fff1c3fd6013f7e21d74cca8c1 Mon Sep 17 00:00:00 2001
From: Melissa Linkert <melissa@glencoesoftware.com>
Date: Thu, 8 Aug 2024 13:28:04 -0500
Subject: [PATCH] Fix strip padding when working with planar strips

---
 .../src/loci/formats/tiff/TiffSaver.java      | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/components/formats-bsd/src/loci/formats/tiff/TiffSaver.java b/components/formats-bsd/src/loci/formats/tiff/TiffSaver.java
index f803895bca2..06c01da240b 100644
--- a/components/formats-bsd/src/loci/formats/tiff/TiffSaver.java
+++ b/components/formats-bsd/src/loci/formats/tiff/TiffSaver.java
@@ -350,15 +350,22 @@ public void writeImage(byte[] buf, IFD ifd, int no, int pixelType, int x,
             stripOut[strip].write(buf, strip * stripSize, stripSize);
           }
         } else {
-          for (int strip = 0; strip < nStrips - 1; strip++) {
-            stripOut[strip].write(buf, strip * stripSize, stripSize);
-          }
-          // Sigh.  Need to pad the last strip.
-          int pos = (nStrips - 1) * stripSize;
-          int len = buf.length - pos;
-          stripOut[nStrips - 1].write(buf, pos, len);
-          for (int n = len; n < stripSize; n++) {
-            stripOut[nStrips - 1].writeByte(0);
+          int effectiveStrips = !interleaved ? nStrips / nChannels : nStrips;
+          int planarChannels = !interleaved ? nChannels : 1;
+          int totalBytesPerChannel = buf.length / planarChannels;
+          for (int p=0; p<planarChannels; p++) {
+            for (int strip = 0; strip < effectiveStrips - 1; strip++) {
+              stripOut[p * effectiveStrips + strip].write(buf, strip * stripSize, stripSize);
+            }
+            // Sigh.  Need to pad the last strip.
+            int pos = p * totalBytesPerChannel + (effectiveStrips - 1) * stripSize;
+            int len = (p + 1)*totalBytesPerChannel - pos;
+            int lastStripIndex = p * effectiveStrips + (effectiveStrips - 1);
+            stripOut[lastStripIndex].write(buf, pos, len);
+
+            byte[] extra = new byte[stripSize - len];
+            Arrays.fill(extra, (byte) 0);
+            stripOut[lastStripIndex].write(extra);
           }
         }
       } else {