Compilation fix for x32

agruzdev · agruzdev · commit 55bcbce8568c · 2026-01-20T16:32:08.000+03:00
diff --git a/Source/FreeImage.hpp b/Source/FreeImage.hpp
@@ -1567,22 +1567,22 @@ namespace fi
         {
         public:
             // catch any exception to not cross DLL boundry
-            static const char* FormatProc(void* ctx) try { return unwrap(ctx).FormatProc(); } catch (...) { return nullptr; };
-            static const char* DescriptionProc(void* ctx) try { return unwrap(ctx).DescriptionProc(); } catch (...) { return nullptr; };
-            static const char* ExtensionListProc(void* ctx) try { return unwrap(ctx).ExtensionListProc(); } catch (...) { return nullptr; };
-            static const char* RegExprProc(void* ctx) try { return unwrap(ctx).RegExprProc(); } catch (...) { return nullptr; };
-            static void* OpenProc(void* ctx, FreeImageIO* io, fi_handle handle, FIBOOL read) try { return unwrap(ctx).OpenProc(io, handle, read); } catch (...) { return nullptr; };
-            static void CloseProc(void* ctx, FreeImageIO* io, fi_handle handle, void* data) try { unwrap(ctx).CloseProc(io, handle, data); } catch (...) { };
-            static uint32_t PageCountProc(void* ctx, FreeImageIO* io, fi_handle handle, void* data) try { return unwrap(ctx).PageCountProc(io, handle, data); } catch (...) { return 1U; };
-            static uint32_t PageCapabilityProc(void* ctx, FreeImageIO* io, fi_handle handle, void* data) try { return unwrap(ctx).PageCapabilityProc(io, handle, data); } catch (...) { return 1U; };
-            static FIBITMAP* LoadProc(void* ctx, FreeImageIO* io, fi_handle handle, uint32_t page, uint32_t flags, void* data) try { return unwrap(ctx).LoadProc(io, handle, page, flags, data); } catch (...) { return nullptr; };
-            static FIBOOL SaveProc(void* ctx, FreeImageIO* io, FIBITMAP* dib, fi_handle handle, uint32_t page, uint32_t flags, void* data) try { return unwrap(ctx).SaveProc(io, dib, handle, page, flags, data); } catch (...) { return FALSE; };
-            static FIBOOL ValidateProc(void* ctx, FreeImageIO* io, fi_handle handle) try { return unwrap(ctx).ValidateProc(io, handle); } catch (...) { return FALSE; };
-            static const char* MimeProc(void* ctx) try { return unwrap(ctx).MimeProc(); } catch (...) { return nullptr; };
-            static FIBOOL SupportsExportBPPProc(void* ctx, uint32_t bpp) try { return unwrap(ctx).SupportsExportBPPProc(bpp); } catch (...) { return FALSE; };
-            static FIBOOL SupportsExportTypeProc(void* ctx, FREE_IMAGE_TYPE type) try { return unwrap(ctx).SupportsExportTypeProc(type); } catch (...) { return FALSE; };
-            static FIBOOL SupportsICCProfilesProc(void* ctx) try { return unwrap(ctx).SupportsICCProfilesProc(); } catch (...) { return FALSE; };
-            static FIBOOL SupportsNoPixelsProc(void* ctx) try { return unwrap(ctx).SupportsNoPixelsProc(); } catch (...) { return FALSE; };
+            static const char* DLL_CALLCONV FormatProc(void* ctx) try { return unwrap(ctx).FormatProc(); } catch (...) { return nullptr; };
+            static const char* DLL_CALLCONV DescriptionProc(void* ctx) try { return unwrap(ctx).DescriptionProc(); } catch (...) { return nullptr; };
+            static const char* DLL_CALLCONV ExtensionListProc(void* ctx) try { return unwrap(ctx).ExtensionListProc(); } catch (...) { return nullptr; };
+            static const char* DLL_CALLCONV RegExprProc(void* ctx) try { return unwrap(ctx).RegExprProc(); } catch (...) { return nullptr; };
+            static void* DLL_CALLCONV OpenProc(void* ctx, FreeImageIO* io, fi_handle handle, FIBOOL read) try { return unwrap(ctx).OpenProc(io, handle, read); } catch (...) { return nullptr; };
+            static void DLL_CALLCONV CloseProc(void* ctx, FreeImageIO* io, fi_handle handle, void* data) try { unwrap(ctx).CloseProc(io, handle, data); } catch (...) { };
+            static uint32_t DLL_CALLCONV PageCountProc(void* ctx, FreeImageIO* io, fi_handle handle, void* data) try { return unwrap(ctx).PageCountProc(io, handle, data); } catch (...) { return 1U; };
+            static uint32_t DLL_CALLCONV PageCapabilityProc(void* ctx, FreeImageIO* io, fi_handle handle, void* data) try { return unwrap(ctx).PageCapabilityProc(io, handle, data); } catch (...) { return 1U; };
+            static FIBITMAP* DLL_CALLCONV LoadProc(void* ctx, FreeImageIO* io, fi_handle handle, uint32_t page, uint32_t flags, void* data) try { return unwrap(ctx).LoadProc(io, handle, page, flags, data); } catch (...) { return nullptr; };
+            static FIBOOL DLL_CALLCONV SaveProc(void* ctx, FreeImageIO* io, FIBITMAP* dib, fi_handle handle, uint32_t page, uint32_t flags, void* data) try { return unwrap(ctx).SaveProc(io, dib, handle, page, flags, data); } catch (...) { return FALSE; };
+            static FIBOOL DLL_CALLCONV ValidateProc(void* ctx, FreeImageIO* io, fi_handle handle) try { return unwrap(ctx).ValidateProc(io, handle); } catch (...) { return FALSE; };
+            static const char* DLL_CALLCONV MimeProc(void* ctx) try { return unwrap(ctx).MimeProc(); } catch (...) { return nullptr; };
+            static FIBOOL DLL_CALLCONV SupportsExportBPPProc(void* ctx, uint32_t bpp) try { return unwrap(ctx).SupportsExportBPPProc(bpp); } catch (...) { return FALSE; };
+            static FIBOOL DLL_CALLCONV SupportsExportTypeProc(void* ctx, FREE_IMAGE_TYPE type) try { return unwrap(ctx).SupportsExportTypeProc(type); } catch (...) { return FALSE; };
+            static FIBOOL DLL_CALLCONV SupportsICCProfilesProc(void* ctx) try { return unwrap(ctx).SupportsICCProfilesProc(); } catch (...) { return FALSE; };
+            static FIBOOL DLL_CALLCONV SupportsNoPixelsProc(void* ctx) try { return unwrap(ctx).SupportsNoPixelsProc(); } catch (...) { return FALSE; };
 
             static void DLL_CALLCONV ReleaseProc(void* ctx) {
                 delete static_cast<Plugin2Wrapper*>(ctx);
diff --git a/Source/FreeImage/BitmapAccess.cpp b/Source/FreeImage/BitmapAccess.cpp
@@ -698,12 +698,12 @@ FreeImage_SetThumbnail(FIBITMAP *dib, FIBITMAP *thumbnail) {
 
 // ----------------------------------------------------------
 
-FREE_IMAGE_COLOR_TYPE
+FREE_IMAGE_COLOR_TYPE DLL_CALLCONV
 FreeImage_GetColorType(FIBITMAP* dib) {
 	return FreeImage_GetColorType2(dib, TRUE);
 }
 
-FREE_IMAGE_COLOR_TYPE
+FREE_IMAGE_COLOR_TYPE DLL_CALLCONV
 FreeImage_GetColorType2(FIBITMAP* dib, FIBOOL scan_alpha) {
 	FIRGBA8 *rgb;
 
diff --git a/Source/FreeImage/Conversion.cpp b/Source/FreeImage/Conversion.cpp
@@ -62,7 +62,8 @@
 // ==========================================================
 // Utility functions declared in Utilities.h
 
-FIBOOL SwapRedBlue32(FIBITMAP* dib) {
+FIBOOL DLL_CALLCONV
+SwapRedBlue32(FIBITMAP* dib) {
 	if (FreeImage_GetImageType(dib) != FIT_BITMAP) {
 		return FALSE;
 	}
@@ -153,7 +154,7 @@ _convertCMYKtoRGBA(unsigned width, unsigned height, uint8_t* line_start, unsigne
 	}
 }
 
-FIBOOL 
+FIBOOL DLL_CALLCONV
 ConvertCMYKtoRGBA(FIBITMAP* dib) {
 	if (!FreeImage_HasPixels(dib)) {
 		return FALSE;
@@ -302,7 +303,7 @@ _convertLABtoRGB(unsigned width, unsigned height, uint8_t* line_start, unsigned
 	}
 }
 
-FIBOOL
+FIBOOL DLL_CALLCONV
 ConvertLABtoRGB(FIBITMAP* dib) {
 	if (!FreeImage_HasPixels(dib)) {
 		return FALSE;
@@ -337,7 +338,7 @@ ConvertLABtoRGB(FIBITMAP* dib) {
 
 // ----------------------------------------------------------
 
-FIBITMAP* 
+FIBITMAP* DLL_CALLCONV
 RemoveAlphaChannel(FIBITMAP* src) { 
 
 	if (!FreeImage_HasPixels(src)) {
diff --git a/Source/FreeImage/ConversionColor.cpp b/Source/FreeImage/ConversionColor.cpp
@@ -9,7 +9,8 @@
 #include "ConversionYUV.h"
 
 
-FIBITMAP* FreeImage_ConvertToColor(FIBITMAP* dib, FREE_IMAGE_COLOR_TYPE dst_color, int64_t fisrt_param, int64_t second_param)
+FIBITMAP* DLL_CALLCONV
+FreeImage_ConvertToColor(FIBITMAP* dib, FREE_IMAGE_COLOR_TYPE dst_color, int64_t fisrt_param, int64_t second_param)
 {
 	(void)second_param;
 	if (!FreeImage_HasPixels(dib)) {
diff --git a/Source/FreeImage/FreeImage.cpp b/Source/FreeImage/FreeImage.cpp
@@ -193,7 +193,7 @@ namespace {
 
 } // namespace
 
-uint32_t DLL_CALLCONV 
+uint32_t DLL_CALLCONV
 FreeImage_GetDependenciesCount(void)
 try {
 	return DependenciesTable::GetInstance().GetSize();
@@ -284,7 +284,8 @@ FreeImage_OutputMessageProc(int fif, const char *fmt, ...) {
 }
 
 
-DLL_API uint32_t DLL_CALLCONV FreeImage_AddProcessMessageFunction(void* ctx, FreeImage_ProcessMessageFunction func)
+uint32_t DLL_CALLCONV
+FreeImage_AddProcessMessageFunction(void* ctx, FreeImage_ProcessMessageFunction func)
 {
 	static_assert(kMaxMessageProcessorsNumber < std::numeric_limits<uint32_t>::max() - 1);
 	if (func == nullptr) {
@@ -310,7 +311,8 @@ DLL_API uint32_t DLL_CALLCONV FreeImage_AddProcessMessageFunction(void* ctx, Fre
 }
 
 
-FIBOOL FreeImage_RemoveProcessMessageFunction(uint32_t id)
+FIBOOL DLL_CALLCONV
+FreeImage_RemoveProcessMessageFunction(uint32_t id)
 {
 	if (id == 0) {
 		return FALSE;
@@ -334,7 +336,8 @@ FIBOOL FreeImage_RemoveProcessMessageFunction(uint32_t id)
 }
 
 
-void FreeImage_ProcessMessage(const FIMESSAGE* msg)
+void DLL_CALLCONV
+FreeImage_ProcessMessage(const FIMESSAGE* msg)
 {
 	if (!msg) {
 		return;
@@ -348,21 +351,24 @@ void FreeImage_ProcessMessage(const FIMESSAGE* msg)
 }
 
 
-FIMESSAGE* FreeImage_CreateMessage(FREE_IMAGE_FORMAT scope, FREE_IMAGE_SEVERITY severity, const char* what)
+FIMESSAGE* DLL_CALLCONV
+FreeImage_CreateMessage(FREE_IMAGE_FORMAT scope, FREE_IMAGE_SEVERITY severity, const char* what)
 {
 	return new FIMESSAGE(scope, severity, what ? what : "Unknown");
 }
 
 
-void FreeImage_DeleteMessage(FIMESSAGE* msg)
+void DLL_CALLCONV
+FreeImage_DeleteMessage(FIMESSAGE* msg)
 {
 	if (msg) {
 		delete msg;
 	}
 }
 
 
-FREE_IMAGE_FORMAT FreeImage_GetMessageScope(const FIMESSAGE* msg)
+FREE_IMAGE_FORMAT DLL_CALLCONV
+FreeImage_GetMessageScope(const FIMESSAGE* msg)
 {
 	if (msg) {
 		return msg->scope;
@@ -371,7 +377,8 @@ FREE_IMAGE_FORMAT FreeImage_GetMessageScope(const FIMESSAGE* msg)
 }
 
 
-FREE_IMAGE_SEVERITY FreeImage_GetMessageSeverity(const FIMESSAGE* msg)
+FREE_IMAGE_SEVERITY DLL_CALLCONV
+FreeImage_GetMessageSeverity(const FIMESSAGE* msg)
 {
 	if (msg) {
 		return msg->severity;
@@ -380,7 +387,8 @@ FREE_IMAGE_SEVERITY FreeImage_GetMessageSeverity(const FIMESSAGE* msg)
 }
 
 
-const char* FreeImage_GetMessageString(const FIMESSAGE* msg)
+const char* DLL_CALLCONV
+FreeImage_GetMessageString(const FIMESSAGE* msg)
 {
 	if (msg) {
 		return msg->text.c_str();
diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
@@ -860,15 +860,16 @@ FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif) {
 // =====================================================================
 
 
-int DLL_CALLCONV 
+int DLL_CALLCONV
 FreeImage_GetFIFCount2() {
 	if (auto& plugins = PluginsRegistrySingleton::Instance()) {
 		return static_cast<int>(plugins->GetFifCount2());
 	}
 	return 0;
 }
 
-FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromIndex(int idx) {
+FREE_IMAGE_FORMAT DLL_CALLCONV
+FreeImage_GetFIFFromIndex(int idx) {
 	if (auto& plugins = PluginsRegistrySingleton::Instance()) {
 		return plugins->GetFifFromIndex(idx);
 	}
diff --git a/Source/FreeImage/SimpleTools.cpp b/Source/FreeImage/SimpleTools.cpp
@@ -9,7 +9,8 @@
 #include <algorithm>
 
 
-FIBOOL FreeImage_FindMinMax(FIBITMAP* dib, double* min_brightness, double* max_brightness, void** min_ptr, void** max_ptr)
+FIBOOL DLL_CALLCONV
+FreeImage_FindMinMax(FIBITMAP* dib, double* min_brightness, double* max_brightness, void** min_ptr, void** max_ptr)
 {
 	if (!FreeImage_HasPixels(dib)) {
 		return FALSE;
@@ -174,7 +175,8 @@ namespace
 
 } // namespace
 
-FIBOOL FreeImage_FindMinMaxValue(FIBITMAP* dib, void* min_value, void* max_value)
+FIBOOL DLL_CALLCONV
+FreeImage_FindMinMaxValue(FIBITMAP* dib, void* min_value, void* max_value)
 {
 	if (!FreeImage_HasPixels(dib)) {
 		return FALSE;
@@ -263,7 +265,8 @@ FIBOOL FreeImage_FindMinMaxValue(FIBITMAP* dib, void* min_value, void* max_value
 }
 
 
-FIBOOL FreeImage_Fill(FIBITMAP* dib, const void* value_ptr, size_t value_size)
+FIBOOL DLL_CALLCONV
+FreeImage_Fill(FIBITMAP* dib, const void* value_ptr, size_t value_size)
 {
 	if (!FreeImage_HasPixels(dib)) {
 		return FALSE;
diff --git a/Source/FreeImage/tmoClamp.cpp b/Source/FreeImage/tmoClamp.cpp
@@ -10,7 +10,8 @@
 #include <memory>
 #include <limits>
 
-FIBITMAP* FreeImage_TmoClamp(FIBITMAP* src, double max_value)
+FIBITMAP* DLL_CALLCONV
+FreeImage_TmoClamp(FIBITMAP* src, double max_value)
 {
     if (!FreeImage_HasPixels(src)) {
         return nullptr;
diff --git a/Source/FreeImage/tmoLinear.cpp b/Source/FreeImage/tmoLinear.cpp
@@ -100,7 +100,8 @@ FIBOOL TmoLinearImpl(FIBITMAP* dst, FIBITMAP* src, double maxValue, double minBr
 }
 
 
-FIBITMAP* FreeImage_TmoLinear(FIBITMAP* src, double max_value, FREE_IMAGE_CVT_COLOR_PARAM yuv_standard)
+FIBITMAP* DLL_CALLCONV
+FreeImage_TmoLinear(FIBITMAP* src, double max_value, FREE_IMAGE_CVT_COLOR_PARAM yuv_standard)
 {
     if (!FreeImage_HasPixels(src)) {
         return nullptr;
diff --git a/Source/FreeImageToolkit/Colors.cpp b/Source/FreeImageToolkit/Colors.cpp
@@ -785,7 +785,8 @@ namespace
 } // namespace
 
 
-FIBOOL FreeImage_MakeHistogram(FIBITMAP* dib, uint32_t binsNumber, void* outMinVal, void* outMaxVal, uint32_t* histR, uint32_t strideR, uint32_t* histG, uint32_t strideG, uint32_t* histB, uint32_t strideB, uint32_t* histL, uint32_t strideL)
+FIBOOL DLL_CALLCONV
+FreeImage_MakeHistogram(FIBITMAP* dib, uint32_t binsNumber, void* outMinVal, void* outMaxVal, uint32_t* histR, uint32_t strideR, uint32_t* histG, uint32_t strideG, uint32_t* histB, uint32_t strideB, uint32_t* histL, uint32_t strideL)
 {
 	if (!FreeImage_HasPixels(dib) || binsNumber < 1) {
 		return FALSE;
@@ -1506,7 +1507,8 @@ namespace
 
 } // namespace
 
-FIBOOL CastPixelValue(FREE_IMAGE_TYPE src_type, const void* src_pixel, FREE_IMAGE_TYPE dst_type, void* dst_pixel)
+FIBOOL DLL_CALLCONV
+CastPixelValue(FREE_IMAGE_TYPE src_type, const void* src_pixel, FREE_IMAGE_TYPE dst_type, void* dst_pixel)
 {
 	if (!src_pixel || !dst_pixel) {
 		return FALSE;
diff --git a/Source/FreeImageToolkit/Display.cpp b/Source/FreeImageToolkit/Display.cpp
@@ -230,7 +230,8 @@ FreeImage_PreMultiplyWithAlpha(FIBITMAP *dib) {
 
 
 
-FIBOOL FreeImage_DrawBitmap(FIBITMAP* dst, FIBITMAP* src, FREE_IMAGE_ALPHA_OPERATION alpha, int32_t left, int32_t top)
+FIBOOL DLL_CALLCONV
+FreeImage_DrawBitmap(FIBITMAP* dst, FIBITMAP* src, FREE_IMAGE_ALPHA_OPERATION alpha, int32_t left, int32_t top)
 {
 	if (!FreeImage_HasPixels(dst) || !FreeImage_HasPixels(src)) {
 		return FALSE;
diff --git a/Source/Metadata/Exif.cpp b/Source/Metadata/Exif.cpp
@@ -973,7 +973,7 @@ Rotate a dib according to Exif info
 @param dib Input / Output dib to rotate
 @see PluginJPEG.cpp
 */
-void 
+void DLL_CALLCONV
 RotateExif(FIBITMAP **dib) {
 	// check for Exif rotation
 	if (FreeImage_GetMetadataCount(FIMD_EXIF_MAIN, *dib)) {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@`
`62`	`62`	`// ==========================================================`
`63`	`63`	`// Utility functions declared in Utilities.h`
`64`	`64`
`65`		`-FIBOOL SwapRedBlue32(FIBITMAP* dib) {`
	`65`	`+FIBOOL DLL_CALLCONV`
	`66`	`+SwapRedBlue32(FIBITMAP* dib) {`
`66`	`67`	`if (FreeImage_GetImageType(dib) != FIT_BITMAP) {`
`67`	`68`	`return FALSE;`
`68`	`69`	`}`
`@@ -153,7 +154,7 @@ _convertCMYKtoRGBA(unsigned width, unsigned height, uint8_t* line_start, unsigne`
`153`	`154`	`}`
`154`	`155`	`}`
`155`	`156`
`156`		`-FIBOOL`
	`157`	`+FIBOOL DLL_CALLCONV`
`157`	`158`	`ConvertCMYKtoRGBA(FIBITMAP* dib) {`
`158`	`159`	`if (!FreeImage_HasPixels(dib)) {`
`159`	`160`	`return FALSE;`
`@@ -302,7 +303,7 @@ _convertLABtoRGB(unsigned width, unsigned height, uint8_t* line_start, unsigned`
`302`	`303`	`}`
`303`	`304`	`}`
`304`	`305`
`305`		`-FIBOOL`
	`306`	`+FIBOOL DLL_CALLCONV`
`306`	`307`	`ConvertLABtoRGB(FIBITMAP* dib) {`
`307`	`308`	`if (!FreeImage_HasPixels(dib)) {`
`308`	`309`	`return FALSE;`
`@@ -337,7 +338,7 @@ ConvertLABtoRGB(FIBITMAP* dib) {`
`337`	`338`
`338`	`339`	`// ----------------------------------------------------------`
`339`	`340`
`340`		`-FIBITMAP*`
	`341`	`+FIBITMAP* DLL_CALLCONV`
`341`	`342`	`RemoveAlphaChannel(FIBITMAP* src) {`
`342`	`343`
`343`	`344`	`if (!FreeImage_HasPixels(src)) {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`#include "ConversionYUV.h"`
`10`	`10`
`11`	`11`
`12`		`-FIBITMAP* FreeImage_ConvertToColor(FIBITMAP* dib, FREE_IMAGE_COLOR_TYPE dst_color, int64_t fisrt_param, int64_t second_param)`
	`12`	`+FIBITMAP* DLL_CALLCONV`
	`13`	`+FreeImage_ConvertToColor(FIBITMAP* dib, FREE_IMAGE_COLOR_TYPE dst_color, int64_t fisrt_param, int64_t second_param)`
`13`	`14`	`{`
`14`	`15`	`(void)second_param;`
`15`	`16`	`if (!FreeImage_HasPixels(dib)) {`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ namespace {`
`193`	`193`
`194`	`194`	`} // namespace`
`195`	`195`
`196`		`-uint32_t DLL_CALLCONV`
	`196`	`+uint32_t DLL_CALLCONV`
`197`	`197`	`FreeImage_GetDependenciesCount(void)`
`198`	`198`	`try {`
`199`	`199`	`return DependenciesTable::GetInstance().GetSize();`
`@@ -284,7 +284,8 @@ FreeImage_OutputMessageProc(int fif, const char *fmt, ...) {`
`284`	`284`	`}`
`285`	`285`
`286`	`286`
`287`		`-DLL_API uint32_t DLL_CALLCONV FreeImage_AddProcessMessageFunction(void* ctx, FreeImage_ProcessMessageFunction func)`
	`287`	`+uint32_t DLL_CALLCONV`
	`288`	`+FreeImage_AddProcessMessageFunction(void* ctx, FreeImage_ProcessMessageFunction func)`
`288`	`289`	`{`
`289`	`290`	`static_assert(kMaxMessageProcessorsNumber < std::numeric_limits<uint32_t>::max() - 1);`
`290`	`291`	`if (func == nullptr) {`
`@@ -310,7 +311,8 @@ DLL_API uint32_t DLL_CALLCONV FreeImage_AddProcessMessageFunction(void* ctx, Fre`
`310`	`311`	`}`
`311`	`312`
`312`	`313`
`313`		`-FIBOOL FreeImage_RemoveProcessMessageFunction(uint32_t id)`
	`314`	`+FIBOOL DLL_CALLCONV`
	`315`	`+FreeImage_RemoveProcessMessageFunction(uint32_t id)`
`314`	`316`	`{`
`315`	`317`	`if (id == 0) {`
`316`	`318`	`return FALSE;`
`@@ -334,7 +336,8 @@ FIBOOL FreeImage_RemoveProcessMessageFunction(uint32_t id)`
`334`	`336`	`}`
`335`	`337`
`336`	`338`
`337`		`-void FreeImage_ProcessMessage(const FIMESSAGE* msg)`
	`339`	`+void DLL_CALLCONV`
	`340`	`+FreeImage_ProcessMessage(const FIMESSAGE* msg)`
`338`	`341`	`{`
`339`	`342`	`if (!msg) {`
`340`	`343`	`return;`
`@@ -348,21 +351,24 @@ void FreeImage_ProcessMessage(const FIMESSAGE* msg)`
`348`	`351`	`}`
`349`	`352`
`350`	`353`
`351`		`-FIMESSAGE* FreeImage_CreateMessage(FREE_IMAGE_FORMAT scope, FREE_IMAGE_SEVERITY severity, const char* what)`
	`354`	`+FIMESSAGE* DLL_CALLCONV`
	`355`	`+FreeImage_CreateMessage(FREE_IMAGE_FORMAT scope, FREE_IMAGE_SEVERITY severity, const char* what)`
`352`	`356`	`{`
`353`	`357`	`return new FIMESSAGE(scope, severity, what ? what : "Unknown");`
`354`	`358`	`}`
`355`	`359`
`356`	`360`
`357`		`-void FreeImage_DeleteMessage(FIMESSAGE* msg)`
	`361`	`+void DLL_CALLCONV`
	`362`	`+FreeImage_DeleteMessage(FIMESSAGE* msg)`
`358`	`363`	`{`
`359`	`364`	`if (msg) {`
`360`	`365`	`delete msg;`
`361`	`366`	`}`
`362`	`367`	`}`
`363`	`368`
`364`	`369`
`365`		`-FREE_IMAGE_FORMAT FreeImage_GetMessageScope(const FIMESSAGE* msg)`
	`370`	`+FREE_IMAGE_FORMAT DLL_CALLCONV`
	`371`	`+FreeImage_GetMessageScope(const FIMESSAGE* msg)`
`366`	`372`	`{`
`367`	`373`	`if (msg) {`
`368`	`374`	`return msg->scope;`
`@@ -371,7 +377,8 @@ FREE_IMAGE_FORMAT FreeImage_GetMessageScope(const FIMESSAGE* msg)`
`371`	`377`	`}`
`372`	`378`
`373`	`379`
`374`		`-FREE_IMAGE_SEVERITY FreeImage_GetMessageSeverity(const FIMESSAGE* msg)`
	`380`	`+FREE_IMAGE_SEVERITY DLL_CALLCONV`
	`381`	`+FreeImage_GetMessageSeverity(const FIMESSAGE* msg)`
`375`	`382`	`{`
`376`	`383`	`if (msg) {`
`377`	`384`	`return msg->severity;`
`@@ -380,7 +387,8 @@ FREE_IMAGE_SEVERITY FreeImage_GetMessageSeverity(const FIMESSAGE* msg)`
`380`	`387`	`}`
`381`	`388`
`382`	`389`
`383`		`-const char* FreeImage_GetMessageString(const FIMESSAGE* msg)`
	`390`	`+const char* DLL_CALLCONV`
	`391`	`+FreeImage_GetMessageString(const FIMESSAGE* msg)`
`384`	`392`	`{`
`385`	`393`	`if (msg) {`
`386`	`394`	`return msg->text.c_str();`
Original file line number	Diff line number	Diff line change
`@@ -860,15 +860,16 @@ FreeImage_IsPluginEnabled(FREE_IMAGE_FORMAT fif) {`
`860`	`860`	`// =====================================================================`
`861`	`861`
`862`	`862`
`863`		`-int DLL_CALLCONV`
	`863`	`+int DLL_CALLCONV`
`864`	`864`	`FreeImage_GetFIFCount2() {`
`865`	`865`	`if (auto& plugins = PluginsRegistrySingleton::Instance()) {`
`866`	`866`	`return static_cast<int>(plugins->GetFifCount2());`
`867`	`867`	`}`
`868`	`868`	`return 0;`
`869`	`869`	`}`
`870`	`870`
`871`		`-FREE_IMAGE_FORMAT DLL_CALLCONV FreeImage_GetFIFFromIndex(int idx) {`
	`871`	`+FREE_IMAGE_FORMAT DLL_CALLCONV`
	`872`	`+FreeImage_GetFIFFromIndex(int idx) {`
`872`	`873`	`if (auto& plugins = PluginsRegistrySingleton::Instance()) {`
`873`	`874`	`return plugins->GetFifFromIndex(idx);`
`874`	`875`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@`
`9`	`9`	`#include <algorithm>`
`10`	`10`
`11`	`11`
`12`		`-FIBOOL FreeImage_FindMinMax(FIBITMAP* dib, double* min_brightness, double* max_brightness, void min_ptr, void max_ptr)`
	`12`	`+FIBOOL DLL_CALLCONV`
	`13`	`+FreeImage_FindMinMax(FIBITMAP* dib, double* min_brightness, double* max_brightness, void min_ptr, void max_ptr)`
`13`	`14`	`{`
`14`	`15`	`if (!FreeImage_HasPixels(dib)) {`
`15`	`16`	`return FALSE;`
`@@ -174,7 +175,8 @@ namespace`
`174`	`175`
`175`	`176`	`} // namespace`
`176`	`177`
`177`		`-FIBOOL FreeImage_FindMinMaxValue(FIBITMAP* dib, void* min_value, void* max_value)`
	`178`	`+FIBOOL DLL_CALLCONV`
	`179`	`+FreeImage_FindMinMaxValue(FIBITMAP* dib, void* min_value, void* max_value)`
`178`	`180`	`{`
`179`	`181`	`if (!FreeImage_HasPixels(dib)) {`
`180`	`182`	`return FALSE;`
`@@ -263,7 +265,8 @@ FIBOOL FreeImage_FindMinMaxValue(FIBITMAP* dib, void* min_value, void* max_value`
`263`	`265`	`}`
`264`	`266`
`265`	`267`
`266`		`-FIBOOL FreeImage_Fill(FIBITMAP* dib, const void* value_ptr, size_t value_size)`
	`268`	`+FIBOOL DLL_CALLCONV`
	`269`	`+FreeImage_Fill(FIBITMAP* dib, const void* value_ptr, size_t value_size)`
`267`	`270`	`{`
`268`	`271`	`if (!FreeImage_HasPixels(dib)) {`
`269`	`272`	`return FALSE;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@`
`10`	`10`	`#include <memory>`
`11`	`11`	`#include <limits>`
`12`	`12`
`13`		`-FIBITMAP* FreeImage_TmoClamp(FIBITMAP* src, double max_value)`
	`13`	`+FIBITMAP* DLL_CALLCONV`
	`14`	`+FreeImage_TmoClamp(FIBITMAP* src, double max_value)`
`14`	`15`	`{`
`15`	`16`	`if (!FreeImage_HasPixels(src)) {`
`16`	`17`	`return nullptr;`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ FIBOOL TmoLinearImpl(FIBITMAP* dst, FIBITMAP* src, double maxValue, double minBr`
`100`	`100`	`}`
`101`	`101`
`102`	`102`
`103`		`-FIBITMAP* FreeImage_TmoLinear(FIBITMAP* src, double max_value, FREE_IMAGE_CVT_COLOR_PARAM yuv_standard)`
	`103`	`+FIBITMAP* DLL_CALLCONV`
	`104`	`+FreeImage_TmoLinear(FIBITMAP* src, double max_value, FREE_IMAGE_CVT_COLOR_PARAM yuv_standard)`
`104`	`105`	`{`
`105`	`106`	`if (!FreeImage_HasPixels(src)) {`
`106`	`107`	`return nullptr;`