danoli3 · danoli3 · Aug 16, 2026 · Aug 14, 2026 · Aug 16, 2026
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
@@ -21,7 +21,7 @@
 
 #include "FreeImage.h"
 #include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
+#include <openjpeg.h>
 #include "J2KHelper.h"
 
 // --------------------------------------------------------------------------

diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
@@ -2,7 +2,7 @@
 // EXR Loader and writer
 //
 // Design and implementation by 
-// - Hervé Drolon (drolon@infonie.fr)
+// - Hervï¿½ Drolon (drolon@infonie.fr)
 // - Mihail Naydenov (mnaydenov@users.sourceforge.net)
 //
 // This file is part of FreeImage 3
@@ -30,6 +30,22 @@
 #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
 #endif 
 
+#ifdef FREEIMAGE_SYSTEM_OPENEXR
+// The bundled Source/OpenEXR/Half type isn't binary-compatible with a system
+// OpenEXR build's own Imath::half (which its Imf* API surface is built
+// against), so this file - unlike PluginTIFF.cpp's standalone LogLuv use of
+// half.h - must switch to the matching system Imath header too.
+#include <OpenEXR/ImfIO.h>
+#include <OpenEXR/Iex.h>
+#include <OpenEXR/ImfOutputFile.h>
+#include <OpenEXR/ImfInputFile.h>
+#include <OpenEXR/ImfRgbaFile.h>
+#include <OpenEXR/ImfChannelList.h>
+#include <OpenEXR/ImfRgba.h>
+#include <OpenEXR/ImfArray.h>
+#include <OpenEXR/ImfPreviewImage.h>
+#include <Imath/half.h>
+#else
 #include "../OpenEXR/IlmImf/ImfIO.h"
 #include "../OpenEXR/Iex/Iex.h"
 #include "../OpenEXR/IlmImf/ImfOutputFile.h"
@@ -40,6 +56,7 @@
 #include "../OpenEXR/IlmImf/ImfArray.h"
 #include "../OpenEXR/IlmImf/ImfPreviewImage.h"
 #include "../OpenEXR/Half/half.h"
+#endif
 
 
 // ==========================================================
@@ -48,6 +65,16 @@
 
 static int s_format_id;
 
