feat(common): cleaner conversion from Vector2i to size_t

Author: Tom94

include/tev/Channel.h

@@ -214,7 +214,7 @@ class Channel {
     bool isAlpha() const { return Channel::isAlpha(mName); }
     bool isTopmost() const { return Channel::isTopmost(mName); }
 
-    size_t numPixels() const { return (size_t)mSize.x() * mSize.y(); }
+    size_t numPixels() const { return posProd(mSize); }
 
     nanogui::Vector2i size() const { return mSize; }
     void setSize(nanogui::Vector2i size) { mSize = size; }

include/tev/Common.h

@@ -220,6 +220,32 @@ template <size_t N_DIMS> nanogui::Array<float, N_DIMS> pow(const nanogui::Array<
     return result;
 }
 
+template <typename T, size_t N_DIMS> auto prod(const nanogui::Array<T, N_DIMS>& v) {
+    using area_t = std::conditional_t<std::is_integral_v<T>, std::conditional_t<std::is_signed_v<T>, ssize_t, size_t>, T>;
+    area_t result = (T)1;
+
+    for (uint32_t i = 0; i < N_DIMS; ++i) {
+        result *= (area_t)v[i];
+    }
+
+    return result;
+}
+
+template <typename T, size_t N_DIMS> auto posProd(const nanogui::Array<T, N_DIMS>& v) {
+    using area_t = std::conditional_t<std::is_integral_v<T>, size_t, T>;
+    area_t result = (T)1;
+
+    for (uint32_t i = 0; i < N_DIMS; ++i) {
+        if (v[i] < 0) [[unlikely]] {
+            throw std::runtime_error{std::format("Negative value {} encountered when computing positive product.", v)};
+        }
+
+        result *= (area_t)v[i];
+    }
+
+    return result;
+}
+
 struct NVGcontext;
 
 namespace tev {

include/tev/imageio/ImageLoader.h

@@ -43,7 +43,7 @@ Task<void> yCbCrToRgb(MultiChannelView<float> data, int priority, nanogui::Vecto
 
     const nanogui::Vector2i size = data.size();
 
-    const auto numPixels = (size_t)size.x() * size.y();
+    const auto numPixels = posProd(size);
     co_await ThreadPool::global().parallelFor(
         0uz,
         numPixels,
@@ -101,7 +101,7 @@ Task<void> toFloat32(
     }
 
     const size_t numSamplesPerPixel = std::min(numSamplesPerPixelIn, floatData.nChannels());
-    const size_t numPixels = (size_t)size.x() * size.y();
+    const size_t numPixels = posProd(size);
 
     const size_t expectedDataSize = numSamplesPerRowIn * size.y();
     if (imageData.size() < expectedDataSize) {

src/Channel.cpp

@@ -92,7 +92,7 @@ Channel::Channel(
         mDataOffset = dataOffset;
         mDataStride = dataStride;
     } else {
-        mData = make_shared<PixelBuffer>(PixelBuffer::alloc((size_t)size.x() * size.y(), format));
+        mData = make_shared<PixelBuffer>(PixelBuffer::alloc(posProd(size), format));
         mDataOffset = 0;
         mDataStride = 1;
     }
@@ -135,10 +135,10 @@ void Channel::updateTile(const Box2i bounds, const span<const float> newData) {
         return;
     }
 
-    const auto width = bounds.max.x() - bounds.min.x();
+    const auto width = (size_t)(bounds.max.x() - bounds.min.x());
     for (int y = bounds.min.y(); y < bounds.max.y(); ++y) {
         for (int x = bounds.min.x(); x < bounds.max.x(); ++x) {
-            dynamicSetAt({x, y}, newData[(x - bounds.min.x()) + (y - bounds.min.y()) * (size_t)width]);
+            dynamicSetAt({x, y}, newData[(x - bounds.min.x()) + (y - bounds.min.y()) * width]);
         }
     }
 }

src/FalseColor.cpp

@@ -28,7 +28,7 @@ namespace tev {
 namespace colormap {
     span<const float> turbo() {
         // "turbo" colormap data generated with scripts/sample-colormap.py
-        static constexpr array<float, 256 * 4> data = {
+        static constexpr array data = {
             0.18995f, 0.07176f, 0.23217f, 1.0f,
             0.19483f, 0.08339f, 0.26149f, 1.0f,
             0.19956f, 0.09498f, 0.29024f, 1.0f,
@@ -292,7 +292,7 @@ namespace colormap {
 
     span<const float> viridis() {
         // "viridis" colormap data generated with scripts/sample-colormap.py
-        static constexpr array<float, 256 * 4> data = {
+        static constexpr array data = {
             0.267004f, 0.004874f, 0.329415f, 1.0f,
             0.26851f, 0.009605f, 0.335427f, 1.0f,
             0.269944f, 0.014625f, 0.341379f, 1.0f,

src/Image.cpp

@@ -761,7 +761,7 @@ Task<void> prepareTextureChannel(T* data, const Channel* chan, Box2i box, size_t
     const T defaultVal = isAlpha ? (T)1.0f : (T)0.0f;
 
     const auto size = box.size();
-    const size_t numPixels = (size_t)size.x() * size.y();
+    const size_t numPixels = posProd(size);
 
     if (chan) {
         const auto copyChannel = [&](const auto view) -> Task<void> {
@@ -771,7 +771,7 @@ Task<void> prepareTextureChannel(T* data, const Channel* chan, Box2i box, size_t
                 numPixels,
                 [view, &data, numTextureChannels, channelIdx, width = size.x(), pos = box.min](int y) {
                     for (int x = 0; x < width; ++x) {
-                        size_t tileIdx = x + y * (size_t)width;
+                        const auto tileIdx = x + y * (size_t)width;
                         data[tileIdx * numTextureChannels + channelIdx] = view[pos.x() + x, pos.y() + y];
                     }
                 },
@@ -1184,7 +1184,7 @@ Task<HeapArray<float>> Image::getRgbaHdrImageData(
 
     const size_t nColorChannels = alphaChannel ? (channels.size() - 1) : channels.size();
 
-    const auto numPixels = (size_t)imageRegion.size().x() * imageRegion.size().y();
+    const auto numPixels = imageRegion.area();
     const auto nColorChannelsToSave = std::min(nColorChannels, 3uz);
 
     // Flatten image into vector
@@ -1394,7 +1394,7 @@ Task<nanogui::Vector2i> orientToTopLeft(PixelBuffer& data, nanogui::Vector2i siz
     nanogui::Vector2i otherSize = swapAxes ? nanogui::Vector2i{size.y(), size.x()} : size;
 
     const size_t numBytesPerSample = nBytes(data.format());
-    const size_t numPixels = (size_t)size.x() * size.y();
+    const size_t numPixels = posProd(size);
 
     if (numPixels == 0) {
         co_return size;
@@ -1412,10 +1412,10 @@ Task<nanogui::Vector2i> orientToTopLeft(PixelBuffer& data, nanogui::Vector2i siz
         numPixels,
         [&](int y) {
             for (int x = 0; x < size.x(); ++x) {
-                const size_t i = y * (size_t)size.x() + x;
+                const auto i = y * (size_t)size.x() + x;
 
                 const auto other = applyOrientation(orientation, nanogui::Vector2i{x, y}, size);
-                const size_t j = other.y() * (size_t)otherSize.x() + other.x();
+                const auto j = other.y() * (size_t)otherSize.x() + other.x();
 
                 memcpy(reorientedData.dataBytes() + i * numBytesPerPixel, data.dataBytes() + j * numBytesPerPixel, numBytesPerPixel);
             }

src/UberShader.cpp

@@ -508,11 +508,14 @@ UberShader::UberShader(RenderPass* renderPass, float ditherScale) {
     mShader->set_buffer("position", VariableType::Float32, {4, 2}, positions);
 
     const auto& fcd = colormap::turbo();
+    if (fcd.size() % 4 != 0) {
+        throw runtime_error{format("Invalid false color data size. Expected multiple of 4, got {}.", fcd.size())};
+    }
 
     mColorMap = new Texture{
         Texture::PixelFormat::RGBA, Texture::ComponentFormat::Float32, Vector2i{(int)fcd.size() / 4, 1}
     };
-    mColorMap->upload((uint8_t*)fcd.data());
+    mColorMap->upload(reinterpret_cast<const uint8_t*>(fcd.data()));
 
     mDitherMatrix = new Texture{
         Texture::PixelFormat::R,
@@ -523,7 +526,12 @@ UberShader::UberShader(RenderPass* renderPass, float ditherScale) {
         Texture::WrapMode::Repeat,
     };
 
-    mDitherMatrix->upload((uint8_t*)ditherMatrix(ditherScale).data());
+    const auto dmat = ditherMatrix(ditherScale);
+    if (dmat.size() != posProd(mDitherMatrix->size())) {
+        throw runtime_error{format("Invalid dither matrix size. Expected {}, got {}.", posProd(mDitherMatrix->size()), dmat.size())};
+    }
+
+    mDitherMatrix->upload(reinterpret_cast<const uint8_t*>(dmat.data()));
 }
 
 UberShader::~UberShader() {}

src/imageio/ClipboardImageLoader.cpp

@@ -46,7 +46,7 @@ Task<vector<ImageData>>
 
     const Vector2i size{(int)spec.width, (int)spec.height};
 
-    const auto numPixels = (size_t)size.x() * size.y();
+    const auto numPixels = posProd(size);
     if (numPixels == 0) {
         throw ImageLoadError{"Image has zero pixels."};
     }

src/imageio/Colors.cpp

@@ -912,7 +912,7 @@ Task<void> toLinearSrgbPremul(
         default: throw runtime_error{format("Invalid number of output channels {}", rgbaDst.nChannels())};
     }
 
-    const size_t numPixels = (size_t)size.x() * size.y();
+    const size_t numPixels = posProd(size);
 
     cmsHTRANSFORM transform = nullptr;
     if (cicp) {

src/imageio/DdsImageLoader.cpp

@@ -237,7 +237,7 @@ Task<vector<ImageData>> DdsImageLoader::load(istream& iStream, const fs::path&,
 
     const auto outView = MultiChannelView<float>{resultData.channels};
 
-    const auto numPixels = (size_t)size.x() * size.y();
+    const auto numPixels = posProd(size);
     if (numPixels == 0) {
         throw ImageLoadError{"DDS image has zero pixels."};
     }