Merge pull request #89 from melissalinkert/tile-16

Force tile sizes to be a multiple of 16
glencoesoftware · Dec 5, 2022 · 82b9536 · 82b9536
2 parents c58ecec + c86c3c1
commit 82b9536
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/main/java/com/glencoesoftware/pyramid/PyramidSeries.java b/src/main/java/com/glencoesoftware/pyramid/PyramidSeries.java
@@ -76,6 +76,18 @@ public void describePyramid(ZarrGroup reader, OMEPyramidStore metadata)
       descriptor.sizeY = dimensions[dimensions.length - 2];
       descriptor.tileSizeX = blockSizes[blockSizes.length - 1];
       descriptor.tileSizeY = blockSizes[blockSizes.length - 2];
+
+      if (descriptor.tileSizeX % 16 != 0) {
+        LOG.debug("Tile width ({}) not a multiple of 16; correcting",
+          descriptor.tileSizeX);
+        descriptor.tileSizeX += (16 - (descriptor.tileSizeX % 16));
+      }
+      if (descriptor.tileSizeY % 16 != 0) {
+        LOG.debug("Tile height ({}) not a multiple of 16; correcting",
+          descriptor.tileSizeY);
+        descriptor.tileSizeY += (16 - (descriptor.tileSizeY % 16));
+      }
+
       descriptor.numberOfTilesX =
         getTileCount(descriptor.sizeX, descriptor.tileSizeX);
       descriptor.numberOfTilesY =

diff --git a/src/test/java/com/glencoesoftware/raw2ometiff/test/ConversionTest.java b/src/test/java/com/glencoesoftware/raw2ometiff/test/ConversionTest.java
@@ -383,8 +383,19 @@ public void testEdgePaddingUint16() throws Exception {
   public void testOddTileSize() throws Exception {
     input = fake("pixelType", "uint16");
     assertBioFormats2Raw("-w", "17", "-h", "19");
-    assertTool();
+    assertTool("--compression", "raw");
     iteratePixels();
+
+    try (TiffParser parser = new TiffParser(outputOmeTiff.toString())) {
+      IFDList mainIFDs = parser.getMainIFDs();
+      Assert.assertEquals(1, mainIFDs.size());
+      int tileSize = 32 * 32 * 2;
+      long[] tileByteCounts = mainIFDs.get(0).getStripByteCounts();
+      Assert.assertEquals(256, tileByteCounts.length);
+      for (long count : tileByteCounts) {
+        Assert.assertEquals(tileSize, count);
+      }
+    }
   }
 
   /**