diff options
author | Even Rouault <even.rouault@spatialys.com> | 2022-11-23 22:56:12 +0000 |
---|---|---|
committer | Even Rouault <even.rouault@spatialys.com> | 2022-11-23 22:56:12 +0000 |
commit | 38a582016c60d5b1f2300db8a76b67795e3d34b6 (patch) | |
tree | dbfe54095328b6ed0e6958fc37741aab031edd54 | |
parent | 0c4a6a72adcce43f1853409b1122d7664f229e35 (diff) | |
parent | 166accba607faec1cac18aed62178e1979915d6a (diff) | |
download | libtiff-git-38a582016c60d5b1f2300db8a76b67795e3d34b6.tar.gz |
Merge branch 'windows-fix' into 'master'
libtiff: Fix TIFFOpen* for the Windows platform in tif_unix.c
See merge request libtiff/libtiff!424
-rw-r--r-- | libtiff/tif_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_unix.c b/libtiff/tif_unix.c index 89ae0c17..97fecfea 100644 --- a/libtiff/tif_unix.c +++ b/libtiff/tif_unix.c @@ -276,7 +276,7 @@ TIFFOpenExt(const char* name, const char* mode, TIFFOpenOptions* opts) TIFF* TIFFOpenW(const wchar_t* name, const char* mode) { - return TIFFOpenWEx(name, mode, NULL); + return TIFFOpenWExt(name, mode, NULL); } TIFF* TIFFOpenWExt(const wchar_t* name, const char* mode, TIFFOpenOptions* opts) @@ -287,7 +287,7 @@ TIFFOpenWExt(const wchar_t* name, const char* mode, TIFFOpenOptions* opts) char *mbname; TIFF* tif; - m = _TIFFgetMode(mode, module); + m = _TIFFgetMode(opts, NULL, mode, module); if (m == -1) return ((TIFF*)0); |