Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

fix image loader warning by better handling errors

Browse Source
This commit is contained in:
Green Sky
2025-12-19 13:23:38 +01:00
parent fd51ee9046
commit 47278807f6
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/image_loader.cpp
View File

@@ -6,9 +6,14 @@
#include "./image_scaler.hpp" #include "./image_scaler.hpp"
ImageLoaderI::ImageResult ImageLoaderI::ImageResult::crop(int32_t c_x, int32_t c_y, int32_t c_w, int32_t c_h) const { ImageLoaderI::ImageResult ImageLoaderI::ImageResult::crop(int32_t c_x, int32_t c_y, int32_t c_w, int32_t c_h) const {
// TODO: proper error handling if (
assert(c_x+c_w <= width); c_x < 0 || c_y < 0 || c_w < 1 || c_h < 1 ||
assert(c_y+c_h <= height); int64_t(c_x) + int64_t(c_w) > int64_t(width) || int64_t(c_y) + int64_t(c_h) > int64_t(height)
) {
// unreachable
assert(false && "invalid image crop");
return *this;
}
ImageLoaderI::ImageResult new_image; ImageLoaderI::ImageResult new_image;
new_image.width = c_w; new_image.width = c_w;
@@ -19,7 +24,7 @@ ImageLoaderI::ImageResult ImageLoaderI::ImageResult::crop(int32_t c_x, int32_t c
auto& new_frame = new_image.frames.emplace_back(); auto& new_frame = new_image.frames.emplace_back();
new_frame.ms = input_frame.ms; new_frame.ms = input_frame.ms;
// TODO: improve this, this is super inefficent // TODO: improve this, this is inefficent
for (int64_t y = c_y; y < c_y + c_h; y++) { for (int64_t y = c_y; y < c_y + c_h; y++) {
for (int64_t x = c_x; x < c_x + c_w; x++) { for (int64_t x = c_x; x < c_x + c_w; x++) {
new_frame.data.push_back(input_frame.data.at(y*width*4+x*4+0)); new_frame.data.push_back(input_frame.data.at(y*width*4+x*4+0));