From 60063867e6a4278bc65454835de3a4c0bc3939f9 Mon Sep 17 00:00:00 2001 From: Ales Koblizek Date: Mon, 9 Dec 2024 15:49:47 +0100 Subject: [PATCH 1/2] fix multiple main definitions when building with libtiff --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e59bb3..12a335f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,7 +175,7 @@ endif() if(BUILD_LIBTIFF) set(FreeImage_LIBTIFF_SRCS - Source/LibTIFF4/mkg3states.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_aux.c + Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_config.h Source/LibTIFF4/tif_config.vc.h Source/LibTIFF4/tif_config.wince.h From 29b451cb889be3f39aa996435e9dbc9297a6699b Mon Sep 17 00:00:00 2001 From: Ales Koblizek Date: Mon, 9 Dec 2024 15:50:58 +0100 Subject: [PATCH 2/2] fix build with openexr --- Source/OpenEXR/IlmImf/ImfAttribute.cpp | 1 + Source/Plugin.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/OpenEXR/IlmImf/ImfAttribute.cpp b/Source/OpenEXR/IlmImf/ImfAttribute.cpp index cb4ac36..e477190 100644 --- a/Source/OpenEXR/IlmImf/ImfAttribute.cpp +++ b/Source/OpenEXR/IlmImf/ImfAttribute.cpp @@ -44,6 +44,7 @@ #include "IlmThreadMutex.h" #include "Iex.h" #include +#include #include #include "ImfNamespace.h" diff --git a/Source/Plugin.h b/Source/Plugin.h index 860548a..16c82dd 100644 --- a/Source/Plugin.h +++ b/Source/Plugin.h @@ -131,7 +131,7 @@ void DLL_CALLCONV InitGIF(Plugin *plugin, int format_id); void DLL_CALLCONV InitHDR(Plugin *plugin, int format_id); void DLL_CALLCONV InitG3(Plugin *plugin, int format_id); void DLL_CALLCONV InitSGI(Plugin *plugin, int format_id); -#if INCLUDE_LIB_OPEN_EXR +#if INCLUDE_LIB_OPENEXR void DLL_CALLCONV InitEXR(Plugin *plugin, int format_id); #endif void DLL_CALLCONV InitJ2K(Plugin *plugin, int format_id);