3rdparty: update libtiff 4.0.9

[platform/upstream/opencv.git] / 3rdparty / libtiff / tif_error.c

diff --git a/3rdparty/libtiff/tif_error.c b/3rdparty/libtiff/tif_error.c
index 886ee0d..47516b4 100644 (file)
--- a/3rdparty/libtiff/tif_error.c
+++ b/3rdparty/libtiff/tif_error.c
@@ -1,26 +1,26 @@
-/* $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
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
- * Permission to use, copy, modify, distribute, and sell this software and
+ * Permission to use, copy, modify, distribute, and sell this software and 
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
- *
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
+ * 
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+ * 
  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
  * OF THIS SOFTWARE.
  */
 
@@ -34,41 +34,49 @@ TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL;
 TIFFErrorHandler
 TIFFSetErrorHandler(TIFFErrorHandler handler)
 {
-    TIFFErrorHandler prev = _TIFFerrorHandler;
-    _TIFFerrorHandler = handler;
-    return (prev);
+       TIFFErrorHandler prev = _TIFFerrorHandler;
+       _TIFFerrorHandler = handler;
+       return (prev);
 }
 
 TIFFErrorHandlerExt
 TIFFSetErrorHandlerExt(TIFFErrorHandlerExt handler)
 {
-    TIFFErrorHandlerExt prev = _TIFFerrorHandlerExt;
-    _TIFFerrorHandlerExt = handler;
-    return (prev);
+       TIFFErrorHandlerExt prev = _TIFFerrorHandlerExt;
+       _TIFFerrorHandlerExt = handler;
+       return (prev);
 }
 
 void
 TIFFError(const char* module, const char* fmt, ...)
 {
-    va_list ap;
-    va_start(ap, fmt);
-    if (_TIFFerrorHandler)
-        (*_TIFFerrorHandler)(module, fmt, ap);
-    if (_TIFFerrorHandlerExt)
-        (*_TIFFerrorHandlerExt)(0, module, fmt, ap);
-    va_end(ap);
+       va_list ap;
+       if (_TIFFerrorHandler) {
+               va_start(ap, fmt);      
+               (*_TIFFerrorHandler)(module, fmt, ap);
+               va_end(ap);
+       }
+       if (_TIFFerrorHandlerExt) {
+               va_start(ap, fmt);
+               (*_TIFFerrorHandlerExt)(0, module, fmt, ap);
+               va_end(ap);
+       }
 }
 
 void
 TIFFErrorExt(thandle_t fd, const char* module, const char* fmt, ...)
 {
-    va_list ap;
-    va_start(ap, fmt);
-    if (_TIFFerrorHandler)
-        (*_TIFFerrorHandler)(module, fmt, ap);
-    if (_TIFFerrorHandlerExt)
-        (*_TIFFerrorHandlerExt)(fd, module, fmt, ap);
-    va_end(ap);
+       va_list ap;
+       if (_TIFFerrorHandler) {
+               va_start(ap, fmt);
+               (*_TIFFerrorHandler)(module, fmt, ap);
+               va_end(ap);
+       }
+       if (_TIFFerrorHandlerExt) {
+               va_start(ap, fmt);
+               (*_TIFFerrorHandlerExt)(fd, module, fmt, ap);
+               va_end(ap);
+       }
 }
 
 /*