GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[librptexture] ICOPrivate::loadImage_Win3(): Move the bitmap size check up a bit.
Some checks failed
Codecov / run (push) Has been cancelled
Details

Browse Source
This commit is contained in:
David Korth 2025-06-09 21:05:24 -04:00
parent 417825cd6f
commit e12bb51b47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librptexture/fileformat/ICO.cpp
View File

@ -597,14 +597,15 @@ rp_image_const_ptr ICOPrivate::loadImage_Win3(void)
// NOTE: Negative height is allowed for "right-side up".
const unsigned int width = le32_to_cpu((unsigned int)(bih->biWidth));
const int orig_height = static_cast<int>(le32_to_cpu(bih->biHeight));
const bool is_upside_down = (orig_height > 0);
const unsigned int height = abs(orig_height);
const unsigned int half_height = height / 2;
if (width <= 0 || height == 0 || (height & 1)) {
// Invalid bitmap size.
return {};
}
const bool is_upside_down = (orig_height > 0);
const unsigned int half_height = height / 2;
// Only supporting 16-color images for now.
// TODO: Handle BI_BITFIELDS?
if (le32_to_cpu(bih->biPlanes) > 1) {