+// IStream/OStream's tellg/seekg/tellp/seekp use Imath::Int64 in the bundled
+// (OpenEXR 2.x-era) headers, but that type was removed from Imath 3.x in
+// favor of plain uint64_t, which is what a system OpenEXR 3.x's ImfIO.h
+// virtuals now use.
+#ifdef FREEIMAGE_SYSTEM_OPENEXR
+typedef uint64_t exr_offset_t;
+#else
+typedef Imath::Int64 exr_offset_t;
+#endif
+
 // ----------------------------------------------------------
 
 /**
@@ -68,11 +95,11 @@ class C_IStream : public Imf::IStream {
 		return ((unsigned)n != _io->read_proc(c, 1, n, _handle));
 	}
 
-	virtual Imath::Int64 tellg() {
+	virtual exr_offset_t tellg() {
 		return _io->tell_proc(_handle);
 	}
 
-	virtual void seekg(Imath::Int64 pos) {
+	virtual void seekg(exr_offset_t pos) {
 		_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
 	}
 
@@ -102,11 +129,11 @@ class C_OStream : public Imf::OStream {
 		}
 	}
 
-	virtual Imath::Int64 tellp() {
+	virtual exr_offset_t tellp() {
 		return _io->tell_proc(_handle);
 	}
 
-	virtual void seekp(Imath::Int64 pos) {
+	virtual void seekp(exr_offset_t pos) {
 		_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
 	}
 };

diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp
@@ -2,7 +2,7 @@
 // G3 Fax Loader
 //
 // Design and implementation by
-// - Hervé Drolon (drolon@infonie.fr)
+// - Hervï¿½ Drolon (drolon@infonie.fr)
 // - Petr Pytelka (pyta@lightcomp.com)
 //
 // This file is part of FreeImage 3
@@ -20,7 +20,11 @@
 // Use at your own risk!
 // ==========================================================
 
+#ifdef FREEIMAGE_SYSTEM_LIBTIFF
+#include <tiffio.h>
+#else
 #include "../LibTIFF4/tiffiop.h"
+#endif
 
 #include "FreeImage.h"
 #include "Utilities.h"
@@ -99,7 +103,11 @@ G3ReadFile(FreeImageIO *io, fi_handle handle, uint8_t *tif_rawdata, tmsize_t tif
 // Internal functions
 // ==========================================================
 
-static int 
+#ifndef FREEIMAGE_SYSTEM_LIBTIFF
+// Manipulates libtiff's private TIFF struct fields directly (tif_rawdata,
+// tif_decoderow, ...), which a system libtiff's public tiffio.h doesn't
+// expose - only compiled in the bundled-libtiff build (see Load() below).
+static int
 copyFaxFile(FreeImageIO *io, fi_handle handle, TIFF* tifin, uint32_t xsize, int stretch, FIMEMORY *memory) {
 	BYTE *rowbuf = NULL;
 	BYTE *refbuf = NULL;
@@ -192,6 +200,7 @@ copyFaxFile(FreeImageIO *io, fi_handle handle, TIFF* tifin, uint32_t xsize, int
 
 	return (row);
 }
+#endif // !FREEIMAGE_SYSTEM_LIBTIFF
 
 
 // ==========================================================
@@ -232,6 +241,13 @@ SupportsExportDepth(int depth) {
 
 static FIBITMAP * DLL_CALLCONV
 Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
+#ifdef FREEIMAGE_SYSTEM_LIBTIFF
+	// This decoder manipulates libtiff's private TIFF struct fields directly
+	// (tif_rawdata, tif_decoderow, ...), which aren't reachable through a
+	// system libtiff's public tiffio.h - report cleanly unsupported instead.
+	FreeImage_OutputMessageProc(s_format_id, "G3 fax loading is unavailable in this build (built against system libtiff)");
+	return NULL;
+#else
 	TIFF *faxTIFF = NULL;
 	FIBITMAP *dib = NULL;
 	FIMEMORY *memory = NULL;
@@ -405,6 +421,7 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) {
 
 	return dib;
 
+#endif // FREEIMAGE_SYSTEM_LIBTIFF
 }
 
 // ==========================================================

diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
@@ -21,7 +21,7 @@
 
 #include "FreeImage.h"
 #include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
+#include <openjpeg.h>
 #include "J2KHelper.h"
 
 // ==========================================================

diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
@@ -21,7 +21,7 @@
 
 #include "FreeImage.h"
 #include "Utilities.h"
-#include "../LibOpenJPEG/openjpeg.h"
+#include <openjpeg.h>
 #include "J2KHelper.h"
 
 // ==========================================================

diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
@@ -7,7 +7,7 @@
 // - Jan L. Nauta (jln@magentammt.com)
 // - Markus Loibl (markus.loibl@epost.de)
 // - Karl-Heinz Bussian (khbussian@moss.de)
-// - Hervé Drolon (drolon@infonie.fr)
+// - Hervï¿½ Drolon (drolon@infonie.fr)
 // - Jascha Wetzel (jascha@mainia.de)
 // - Mihail Naydenov (mnaydenov@users.sourceforge.net)
 //
@@ -35,9 +35,15 @@ extern "C" {
 #undef FAR
 #include <setjmp.h>
 
+#ifdef FREEIMAGE_SYSTEM_LIBJPEG
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+#else
 #include "../LibJPEG/jinclude.h"
 #include "../LibJPEG/jpeglib.h"
 #include "../LibJPEG/jerror.h"
+#endif
 }
 
 #include "FreeImage.h"
@@ -503,7 +509,7 @@ marker_is_icc(jpeg_saved_marker_ptr marker) {
   return FALSE.  You might want to issue an error message instead.
 */
 static BOOL 
-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
+fi_jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
 	jpeg_saved_marker_ptr marker;
 	int num_markers = 0;
 	int seq_no;
