diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2008-01-16 19:20:21 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2008-01-16 19:20:21 (GMT) |
commit | 8dab665567c9dffaa3f5fea198fc2110d536594d (patch) | |
tree | 78bac4e928b25e139605aceefa82537f378d8af0 /libpng/pngerror.c | |
parent | d3461a1c31f008345d784dc3e819047bc5265c30 (diff) | |
download | Doxygen-8dab665567c9dffaa3f5fea198fc2110d536594d.zip Doxygen-8dab665567c9dffaa3f5fea198fc2110d536594d.tar.gz Doxygen-8dab665567c9dffaa3f5fea198fc2110d536594d.tar.bz2 |
Release-1.5.4
Diffstat (limited to 'libpng/pngerror.c')
-rw-r--r-- | libpng/pngerror.c | 224 |
1 files changed, 138 insertions, 86 deletions
diff --git a/libpng/pngerror.c b/libpng/pngerror.c index b6ad8d8..bdafdc2 100644 --- a/libpng/pngerror.c +++ b/libpng/pngerror.c @@ -1,9 +1,9 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * libpng 1.2.1 - December 12, 2001 + * Last changed in libpng 1.2.22 [October 13, 2007] * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2001 Glenn Randers-Pehrson + * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -16,86 +16,113 @@ #define PNG_INTERNAL #include "png.h" +#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) static void /* PRIVATE */ png_default_error PNGARG((png_structp png_ptr, - png_const_charp message)); + png_const_charp error_message)); +#ifndef PNG_NO_WARNINGS static void /* PRIVATE */ png_default_warning PNGARG((png_structp png_ptr, - png_const_charp message)); + png_const_charp warning_message)); +#endif /* PNG_NO_WARNINGS */ /* This function is called whenever there is a fatal error. This function * should not be changed. If there is a need to handle errors differently, * you should supply a replacement error function and use png_set_error_fn() * to replace the error function at run-time. */ +#ifndef PNG_NO_ERROR_TEXT void PNGAPI -png_error(png_structp png_ptr, png_const_charp message) +png_error(png_structp png_ptr, png_const_charp error_message) { #ifdef PNG_ERROR_NUMBERS_SUPPORTED char msg[16]; - if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) + if (png_ptr != NULL) { - int offset = 0; - if (*message == '#') + if (png_ptr->flags& + (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) { - for (offset=1; offset<15; offset++) - if (*(message+offset) == ' ') - break; - if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) - { - int i; - for (i=0; i<offset-1; i++) - msg[i]=message[i+1]; - msg[i]='\0'; - message=msg; - } - else - message+=offset; - } - else - { - if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) - { - msg[0]='0'; - msg[1]='\0'; - message=msg; - } + if (*error_message == '#') + { + int offset; + for (offset=1; offset<15; offset++) + if (*(error_message+offset) == ' ') + break; + if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) + { + int i; + for (i=0; i<offset-1; i++) + msg[i]=error_message[i+1]; + msg[i]='\0'; + error_message=msg; + } + else + error_message+=offset; + } + else + { + if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) + { + msg[0]='0'; + msg[1]='\0'; + error_message=msg; + } + } } } #endif - if (png_ptr->error_fn != NULL) - (*(png_ptr->error_fn))(png_ptr, message); + if (png_ptr != NULL && png_ptr->error_fn != NULL) + (*(png_ptr->error_fn))(png_ptr, error_message); + + /* If the custom handler doesn't exist, or if it returns, + use the default handler, which will not return. */ + png_default_error(png_ptr, error_message); +} +#else +void PNGAPI +png_err(png_structp png_ptr) +{ + if (png_ptr != NULL && png_ptr->error_fn != NULL) + (*(png_ptr->error_fn))(png_ptr, '\0'); - /* if the following returns or doesn't exist, use the default function, - which will not return */ - png_default_error(png_ptr, message); + /* If the custom handler doesn't exist, or if it returns, + use the default handler, which will not return. */ + png_default_error(png_ptr, '\0'); } +#endif /* PNG_NO_ERROR_TEXT */ +#ifndef PNG_NO_WARNINGS /* This function is called whenever there is a non-fatal error. This function * should not be changed. If there is a need to handle warnings differently, * you should supply a replacement warning function and use * png_set_error_fn() to replace the warning function at run-time. */ void PNGAPI -png_warning(png_structp png_ptr, png_const_charp message) +png_warning(png_structp png_ptr, png_const_charp warning_message) { - int offset = 0; + int offset = 0; + if (png_ptr != NULL) + { #ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (png_ptr->flags&(PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) + if (png_ptr->flags& + (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) #endif - { - if (*message == '#') { - for (offset=1; offset<15; offset++) - if (*(message+offset) == ' ') - break; + if (*warning_message == '#') + { + for (offset=1; offset<15; offset++) + if (*(warning_message+offset) == ' ') + break; + } } + if (png_ptr != NULL && png_ptr->warning_fn != NULL) + (*(png_ptr->warning_fn))(png_ptr, warning_message+offset); } - if (png_ptr->warning_fn != NULL) - (*(png_ptr->warning_fn))(png_ptr, (png_const_charp)(message+offset)); else - png_default_warning(png_ptr, (png_const_charp)(message+offset)); + png_default_warning(png_ptr, warning_message+offset); } +#endif /* PNG_NO_WARNINGS */ + /* These utilities are used internally to build an error message that relates * to the current chunk. The chunk name comes from png_ptr->chunk_name, @@ -103,14 +130,16 @@ png_warning(png_structp png_ptr, png_const_charp message) * to 63 bytes, the name characters are output as hex digits wrapped in [] * if the character is invalid. */ -#define isnonalpha(c) ((c) < 41 || (c) > 122 || ((c) > 90 && (c) < 97)) +#define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) static PNG_CONST char png_digit[16] = { - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', - 'F' }; + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', + 'A', 'B', 'C', 'D', 'E', 'F' +}; +#if !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT) static void /* PRIVATE */ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp - message) + error_message) { int iout = 0, iin = 0; @@ -130,32 +159,48 @@ png_format_buffer(png_structp png_ptr, png_charp buffer, png_const_charp } } - if (message == NULL) - buffer[iout] = 0; + if (error_message == NULL) + buffer[iout] = '\0'; else { buffer[iout++] = ':'; buffer[iout++] = ' '; - png_memcpy(buffer+iout, message, 64); - buffer[iout+63] = 0; + png_strncpy(buffer+iout, error_message, 63); + buffer[iout+63] = '\0'; } } +#ifdef PNG_READ_SUPPORTED void PNGAPI -png_chunk_error(png_structp png_ptr, png_const_charp message) +png_chunk_error(png_structp png_ptr, png_const_charp error_message) { char msg[18+64]; - png_format_buffer(png_ptr, msg, message); - png_error(png_ptr, msg); + if (png_ptr == NULL) + png_error(png_ptr, error_message); + else + { + png_format_buffer(png_ptr, msg, error_message); + png_error(png_ptr, msg); + } } +#endif /* PNG_READ_SUPPORTED */ +#endif /* !defined(PNG_NO_WARNINGS) || !defined(PNG_NO_ERROR_TEXT) */ +#ifndef PNG_NO_WARNINGS void PNGAPI -png_chunk_warning(png_structp png_ptr, png_const_charp message) +png_chunk_warning(png_structp png_ptr, png_const_charp warning_message) { char msg[18+64]; - png_format_buffer(png_ptr, msg, message); - png_warning(png_ptr, msg); + if (png_ptr == NULL) + png_warning(png_ptr, warning_message); + else + { + png_format_buffer(png_ptr, msg, warning_message); + png_warning(png_ptr, msg); + } } +#endif /* PNG_NO_WARNINGS */ + /* This is the default error handling function. Note that replacements for * this function MUST NOT RETURN, or the program will likely crash. This @@ -163,92 +208,94 @@ png_chunk_warning(png_structp png_ptr, png_const_charp message) * error function pointer in png_set_error_fn(). */ static void /* PRIVATE */ -png_default_error(png_structp png_ptr, png_const_charp message) +png_default_error(png_structp png_ptr, png_const_charp error_message) { #ifndef PNG_NO_CONSOLE_IO #ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (*message == '#') + if (*error_message == '#') { int offset; char error_number[16]; for (offset=0; offset<15; offset++) { - error_number[offset] = *(message+offset+1); - if (*(message+offset) == ' ') + error_number[offset] = *(error_message+offset+1); + if (*(error_message+offset) == ' ') break; } if((offset > 1) && (offset < 15)) { error_number[offset-1]='\0'; - fprintf(stderr, "libpng error no. %s: %s\n", error_number, message+offset); + fprintf(stderr, "libpng error no. %s: %s\n", error_number, + error_message+offset); } else - fprintf(stderr, "libpng error: %s, offset=%d\n", message,offset); + fprintf(stderr, "libpng error: %s, offset=%d\n", error_message,offset); } else #endif - fprintf(stderr, "libpng error: %s\n", message); -#else - if (message) - /* make compiler happy */ ; + fprintf(stderr, "libpng error: %s\n", error_message); #endif #ifdef PNG_SETJMP_SUPPORTED + if (png_ptr) + { # ifdef USE_FAR_KEYWORD { jmp_buf jmpbuf; - png_memcpy(jmpbuf,png_ptr->jmpbuf,sizeof(jmp_buf)); + png_memcpy(jmpbuf, png_ptr->jmpbuf, png_sizeof(jmp_buf)); longjmp(jmpbuf, 1); } # else longjmp(png_ptr->jmpbuf, 1); -# endif +# endif + } #else - if (png_ptr) - /* make compiler happy */ ; PNG_ABORT(); #endif +#ifdef PNG_NO_CONSOLE_IO + error_message = error_message; /* make compiler happy */ +#endif } +#ifndef PNG_NO_WARNINGS /* This function is called when there is a warning, but the library thinks * it can continue anyway. Replacement functions don't have to do anything * here if you don't want them to. In the default configuration, png_ptr is * not used, but it is passed in case it may be useful. */ static void /* PRIVATE */ -png_default_warning(png_structp png_ptr, png_const_charp message) +png_default_warning(png_structp png_ptr, png_const_charp warning_message) { #ifndef PNG_NO_CONSOLE_IO # ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (*message == '#') + if (*warning_message == '#') { int offset; char warning_number[16]; for (offset=0; offset<15; offset++) { - warning_number[offset]=*(message+offset+1); - if (*(message+offset) == ' ') + warning_number[offset]=*(warning_message+offset+1); + if (*(warning_message+offset) == ' ') break; } if((offset > 1) && (offset < 15)) { warning_number[offset-1]='\0'; fprintf(stderr, "libpng warning no. %s: %s\n", warning_number, - message+offset); + warning_message+offset); } else - fprintf(stderr, "libpng warning: %s\n", message); + fprintf(stderr, "libpng warning: %s\n", warning_message); } else # endif - fprintf(stderr, "libpng warning: %s\n", message); + fprintf(stderr, "libpng warning: %s\n", warning_message); #else - if (message) - /* appease compiler */ ; + warning_message = warning_message; /* make compiler happy */ #endif - if (png_ptr) - return; + png_ptr = png_ptr; /* make compiler happy */ } +#endif /* PNG_NO_WARNINGS */ /* This function is called when the application wants to use another method * of handling errors and warnings. Note that the error function MUST NOT @@ -259,6 +306,8 @@ void PNGAPI png_set_error_fn(png_structp png_ptr, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warning_fn) { + if (png_ptr == NULL) + return; png_ptr->error_ptr = error_ptr; png_ptr->error_fn = error_fn; png_ptr->warning_fn = warning_fn; @@ -272,12 +321,14 @@ png_set_error_fn(png_structp png_ptr, png_voidp error_ptr, png_voidp PNGAPI png_get_error_ptr(png_structp png_ptr) { + if (png_ptr == NULL) + return NULL; return ((png_voidp)png_ptr->error_ptr); } #ifdef PNG_ERROR_NUMBERS_SUPPORTED -void +void PNGAPI png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode) { if(png_ptr != NULL) @@ -287,3 +338,4 @@ png_set_strip_error_numbers(png_structp png_ptr, png_uint_32 strip_mode) } } #endif +#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ |