diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-11-10 17:27:08 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2022-11-21 23:21:13 +0100 |
| commit | 91e95ee9ae9cc91b5e657cb078827c361da9b1ae (patch) | |
| tree | 91a4bf83b281ea92793504a6fdb4d0e532b032dc /libtiff/tiffiop.h | |
| parent | e7e567536baddd491e124f6fc5e11e80e740934e (diff) | |
| download | libtiff-git-91e95ee9ae9cc91b5e657cb078827c361da9b1ae.tar.gz | |
Add TIFFOpenExt(), TIFFOpenWExt() and TIFFFdOpenExt() with re-entrant error handlers
Rename TIFFClientOpenEx() to TIFFClientOpenExt()
Rework signature of the re-entrant error handlers and of
TIFFSetWarningHandlerExt() and TIFFSetErrorHandlerExt()
Use structures that can be extended as extra argument.
Leverages and ammends https://gitlab.com/libtiff/libtiff/-/merge_requests/409
Diffstat (limited to 'libtiff/tiffiop.h')
| -rw-r--r-- | libtiff/tiffiop.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index 1cca4f54..7fbeef4b 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -199,7 +199,9 @@ struct tiff { size_t tif_nfieldscompat; /* Error handler support */ TIFFErrorHandlerExtR tif_errorhandler; + void* tif_errorhandler_user_data; TIFFErrorHandlerExtR tif_warnhandler; + void* tif_warnhandler_user_data; }; #define isPseudoTag(t) (t > 0xffff) /* is tag value normal or pseudo */ @@ -321,9 +323,6 @@ typedef size_t TIFFIOSize_t; #if defined(__cplusplus) extern "C" { #endif -extern void TIFFWarningExtR(TIFF*, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); -extern void TIFFErrorExtR(TIFF*, const char*, const char*, ...) TIFF_ATTRIBUTE((__format__ (__printf__,3,4))); - extern int _TIFFgetMode(const char* mode, const char* module); extern int _TIFFNoRowEncode(TIFF* tif, uint8_t* pp, tmsize_t cc, uint16_t s); extern int _TIFFNoStripEncode(TIFF* tif, uint8_t* pp, tmsize_t cc, uint16_t s); |