@@ -745,7 +751,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) {
 	BYTE *icc_profile = NULL;
 	unsigned icc_length = 0;
 
-	if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
+	if( fi_jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
 		// copy ICC profile data
 		FreeImage_CreateICCProfile(dib, icc_profile, icc_length);
 		// clean up

diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp
@@ -25,7 +25,7 @@
 #include "Utilities.h"
 #include "../Metadata/FreeImageTag.h"
 
-#include "../LibJXR/jxrgluelib/JXRGlue.h"
+#include <JXRGlue.h>
 
 // ==========================================================
 // Plugin Interface

diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
@@ -40,8 +40,8 @@
 
 // ----------------------------------------------------------
 
-#include "../ZLib/zlib.h"
-#include "../LibPNG/png.h"
+#include <zlib.h>
+#include <png.h>
 
 // ----------------------------------------------------------
 

diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
@@ -2,7 +2,7 @@
 // RAW camera image loader
 //
 // Design and implementation by 
-// - Hervé Drolon (drolon@infonie.fr)
+// - Hervï¿½ Drolon (drolon@infonie.fr)
 //
 // This file is part of FreeImage 3
 //
@@ -21,7 +21,7 @@
 
 #if INCLUDE_LIB_RAW
 
-#include "../LibRawLite/libraw/libraw.h"
+#include <libraw/libraw.h>
 
 #include "FreeImage.h"
 #include "Utilities.h"

diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
@@ -37,7 +37,7 @@
 
 #include "FreeImage.h"
 #include "Utilities.h"
-#include "../LibTIFF4/tiffiop.h"
+#include <tiffio.h>
 #include "../Metadata/FreeImageTag.h"
 #include "../OpenEXR/Half/half.h"
 

diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
@@ -26,9 +26,9 @@
 
 #include "../Metadata/FreeImageTag.h"
 
-#include "../LibWebP/src/webp/decode.h"
-#include "../LibWebP/src/webp/encode.h"
-#include "../LibWebP/src/webp/mux.h"
+#include <webp/decode.h>
+#include <webp/encode.h>
+#include <webp/mux.h>
 
 // ==========================================================
 // Plugin Interface

diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
@@ -19,10 +19,16 @@
 // Use at your own risk!
 // ==========================================================
 
+#ifdef FREEIMAGE_SYSTEM_ZLIB
+#include <zlib.h>
+#else
 #include "../ZLib/zlib.h"
+#endif
 #include "FreeImage.h"
 #include "Utilities.h"
+#ifndef FREEIMAGE_SYSTEM_ZLIB
 #include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
+#endif
 
 /**
 Compresses a source buffer into a target buffer, using the ZLib library. 
@@ -115,7 +121,12 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s
 			return 0;
         case Z_OK: {
             // patch header, setup crc and length (stolen from mod_trace_output)
-            BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
+#ifdef FREEIMAGE_SYSTEM_ZLIB
+            const BYTE gzip_os_code = 0x03; // unix - zutil.h's OS_CODE isn't part of zlib's public API
+#else
+            const BYTE gzip_os_code = OS_CODE;
+#endif
+            BYTE *p = target + 8; *p++ = 2; *p = gzip_os_code; // xflags, os_code
  	        crc = crc32(crc, source, source_size);
 	        memcpy(target + 4 + dest_len, &crc, 4);
 	        memcpy(target + 8 + dest_len, &source_size, 4);

diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
@@ -26,10 +26,19 @@ extern "C" {
 #undef FAR
 #include <setjmp.h>
 
+#ifdef FREEIMAGE_SYSTEM_LIBJPEG
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+// transupp.h isn't installed by system libjpeg/libjpeg-turbo packages; the
+// jtransform_*/jpeg_transform_info API it declares is only used in the
+// bundled-libjpeg branch below.
+#else
 #include "../LibJPEG/jinclude.h"
 #include "../LibJPEG/jpeglib.h"
 #include "../LibJPEG/jerror.h"
 #include "../LibJPEG/transupp.h"
+#endif
 }
 
 #include "FreeImage.h"
@@ -148,6 +157,17 @@ getCropString(char* crop, int* left, int* top, int* right, int* bottom, int widt
 	return TRUE;
 }
 
+#ifdef FREEIMAGE_SYSTEM_LIBJPEG
+// Lossless JPEG transforms need transupp.h's jtransform_* API, which isn't
+// installed by system libjpeg/libjpeg-turbo packages (it ships only as
+// jpegtran example source, not a public dev header) - report cleanly
+// unsupported rather than failing the build.
+static BOOL
+JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
+	FreeImage_OutputMessageProc(FIF_JPEG, "Lossless JPEG transforms are unavailable in this build (built against system libjpeg)");
+	return FALSE;
+}
+#else
 static BOOL
 JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO* dst_io, fi_handle dst_handle, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect) {
 	const BOOL onlyReturnCropRect = (dst_io == NULL) || (dst_handle == NULL);
@@ -361,6 +381,7 @@ JPEGTransformFromHandle(FreeImageIO* src_io, fi_handle src_handle, FreeImageIO*
 
 	return TRUE;
 }
+#endif // FREEIMAGE_SYSTEM_LIBJPEG
 
 // ----------------------------------------------------------
 //   FreeImage interface