Skip to content

Fix handling of edge tiles in EXR input. #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkCallow merged 3 commits into from
May 22, 2026
Merged

Fix handling of edge tiles in EXR input. #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf30b25
Fix handling of edge tiles.
MarkCallow May 20, 2026
9ec1ca0
Add asserts to check for potential buffer overrun.
MarkCallow May 22, 2026
49758b4
Update CTS reference for added subcases.
MarkCallow May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/cts
Open in desktop
Submodule cts updated 9 files
+ − clitests/golden/create/sample_exr/tiled_25x25_RGBA_FLOAT_100x100_R32G32B32A32_SFLOAT.ktx2
+ − clitests/golden/create/sample_exr/tiled_25x25_RGBA_FLOAT_85x80_R32G32B32A32_SFLOAT.ktx2
+ − clitests/golden/create/sample_exr/tiled_25x25_RGBA_HALF_100x100_R16G16B16A16_SFLOAT.ktx2
+ − clitests/golden/create/sample_exr/tiled_25x25_RGBA_HALF_85x80_R16G16B16A16_SFLOAT.ktx2
+ − clitests/input/exr_sample/tiled_25x25_RGBA_FLOAT_100x100.exr
+ − clitests/input/exr_sample/tiled_25x25_RGBA_FLOAT_85x80.exr
+ − clitests/input/exr_sample/tiled_25x25_RGBA_HALF_100x100.exr
+ − clitests/input/exr_sample/tiled_25x25_RGBA_HALF_85x80.exr
+4 −2 clitests/tests/create/sample_exr.json
8 changes: 6 additions & 2 deletions tools/imageio/exr.imageio/exrinput.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ void ExrInput::readImage(void* outputBuffer, size_t bufferByteCount,
" images for each face and use those to create your KTX file.");
}
}
if (header.tiled && header.tile_level_mode != TINYEXR_TILE_ONE_LEVEL)
throw std::runtime_error(fmt::format("Multi-level tiled EXR images are not supported."));
if ((header.tiled && image.tiles == nullptr) || (!header.tiled && image.images == nullptr))
throw std::runtime_error(fmt::format("Invalid EXR file. {}",
header.tiled ? "Tiled with no tiles" : "scanline with no images."));
Expand Down Expand Up @@ -297,11 +299,12 @@ void ExrInput::readImage(void* outputBuffer, size_t bufferByteCount,
};

for(int32_t tile = 0; tile < image.num_tiles; ++tile) {
for (int32_t ty = 0; ty < header.tile_size_y; ++ty) {
for (int32_t tx = 0; tx < header.tile_size_x; ++tx) {
for (int32_t ty = 0; ty < image.tiles[tile].height; ++ty) {
for (int32_t tx = 0; tx < image.tiles[tile].width; ++tx) {
auto x = image.tiles[tile].offset_x * header.tile_size_x + tx;
auto y = image.tiles[tile].offset_y * header.tile_size_y + ty;
auto* targetPixel = ptr + (y * width * numTargetChannels + x * numTargetChannels) * dataSize;
assert(targetPixel < ptr + bufferByteCount && "outputBuffer overrun loading tiled .exr");
for (uint32_t c = 0; c < numTargetChannels; ++c) {
if (channels[c].has_value()) {
std::memcpy(targetPixel + c * dataSize, sourcePtr(*channels[c], tile, tx, ty), dataSize);
Expand All @@ -323,6 +326,7 @@ void ExrInput::readImage(void* outputBuffer, size_t bufferByteCount,
for (uint32_t y = 0; y < height; ++y) {
for (uint32_t x = 0; x < width; ++x) {
auto* targetPixel = ptr + (y * width * numTargetChannels + x * numTargetChannels) * dataSize;
assert(targetPixel < ptr + bufferByteCount && "outputBuffer overrun loading scanline .exr");
for (uint32_t c = 0; c < numTargetChannels; ++c) {
if (channels[c].has_value()) {
std::memcpy(targetPixel + c * dataSize, sourcePtr(*channels[c], x, y), dataSize);
Expand Down
Loading