From 7c7b617852af8190e4ab5c05d26ebcb360d98412 Mon Sep 17 00:00:00 2001
From: Xphalnos <164882787+Xphalnos@users.noreply.github.com>
Date: Tue, 11 Jun 2024 18:15:36 +0200
Subject: [PATCH] Minor fixes

---
 .reuse/dep5           | 14 +++++++-------
 externals/stb_image.h |  9 ++++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.reuse/dep5 b/.reuse/dep5
index 283c680b..5f60238e 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -6,7 +6,7 @@ Files: CMakeSettings.json
        scripts/ps4_names.txt
        documents/changelog.txt
        documents/readme.txt
-	   documents/Screenshots/screenshot.png
+       documents/Screenshots/screenshot.png
        .github/shadps4.desktop
        .github/shadps4.png
        .gitmodules
@@ -25,12 +25,12 @@ Files: CMakeSettings.json
        src/images/settings_icon.png
        src/images/stop_icon.png
        src/images/themes_icon.png
-	   src/images/flag_jp.png
-	   src/images/flag_eu.png
-	   src/images/flag_us.png
-	   src/images/flag_china.png
-	   src/images/flag_world.png
-	   src/images/flag_unk.png
+       src/images/flag_jp.png
+       src/images/flag_eu.png
+       src/images/flag_us.png
+       src/images/flag_china.png
+       src/images/flag_world.png
+       src/images/flag_unk.png
        src/shadps4.rc
        src/shadps4.qrc
        externals/stb_image.h
diff --git a/externals/stb_image.h b/externals/stb_image.h
index a632d543..9eedabed 100644
--- a/externals/stb_image.h
+++ b/externals/stb_image.h
@@ -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
 
    Do this:
@@ -48,6 +48,7 @@ LICENSE
 
 RECENT REVISION HISTORY:
 
+      2.30  (2024-05-31) avoid erroneous gcc warning
       2.29  (2023-05-xx) optimizations
       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
@@ -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.
                if (scan == STBI__SCAN_header) { ++s->img_n; return 1; }
                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 {
-                  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;