cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Simplified error message code in pngunknown. The simplification has

Browse Source 
the useful side effect of avoiding a bogus warning generated by the latest
version of the Intel C compiler (it objects to
condition ? string-literal : string-literal).
This commit is contained in:
John Bowler 2013-10-04 20:28:33 -05:00 committed by Glenn Randers-Pehrson
parent 5b1df53a82
commit 236e105170
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANNOUNCE
View File

@ -65,6 +65,10 @@ Version 1.6.7beta02 [October 5, 2013]
Cleaned up (char*) casts of zlib messages. The latest version of the Intel C Cleaned up (char*) casts of zlib messages. The latest version of the Intel C
compiler complains about casting a string literal as (char*), so copied the compiler complains about casting a string literal as (char*), so copied the
treatment of z_const from the library code into pngfix.c treatment of z_const from the library code into pngfix.c
Simplified error message code in pngunknown. The simplification has the
useful side effect of avoiding a bogus warning generated by the latest
version of the Intel C compiler (it objects to
condition ? string-literal : string-literal).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

4
CHANGES
View File

@ -4679,6 +4679,10 @@ Version 1.6.7beta02 [October 5, 2013]
Cleaned up (char*) casts of zlib messages. The latest version of the Intel C Cleaned up (char*) casts of zlib messages. The latest version of the Intel C
compiler complains about casting a string literal as (char*), so copied the compiler complains about casting a string literal as (char*), so copied the
treatment of z_const from the library code into pngfix.c treatment of z_const from the library code into pngfix.c
Simplified error message code in pngunknown. The simplification has the
useful side effect of avoiding a bogus warning generated by the latest
version of the Intel C compiler (it objects to
condition ? string-literal : string-literal).
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

10
contrib/libtests/pngunknown.c
View File

@ -866,13 +866,6 @@ check_handling(display *d, int def, png_uint_32 chunks, png_uint_32 known,
const char *type; const char *type;
const char *errorx = NULL; const char *errorx = NULL;
# ifdef PNG_READ_USER_CHUNKS_SUPPORTED
const char *callback = (set_callback ? ",callback" : "");
# else
# define callback ""
UNUSED(set_callback)
# endif
if (chunk_info[i].unknown) if (chunk_info[i].unknown)
{ {
if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT) if (keep == PNG_HANDLE_CHUNK_AS_DEFAULT)
@ -970,7 +963,8 @@ check_handling(display *d, int def, png_uint_32 chunks, png_uint_32 known,
if (errorx != NULL) if (errorx != NULL)
{ {
++(d->error_count); ++(d->error_count);
fprintf(stderr, "%s(%s%s): %s %s %s: %s\n", d->file, d->test, callback, fprintf(stderr, "%s(%s%s): %s %s %s: %s\n", d->file, d->test,
set_callback ? ",callback" : "",
type, chunk_info[i].name, position, errorx); type, chunk_info[i].name, position, errorx);
} }