Dmitry Timoshkov : windowscodecs: Suppress libtiff warnings.

Alexandre Julliard julliard at winehq.org
Wed Jun 27 19:14:00 CDT 2012


Module: wine
Branch: master
Commit: 6207d9642cc2586394e5ae69ebeb0e9dcd8d8c2c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6207d9642cc2586394e5ae69ebeb0e9dcd8d8c2c

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Wed Jun 27 20:33:14 2012 +0900

windowscodecs: Suppress libtiff warnings.

---

 dlls/windowscodecs/tiffformat.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c
index 5351098..64e23de 100644
--- a/dlls/windowscodecs/tiffformat.c
+++ b/dlls/windowscodecs/tiffformat.c
@@ -67,6 +67,8 @@ MAKE_FUNCPTR(TIFFReadEncodedStrip);
 MAKE_FUNCPTR(TIFFReadEncodedTile);
 MAKE_FUNCPTR(TIFFSetDirectory);
 MAKE_FUNCPTR(TIFFSetField);
+MAKE_FUNCPTR(TIFFSetWarningHandler);
+MAKE_FUNCPTR(TIFFSetWarningHandlerExt);
 MAKE_FUNCPTR(TIFFWriteDirectory);
 MAKE_FUNCPTR(TIFFWriteScanline);
 #undef MAKE_FUNCPTR
@@ -99,6 +101,8 @@ static void *load_libtiff(void)
         LOAD_FUNCPTR(TIFFReadEncodedTile);
         LOAD_FUNCPTR(TIFFSetDirectory);
         LOAD_FUNCPTR(TIFFSetField);
+        LOAD_FUNCPTR(TIFFSetWarningHandler);
+        LOAD_FUNCPTR(TIFFSetWarningHandlerExt);
         LOAD_FUNCPTR(TIFFWriteDirectory);
         LOAD_FUNCPTR(TIFFWriteScanline);
 #undef LOAD_FUNCPTR
@@ -107,6 +111,9 @@ static void *load_libtiff(void)
 
     result = libtiff_handle;
 
+    pTIFFSetWarningHandler(NULL);
+    pTIFFSetWarningHandlerExt(NULL);
+
     LeaveCriticalSection(&init_tiff_cs);
     return result;
 }




More information about the wine-cvs mailing list