mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 13:13:00 +00:00
[LIBTIFF] Update to version 4.0.9. CORE-14291
This commit is contained in:
parent
5c0faa58cf
commit
f46b177e11
26 changed files with 965 additions and 288 deletions
27
dll/3rdparty/libtiff/tif_error.c
vendored
27
dll/3rdparty/libtiff/tif_error.c
vendored
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue