Fix incorrect index calculations in image conversions (#735)

Fixes #733. Fixes #736.
KhronosGroup · Jul 13, 2023 · 682f456 · 682f456
1 parent 80a61bc
commit 682f456
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/tests/cts b/tests/cts
diff --git a/tools/imageio/exr.imageio/exrinput.cc b/tools/imageio/exr.imageio/exrinput.cc
@@ -259,12 +259,12 @@ void ExrInput::readImage(void* outputBuffer, size_t bufferByteCount,
     // Copy the data
     const auto copyData = [&](unsigned char* ptr, uint32_t dataSize) {
         const auto sourcePtr = [&](uint32_t channel, uint32_t x, uint32_t y) {
-            return reinterpret_cast<const unsigned char*>(image.images[channel] + (y * height + x) * dataSize);
+            return reinterpret_cast<const unsigned char*>(image.images[channel] + (y * width + x) * dataSize);
         };
 
         for (uint32_t y = 0; y < height; ++y) {
             for (uint32_t x = 0; x < width; ++x) {
-                auto* targetPixel = ptr + (y * height * numTargetChannels + x * numTargetChannels) * dataSize;
+                auto* targetPixel = ptr + (y * width * numTargetChannels + x * numTargetChannels) * dataSize;
                 for (uint32_t c = 0; c < numTargetChannels; ++c)
                     std::memcpy(targetPixel + c * dataSize, sourcePtr(*channels[c], x, y), dataSize);
             }

diff --git a/tools/ktx/image.hpp b/tools/ktx/image.hpp
@@ -808,7 +808,7 @@ class ImageT : public Image {
                 for (uint32_t c = 0; c < numChannels; ++c) {
                     const auto sourceValue = c < componentCount ? pixels[y * width + x][c] : (c != 3 ? componentType{0} : Color::one());
                     const auto value = ktx::convertUNORM(static_cast<uint32_t>(sourceValue), sourceBits, targetBits);
-                    auto* target = data.data() + (y * height * numChannels + x * numChannels + c) * targetBytes;
+                    auto* target = data.data() + (y * width * numChannels + x * numChannels + c) * targetBytes;
 
                     if (targetBytes == 1) {
                         const auto outValue = static_cast<uint8_t>(value);
@@ -850,7 +850,7 @@ class ImageT : public Image {
         for (uint32_t y = 0; y < height; ++y) {
             for (uint32_t x = 0; x < width; ++x) {
                 const auto& pixel = pixels[y * width + x];
-                auto* target = data.data() + (y * height + x) * targetPackBytes;
+                auto* target = data.data() + (y * width + x) * targetPackBytes;
 
                 const auto copy = [&](auto& pack) {
                     using PackType = std::remove_reference_t<decltype(pack)>;
@@ -911,7 +911,7 @@ class ImageT : public Image {
             for (uint32_t x = 0; x < width; ++x) {
                 for (uint32_t c = 0; c < numChannels; ++c) {
                     const auto value = c < componentCount ? pixels[y * width + x][c] : (c != 3 ? componentType{0} : componentType{1});
-                    auto* target = data.data() + (y * height * numChannels + x * numChannels + c) * targetBytes;
+                    auto* target = data.data() + (y * width * numChannels + x * numChannels + c) * targetBytes;
 
                     if (sizeof(componentType) == targetBytes) {
                         *reinterpret_cast<componentType*>(target) = value;
@@ -937,7 +937,7 @@ class ImageT : public Image {
 
         for (uint32_t y = 0; y < height; ++y) {
             for (uint32_t x = 0; x < width; ++x) {
-                auto* target = data.data() + (y * height + x) * 4;
+                auto* target = data.data() + (y * width + x) * 4;
 
                 const auto pixel = (*this)(x, y);
                 const auto r = pixel[0];
@@ -959,7 +959,7 @@ class ImageT : public Image {
 
         for (uint32_t y = 0; y < height; ++y) {
             for (uint32_t x = 0; x < width; ++x) {
-                auto* target = data.data() + (y * height + x) * 4;
+                auto* target = data.data() + (y * width + x) * 4;
 
                 const auto pixel = (*this)(x, y);
                 const auto r = pixel[0];
@@ -984,7 +984,7 @@ class ImageT : public Image {
             for (uint32_t x = 0; x < width; ++x) {
                 for (uint32_t c = 0; c < numChannels; ++c) {
                     const auto value = c < componentCount ? pixels[y * width + x][c] : c != 3 ? 0 : componentType{1};
-                    auto* target = data.data() + (y * height * numChannels + x * numChannels + c) * targetBytes;
+                    auto* target = data.data() + (y * width * numChannels + x * numChannels + c) * targetBytes;
 
                     if (targetBytes == 1) {
                         const auto outValue = static_cast<uint8_t>(value);
@@ -1017,7 +1017,7 @@ class ImageT : public Image {
             for (uint32_t x = 0; x < width; ++x) {
                 for (uint32_t c = 0; c < numChannels; ++c) {
                     const auto value = c < componentCount ? pixels[y * width + x][c] : c != 3 ? 0 : componentType{1};
-                    auto* target = data.data() + (y * height * numChannels + x * numChannels + c) * targetBytes;
+                    auto* target = data.data() + (y * width * numChannels + x * numChannels + c) * targetBytes;
 
                     if (targetBytes == 1) {
                         const auto outValue = static_cast<int8_t>(value);
@@ -1048,7 +1048,7 @@ class ImageT : public Image {
         for (uint32_t y = 0; y < height; ++y) {
             for (uint32_t x = 0; x < width; ++x) {
                 const auto& pixel = pixels[y * width + x];
-                auto* target = data.data() + (y * height + x) * sizeof(uint32_t);
+                auto* target = data.data() + (y * width + x) * sizeof(uint32_t);
 
                 uint32_t pack = 0;
                 pack |= ktx::convertUINT(static_cast<uint32_t>(pixel[0]), sizeof(uint32_t) * 8, c0) << (c1 + c2 + c3);
@@ -1072,7 +1072,7 @@ class ImageT : public Image {
         for (uint32_t y = 0; y < height; ++y) {
             for (uint32_t x = 0; x < width; ++x) {
                 const auto& pixel = pixels[y * width + x];
-                auto* target = data.data() + (y * height + x) * sizeof(uint32_t);
+                auto* target = data.data() + (y * width + x) * sizeof(uint32_t);
 
                 uint32_t pack = 0;
                 pack |= ktx::convertSINT(ktx::bit_cast<uint32_t>(static_cast<int32_t>(pixel[0])), sizeof(uint32_t) * 8, c0) << (c1 + c2 + c3);