From 784bf73ae96ba88c5ec470530bda7b52a2febec4 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 6 May 2021 08:43:34 +0200 Subject: [PATCH] STB issue on H7 makes me revert to the latest working commit for now --- radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp | 8 ++++++++ radio/src/thirdparty/libopenui/src/thirdparty/stb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp index 1dfddada7..0f81b3291 100755 --- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp +++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp @@ -1020,6 +1020,14 @@ void *stb_realloc(void *ptr, unsigned int oldsz, unsigned int newsz) #pragma GCC diagnostic ignored "-Wsign-compare" #pragma GCC diagnostic ignored "-Wunused-but-set-variable" #undef __I +#define STBI_NO_HDR +#define STBI_NO_PIC +#define STBI_NO_GIF +#define STBI_NO_PNM +#define STBI_NO_PSD +#define STBI_NO_TGA +#define STBI_NO_BMP +#define STB_IMAGE_IMPLEMENTATION #include "thirdparty/stb/stb_image.h" // fill 'data' with 'size' bytes. return number of bytes actually read diff --git a/radio/src/thirdparty/libopenui/src/thirdparty/stb b/radio/src/thirdparty/libopenui/src/thirdparty/stb index c9064e317..7cce4c3ad 160000 --- a/radio/src/thirdparty/libopenui/src/thirdparty/stb +++ b/radio/src/thirdparty/libopenui/src/thirdparty/stb @@ -1 +1 @@ -Subproject commit c9064e317699d2e495f36ba4f9ac037e88ee371a +Subproject commit 7cce4c3ad9a147c67258c5966f676d8436140939