diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-11-21 21:45:48 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2022-11-21 23:23:45 +0100 |
| commit | ec18caeb67e751fb50b5777c9b4d7c9cf2a71683 (patch) | |
| tree | 61529d7a0de59fa2f65899a56b7df70e0b335736 /doc | |
| parent | 73d34370e1728fec96c4c0d3fe527aa2f49f3e1e (diff) | |
| download | libtiff-git-ec18caeb67e751fb50b5777c9b4d7c9cf2a71683.tar.gz | |
Remove TIFFSetErrorHandlerExtR() and TIFFSetWarningHandlerExtR() that were temporarily added in master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/functions/TIFFError.rst | 7 | ||||
| -rw-r--r-- | doc/functions/TIFFWarning.rst | 16 |
2 files changed, 5 insertions, 18 deletions
diff --git a/doc/functions/TIFFError.rst b/doc/functions/TIFFError.rst index 3648db77..797c1c0e 100644 --- a/doc/functions/TIFFError.rst +++ b/doc/functions/TIFFError.rst @@ -23,10 +23,6 @@ Synopsis .. c:function:: TIFFErrorHandlerExt TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler) -.. c:type:: int (*TIFFErrorHandlerExtR)(TIFF* tif, void* errorhandler_user_data, const char * module, const char* fmt, va_list ap) - -.. c:function:: void TIFFSetErrorHandlerExtR(TIFF* tif, TIFFErrorHandlerExtR handler, void* errorhandler_user_data) - Description ----------- @@ -52,6 +48,9 @@ in order to write to a file. The file handle needs to be stored in ``tif->tif_clientdata`` if the ``libtiff`` internal errors shall also be written to that file. +Note that, starting with libtiff 4.5, a per-TIFF handler may also be installed +with :c:func:`TIFFOpenExt` or :c:func:`TIFFClientOpenExt` + Note ---- diff --git a/doc/functions/TIFFWarning.rst b/doc/functions/TIFFWarning.rst index 281341f0..2006696c 100644 --- a/doc/functions/TIFFWarning.rst +++ b/doc/functions/TIFFWarning.rst @@ -23,11 +23,6 @@ Synopsis .. c:function:: TIFFWarningHandlerExt TIFFSetWarningHandlerExt(TIFFWarningHandlerExt handler) -.. c:type:: int (*TIFFWarningHandlerExtR)(TIFF* tif, void* warnhandler_user_data, const char * module, const char* fmt, va_list ap) - -.. c:function:: void TIFFSetWarningHandlerExtR(TIFF* tif, TIFFWarningHandlerExtR handler, void* warnhandler_user_data) - - Description ----------- @@ -54,15 +49,8 @@ as *fd*, which represents the TIFF file handle (file descriptor). With :c:func:`TIFFSetWarningHandlerExt` an extra warning handler can be setup up. -:c:func:`TIFFSetWarningHandlerExtR` (added in libtiff 4.5) installs a warning -handler for a given TIFF handle. The R suffix means re-entrant, in that it avoids -the global effects of :c:func:`TIFFSetWarningHandler` or :c:func:`TIFFSetWarningHandlerExt`. -The installed handler replaces any previously set handler with that function. -The handler should nominally return a non-0 value. If it returns 0, then the -global handler set with :c:func:`TIFFSetWarningHandler` or :c:func:`TIFFSetWarningHandlerExt` -will also be called. -Note that this per-TIFF handler may also be installed with :c:func:`TIFFOpenExt` -or :c:func:`TIFFClientOpenExt` +Note that, starting with libtiff 4.5, a per-TIFF handler may also be installed +with :c:func:`TIFFOpenExt` or :c:func:`TIFFClientOpenExt` Note ---- |