forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[freeimage] Fixed link errors with libTIFF (microsoft#13720)
- Loading branch information
Showing
3 changed files
with
33 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
Source: freeimage | ||
Version: 3.18.0 | ||
Port-Version: 15 | ||
Port-Version: 16 | ||
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr | ||
Homepage: https://sourceforge.net/projects/freeimage/ | ||
Description: Support library for graphics image formats |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
ports/freeimage/use-functions-to-override-libtiff-warning-error-handlers.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp | ||
index a9fcf0e..b1f7b32 100644 | ||
--- a/Source/FreeImage/PluginTIFF.cpp | ||
+++ b/Source/FreeImage/PluginTIFF.cpp | ||
@@ -258,7 +258,7 @@ static void | ||
msdosWarningHandler(const char* module, const char* fmt, va_list ap) { | ||
} | ||
|
||
-TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler; | ||
+//TIFFErrorHandler _TIFFwarningHandler = msdosWarningHandler; | ||
|
||
static void | ||
msdosErrorHandler(const char* module, const char* fmt, va_list ap) { | ||
@@ -273,7 +273,7 @@ msdosErrorHandler(const char* module, const char* fmt, va_list ap) { | ||
*/ | ||
} | ||
|
||
-TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler; | ||
+//TIFFErrorHandler _TIFFerrorHandler = msdosErrorHandler; | ||
|
||
// ---------------------------------------------------------- | ||
|
||
@@ -2659,6 +2659,8 @@ InitTIFF(Plugin *plugin, int format_id) { | ||
// Set up the callback for extended TIFF directory tag support (see XTIFF.cpp) | ||
// Must be called before using libtiff | ||
XTIFFInitialize(); | ||
+ TIFFSetWarningHandler(msdosWarningHandler); | ||
+ TIFFSetErrorHandler(msdosErrorHandler); | ||
|
||
plugin->format_proc = Format; | ||
plugin->description_proc = Description; |