From 97c7ab3c05346664788ad33db3f552a171d29680 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@googlemail.com>
Date: Tue, 5 Apr 2022 19:53:41 +0200
Subject: [PATCH] Move stb_image header into its own header file.

---
 code/AssetLib/M3D/M3DWrapper.h |  6 ++--
 code/CMakeLists.txt            |  1 +
 code/Common/Assimp.cpp         | 15 +--------
 code/Common/StbCommon.h        | 59 ++++++++++++++++++++++++++++++++++
 code/Pbrt/PbrtExporter.cpp     | 16 +--------
 5 files changed, 66 insertions(+), 31 deletions(-)
 create mode 100644 code/Common/StbCommon.h

diff --git a/code/AssetLib/M3D/M3DWrapper.h b/code/AssetLib/M3D/M3DWrapper.h
index fac63d099..00303153a 100644
--- a/code/AssetLib/M3D/M3DWrapper.h
+++ b/code/AssetLib/M3D/M3DWrapper.h
@@ -59,8 +59,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Share stb_image's PNG loader with other importers/exporters instead of bringing our own copy.
 #define STBI_ONLY_PNG
-#define STB_IMAGE_STATIC
-#include <stb/stb_image.h>
+
+#if ASSIMP_NEEDS_STB_IMAGE
+#include "Common/StbCommon.h"
+#endif
 
 #include "m3d.h"
 
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 2eff6117f..f15087fe8 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -167,6 +167,7 @@ SET( Logging_SRCS
 SOURCE_GROUP(Logging FILES ${Logging_SRCS})
 
 SET( Common_SRCS
+  Common/StbCommon.h
   Common/Compression.cpp
   Common/Compression.h
   Common/BaseImporter.cpp
diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp
index bd3861f2e..9cd8f1560 100644
--- a/code/Common/Assimp.cpp
+++ b/code/Common/Assimp.cpp
@@ -1283,18 +1283,5 @@ ASSIMP_API void aiQuaternionInterpolate(
 #endif
 
 #if ASSIMP_NEEDS_STB_IMAGE
-
-#   if _MSC_VER // "unreferenced function has been removed" (SSE2 detection routine in x64 builds)
-#       pragma warning(push)
-#       pragma warning(disable: 4505)
-#   endif
-
-#   define STB_IMAGE_IMPLEMENTATION
-#   define STB_IMAGE_STATIC
-#   include "stb/stb_image.h"
-
-#   if _MSC_VER
-#       pragma warning(pop)
-#   endif
-
+#include "Common/StbCommon.h"
 #endif
diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h
new file mode 100644
index 000000000..47d5f1fbb
--- /dev/null
+++ b/code/Common/StbCommon.h
@@ -0,0 +1,59 @@
+/*
+Open Asset Import Library (assimp)
+----------------------------------------------------------------------
+
+Copyright (c) 2006-2022, assimp team
+
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
+following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of the assimp team, nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of the assimp team.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+----------------------------------------------------------------------
+*/
+#pragma once
+
+#if _MSC_VER // "unreferenced function has been removed" (SSE2 detection routine in x64 builds)
+#pragma warning(push)
+#pragma warning(disable : 4505)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+#define STB_IMAGE_STATIC
+#define STB_IMAGE_IMPLEMENTATION
+#include "stb/stb_image.h"
+
+#if _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
diff --git a/code/Pbrt/PbrtExporter.cpp b/code/Pbrt/PbrtExporter.cpp
index c088e3851..18ca7b595 100644
--- a/code/Pbrt/PbrtExporter.cpp
+++ b/code/Pbrt/PbrtExporter.cpp
@@ -83,21 +83,7 @@ Other:
 #include <sstream>
 #include <string>
 
-#if _MSC_VER // "unreferenced function has been removed" (SSE2 detection routine in x64 builds)
-#pragma warning(push)
-#pragma warning(disable : 4505)
-#else
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-variable"
-#endif
-#define STB_IMAGE_STATIC
-#define STB_IMAGE_IMPLEMENTATION
-#include "stb/stb_image.h"
-#if _MSC_VER
-#pragma warning(pop)
-#else
-#pragma GCC diagnostic pop
-#endif
+#include "Common/StbCommon.h"
 
 using namespace Assimp;