| OLD | NEW |
| 1 /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.5 2010-03-10 1
8:56:48 bfriesen Exp $ */ | 1 /* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_error.c,v 1.5 2010-03-10 1
8:56:48 bfriesen Exp $ */ |
| 2 | 2 |
| 3 /* | 3 /* |
| 4 * Copyright (c) 1988-1997 Sam Leffler | 4 * Copyright (c) 1988-1997 Sam Leffler |
| 5 * Copyright (c) 1991-1997 Silicon Graphics, Inc. | 5 * Copyright (c) 1991-1997 Silicon Graphics, Inc. |
| 6 * | 6 * |
| 7 * Permission to use, copy, modify, distribute, and sell this software and | 7 * Permission to use, copy, modify, distribute, and sell this software and |
| 8 * its documentation for any purpose is hereby granted without fee, provided | 8 * its documentation for any purpose is hereby granted without fee, provided |
| 9 * that (i) the above copyright notices and this permission notice appear in | 9 * that (i) the above copyright notices and this permission notice appear in |
| 10 * all copies of the software and related documentation, and (ii) the names of | 10 * all copies of the software and related documentation, and (ii) the names of |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF | 22 * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF |
| 23 * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE | 23 * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE |
| 24 * OF THIS SOFTWARE. | 24 * OF THIS SOFTWARE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 /* | 27 /* |
| 28 * TIFF Library. | 28 * TIFF Library. |
| 29 */ | 29 */ |
| 30 #include "tiffiop.h" | 30 #include "tiffiop.h" |
| 31 | 31 |
| 32 /*TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL;*/ | 32 TIFFErrorHandlerExt _TIFFerrorHandlerExt = NULL; |
| 33 /* Modify here for use _TIFFerrorHandlerExt by Sunliang.Liu 20090715 */ | |
| 34 TIFFErrorHandler _TIFFerrorHandler = NULL; | |
| 35 | 33 |
| 36 TIFFErrorHandler | 34 TIFFErrorHandler |
| 37 TIFFSetErrorHandler(TIFFErrorHandler handler) | 35 TIFFSetErrorHandler(TIFFErrorHandler handler) |
| 38 { | 36 { |
| 39 TIFFErrorHandler prev = _TIFFerrorHandler; | 37 TIFFErrorHandler prev = _TIFFerrorHandler; |
| 40 _TIFFerrorHandler = handler; | 38 _TIFFerrorHandler = handler; |
| 41 return (prev); | 39 return (prev); |
| 42 } | 40 } |
| 43 | 41 |
| 44 TIFFErrorHandlerExt | 42 TIFFErrorHandlerExt |
| (...skipping 28 matching lines...) Expand all Loading... |
| 73 va_end(ap); | 71 va_end(ap); |
| 74 } | 72 } |
| 75 | 73 |
| 76 /* | 74 /* |
| 77 * Local Variables: | 75 * Local Variables: |
| 78 * mode: c | 76 * mode: c |
| 79 * c-basic-offset: 8 | 77 * c-basic-offset: 8 |
| 80 * fill-column: 78 | 78 * fill-column: 78 |
| 81 * End: | 79 * End: |
| 82 */ | 80 */ |
| 83 | |
| OLD | NEW |