From abcd7747885ccaf7ddb23f4f53ba1586b915f17a Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Thu, 28 Jun 2012 13:01:13 -0700 Subject: [PATCH] windowscodecs: test for TIFFSetWarningHandlerExt --- configure.ac | 3 +++ dlls/windowscodecs/tiffformat.c | 6 ++++++ include/config.h.in | 3 +++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 70e7663..150cbf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1650,6 +1650,9 @@ dnl **** Check for libtiff **** if test "$ac_cv_header_tiffio_h" = "yes" then WINE_CHECK_SONAME(tiff,TIFFClientOpen) + AC_CHECK_LIB(tiff,TIFFSetWarningHandlerExt, + [AC_DEFINE(HAVE_TIFFSETWARNINGHANDLEREXT,1,[Define to 1 if libtiff has the TIFFSetWarningHandlerExt function.])] + ,,-lm -lz) fi WINE_NOTICE_WITH(tiff,[test "x$ac_cv_lib_soname_tiff" = "x"], [libtiff ${notice_platform}development files not found, TIFF won't be supported.]) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 64e23de..0cd6f22 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -68,7 +68,9 @@ MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); MAKE_FUNCPTR(TIFFSetField); MAKE_FUNCPTR(TIFFSetWarningHandler); +#ifdef HAVE_TIFFSETWARNINGHANDLEREXT MAKE_FUNCPTR(TIFFSetWarningHandlerExt); +#endif MAKE_FUNCPTR(TIFFWriteDirectory); MAKE_FUNCPTR(TIFFWriteScanline); #undef MAKE_FUNCPTR @@ -102,7 +104,9 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFSetDirectory); LOAD_FUNCPTR(TIFFSetField); LOAD_FUNCPTR(TIFFSetWarningHandler); +#ifdef HAVE_TIFFSETWARNINGHANDLEREXT LOAD_FUNCPTR(TIFFSetWarningHandlerExt); +#endif LOAD_FUNCPTR(TIFFWriteDirectory); LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR @@ -112,7 +116,9 @@ static void *load_libtiff(void) result = libtiff_handle; pTIFFSetWarningHandler(NULL); +#ifdef HAVE_TIFFSETWARNINGHANDLEREXT pTIFFSetWarningHandlerExt(NULL); +#endif LeaveCriticalSection(&init_tiff_cs); return result; diff --git a/include/config.h.in b/include/config.h.in index 983c732..6fd8f0e 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1040,6 +1040,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TIFFIO_H +/* Define to 1 if libtiff has the TIFFSetWarningHandlerExt function. */ +#undef HAVE_TIFFSETWARNINGHANDLEREXT + /* Define to 1 if you have the `timegm' function. */ #undef HAVE_TIMEGM -- 1.6.0.4