[LIBTIFF] Update to version 4.0.9. CORE-14291

This commit is contained in:
Thomas Faber 2018-02-04 16:21:58 +01:00
parent 5c0faa58cf
commit f46b177e11
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
26 changed files with 965 additions and 288 deletions

View file

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.5 2010-03-10 18:56:48 bfriesen Exp $ */
/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.6 2017-07-04 12:54:42 erouault Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -27,7 +27,6 @@
/*
* TIFF Library.
*/
#include <precomp.h>
TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL;
@ -52,24 +51,32 @@ void
TIFFError(const char* module, const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
if (_TIFFerrorHandler)
if (_TIFFerrorHandler) {
va_start(ap, fmt);
(*_TIFFerrorHandler)(module, fmt, ap);
if (_TIFFerrorHandlerExt)
va_end(ap);
}
if (_TIFFerrorHandlerExt) {
va_start(ap, fmt);
(*_TIFFerrorHandlerExt)(0, module, fmt, ap);
va_end(ap);
va_end(ap);
}
}
void
TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
if (_TIFFerrorHandler)
if (_TIFFerrorHandler) {
va_start(ap, fmt);
(*_TIFFerrorHandler)(module, fmt, ap);
if (_TIFFerrorHandlerExt)
va_end(ap);
}
if (_TIFFerrorHandlerExt) {
va_start(ap, fmt);
(*_TIFFerrorHandlerExt)(fd, module, fmt, ap);
va_end(ap);
va_end(ap);
}
}
/*