diff options
| author | Inoue343 <20026379+Inoue343@users.noreply.github.com> | 2019-03-26 05:34:14 +0900 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-03-25 13:34:14 -0700 |
| commit | e3737888ad8f7b6e9b015fedd5a999e9e3c84e95 (patch) | |
| tree | 72ace684d8d16e18b4365702ba92caa8625a6102 | |
| parent | 36d9d998a354f99e2b5af85c239882d6fafe9073 (diff) | |
| download | vcpkg-e3737888ad8f7b6e9b015fedd5a999e9e3c84e95.tar.gz vcpkg-e3737888ad8f7b6e9b015fedd5a999e9e3c84e95.zip | |
[freeimage]Fix link symbols of tiff. (#5786)
| -rw-r--r-- | ports/freeimage/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freeimage/use-external-libtiff.patch | 34 |
2 files changed, 33 insertions, 3 deletions
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 5497b0fa3..0d2277772 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,4 +1,4 @@ Source: freeimage -Version: 3.18.0-3 +Version: 3.18.0-4 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr Description: Support library for graphics image formats diff --git a/ports/freeimage/use-external-libtiff.patch b/ports/freeimage/use-external-libtiff.patch index f2ddd9ba6..23d5dfd1d 100644 --- a/ports/freeimage/use-external-libtiff.patch +++ b/ports/freeimage/use-external-libtiff.patch @@ -1,8 +1,8 @@ diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp -index 1b45453..562fdd7 100644 +index 5068d94..8947b03 100644 --- a/Source/FreeImage/PluginTIFF.cpp +++ b/Source/FreeImage/PluginTIFF.cpp -@@ -37,7 +37,7 @@ +@@ -37,9 +37,9 @@ #include "FreeImage.h" #include "Utilities.h" @@ -11,6 +11,36 @@ index 1b45453..562fdd7 100644 #include "../Metadata/FreeImageTag.h" #include "../OpenEXR/Half/half.h" + #include "FreeImageIO.h" + #include "PSDParser.h" +@@ -199,15 +199,18 @@ Open a TIFF file for reading or writing + @param name + @param mode + */ ++/* + TIFF* + TIFFOpen(const char* name, const char* mode) { + return 0; + } ++*/ + + // ---------------------------------------------------------- + // TIFF library FreeImage-specific routines. + // ---------------------------------------------------------- + ++/* + void* + _TIFFmalloc(tmsize_t s) { + return malloc(s); +@@ -245,6 +248,7 @@ int + _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c) { + return (memcmp(p1, p2, (size_t) c)); + } ++*/ + + // ---------------------------------------------------------- + // in FreeImage warnings and errors are disabled + diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp index d5be902..8dbcd5d 100644 --- a/Source/Metadata/XTIFF.cpp |