From 9530100455396a44b3f3250077e4405ef4ef0bd2 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 8 Jan 2024 09:39:01 +0100 Subject: [PATCH] fix: Texture interpreting raw data as structured images --- lib/libimhex/source/ui/imgui_imhex_extensions.cpp | 6 +++++- main/gui/source/init/tasks.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp index 4b0d1ebd4..63d50cd06 100644 --- a/lib/libimhex/source/ui/imgui_imhex_extensions.cpp +++ b/lib/libimhex/source/ui/imgui_imhex_extensions.cpp @@ -46,7 +46,11 @@ namespace ImGuiExt { if (size == 0) return; - unsigned char *imageData = stbi_load_from_memory(buffer, size, &m_width, &m_height, nullptr, 4); + unsigned char *imageData = nullptr; + + if (width == 0 || height == 0) + imageData = stbi_load_from_memory(buffer, size, &m_width, &m_height, nullptr, 4); + if (imageData == nullptr) { if (width * height * 4 > size) return; diff --git a/main/gui/source/init/tasks.cpp b/main/gui/source/init/tasks.cpp index 639a8c572..b8d985877 100644 --- a/main/gui/source/init/tasks.cpp +++ b/main/gui/source/init/tasks.cpp @@ -341,7 +341,7 @@ namespace hex::init { { "Setting up environment", setupEnvironment, false }, { "Creating directories", createDirectories, false }, { "Loading settings", loadSettings, false }, - { "Loading plugins", loadPlugins, false }, + { "Loading plugins", loadPlugins, false }, }; }