Merge branch 'main' into uncompressed_verify

Author: cary-ilm

src/lib/OpenEXRCore/parse_header.c

@@ -2492,7 +2492,9 @@ internal_exr_compute_chunk_offset_size (exr_priv_part_t curpart)
 
     w = (uint64_t) (((int64_t) dw.max.x) - ((int64_t) dw.min.x) + 1);
 
-    if (curpart->tiles)
+    if (curpart->storage_mode != EXR_STORAGE_SCANLINE &&
+       curpart->storage_mode != EXR_STORAGE_DEEP_SCANLINE &&
+       curpart->tiles)
     {
         const exr_attr_tiledesc_t* tiledesc  = curpart->tiles->tiledesc;
         int64_t                    tilecount = 0;

src/lib/OpenEXRUtil/ImfCheckFile.cpp

@@ -694,15 +694,24 @@ readDeepTile (T& in, bool reduceMemory, bool reduceTime)
                             try
                             {
 
+
                                 in.readPixelSampleCounts (
                                     x, y, x, y, xlevel, ylevel);
 
                                 size_t bufferSize     = 0;
                                 size_t fileBufferSize = 0;
 
-                                for (int ty = 0; ty < tileHeight; ++ty)
+                                Box2i tileRange =
+                                    in.dataWindowForTile (x, y, xlevel, ylevel);
+
+                                int thisTileWidth =
+                                    tileRange.max.x - tileRange.min.x + 1;
+                                int thisTileHeight =
+                                    tileRange.max.y - tileRange.min.y + 1;
+
+                                for (int ty = 0; ty < thisTileHeight; ++ty)
                                 {
-                                    for (int tx = 0; tx < tileWidth; ++tx)
+                                    for (int tx = 0; tx < thisTileWidth; ++tx)
                                     {
                                         fileBufferSize +=
                                             channelCount *
@@ -731,9 +740,10 @@ readDeepTile (T& in, bool reduceMemory, bool reduceTime)
                                     pixelBuffer.resize (bufferSize);
                                     size_t bufferIndex = 0;
 
-                                    for (int ty = 0; ty < tileHeight; ++ty)
+                                    for (int ty = 0; ty < thisTileHeight; ++ty)
                                     {
-                                        for (int tx = 0; tx < tileWidth; ++tx)
+                                        for (int tx = 0; tx < thisTileWidth;
+                                             ++tx)
                                         {
                                             if (!reduceMemory ||
                                                 localSampleCount[ty][tx] *