Removed stb_image.h from STBImpl.cpp

This is needed to avoid duplicate symbol errors as cesium-native also uses stb_image
DiligentGraphics · May 9, 2024 · 08725d4 · 08725d4
1 parent ec78ae9
commit 08725d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
@@ -48,9 +48,10 @@
 #include "StringTools.hpp"
 #include "TextureUtilities.h"
 
-extern "C" float* stbi_loadf_from_memory(const unsigned char* buffer, int len, int* x, int* y, int* channels_in_file, int desired_channels);
-
-extern "C" void stbi_image_free(void* retval_from_stbi_load);
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_STATIC
+#define STBI_ONLY_HDR
+#include "../../ThirdParty/stb/stb_image.h"
 
 namespace Diligent
 {

diff --git a/TextureLoader/src/STBImpl.cpp b/TextureLoader/src/STBImpl.cpp
@@ -27,8 +27,3 @@
 #include <cstring>
 #define STB_DXT_IMPLEMENTATION
 #include "../../ThirdParty/stb/stb_dxt.h"
-
-
-#define STB_IMAGE_IMPLEMENTATION
-#define STBI_ONLY_HDR
-#include "../../ThirdParty/stb/stb_image.h"