From 2f0b0fbe0dfdeb02e084972fd3a3f95d43343b25 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 15 Nov 2024 01:09:48 -0600 Subject: [PATCH] [nostalgia/core] Fix resizeSubsheet to work for both growing and shrinking --- deps/nostalgia/src/nostalgia/modules/core/src/tilesheet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/nostalgia/src/nostalgia/modules/core/src/tilesheet.cpp b/deps/nostalgia/src/nostalgia/modules/core/src/tilesheet.cpp index 78b0337..29ca442 100644 --- a/deps/nostalgia/src/nostalgia/modules/core/src/tilesheet.cpp +++ b/deps/nostalgia/src/nostalgia/modules/core/src/tilesheet.cpp @@ -163,8 +163,8 @@ unsigned pixelCnt(TileSheet::SubSheet const&ss, int8_t pBpp) noexcept { ox::Error resizeSubsheet(TileSheet::SubSheet &ss, int8_t pBpp, ox::Size const&sz) noexcept { ox::Vector out; oxReturnError(setPixelCount(out, pBpp, static_cast(sz.width * sz.height) * PixelsPerTile)); - auto const w = sz.width * TileWidth; - auto const h = sz.height * TileHeight; + auto const w = ox::min(ss.columns, sz.width) * TileWidth; + auto const h = ox::min(ss.rows, sz.height) * TileHeight; for (auto x = 0; x < w; ++x) { for (auto y = 0; y < h; ++y) { auto const palIdx = getPixel(ss, pBpp, {x, y});