Minor fixes

This commit is contained in:
Xphalnos 2024-06-11 18:15:36 +02:00
parent e8fa9e0e89
commit 7c7b617852
2 changed files with 13 additions and 10 deletions

View File

@ -6,7 +6,7 @@ Files: CMakeSettings.json
scripts/ps4_names.txt scripts/ps4_names.txt
documents/changelog.txt documents/changelog.txt
documents/readme.txt documents/readme.txt
documents/Screenshots/screenshot.png documents/Screenshots/screenshot.png
.github/shadps4.desktop .github/shadps4.desktop
.github/shadps4.png .github/shadps4.png
.gitmodules .gitmodules
@ -25,12 +25,12 @@ Files: CMakeSettings.json
src/images/settings_icon.png src/images/settings_icon.png
src/images/stop_icon.png src/images/stop_icon.png
src/images/themes_icon.png src/images/themes_icon.png
src/images/flag_jp.png src/images/flag_jp.png
src/images/flag_eu.png src/images/flag_eu.png
src/images/flag_us.png src/images/flag_us.png
src/images/flag_china.png src/images/flag_china.png
src/images/flag_world.png src/images/flag_world.png
src/images/flag_unk.png src/images/flag_unk.png
src/shadps4.rc src/shadps4.rc
src/shadps4.qrc src/shadps4.qrc
externals/stb_image.h externals/stb_image.h

View File

@ -1,4 +1,4 @@
/* stb_image - v2.29 - public domain image loader - http://nothings.org/stb /* stb_image - v2.30 - public domain image loader - http://nothings.org/stb
no warranty implied; use at your own risk no warranty implied; use at your own risk
Do this: Do this:
@ -48,6 +48,7 @@ LICENSE
RECENT REVISION HISTORY: RECENT REVISION HISTORY:
2.30 (2024-05-31) avoid erroneous gcc warning
2.29 (2023-05-xx) optimizations 2.29 (2023-05-xx) optimizations
2.28 (2023-01-29) many error fixes, security errors, just tons of stuff 2.28 (2023-01-29) many error fixes, security errors, just tons of stuff
2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes 2.27 (2021-07-11) document stbi_info better, 16-bit PNM support, bug fixes
@ -5159,9 +5160,11 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
// non-paletted with tRNS = constant alpha. if header-scanning, we can stop now. // non-paletted with tRNS = constant alpha. if header-scanning, we can stop now.
if (scan == STBI__SCAN_header) { ++s->img_n; return 1; } if (scan == STBI__SCAN_header) { ++s->img_n; return 1; }
if (z->depth == 16) { if (z->depth == 16) {
for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is for (k = 0; k < s->img_n && k < 3; ++k) // extra loop test to suppress false GCC warning
tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
} else { } else {
for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger for (k = 0; k < s->img_n && k < 3; ++k)
tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
} }
} }
break; break;