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

[libpng16] Fixed pngvalid 'fail' function declaration on the Intel C Compiler.

Browse Source 
This reverts to the previous 'static' implementation and works round
the 'unused static function' warning by using PNG_UNUSED().
This commit is contained in:
John Bowler 2013-11-22 18:49:58 -06:00 committed by Glenn Randers-Pehrson
parent aaf1bb1ae1
commit 0f6303301f
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.6.8beta01 - November 22, 2013 Libpng 1.6.8beta01 - November 23, 2013
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -26,7 +26,7 @@ Other information:
Changes since the last public release (1.6.7): Changes since the last public release (1.6.7):
Version 1.6.8beta01 [November 22, 2013] Version 1.6.8beta01 [November 23, 2013]
Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to Changed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpread.c to
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED to be consistent with
what is in pngpriv.h. what is in pngpriv.h.
@ -40,6 +40,9 @@ Version 1.6.8beta01 [November 22, 2013]
contrib/conftest/*.dfa files that can be used in automatic build contrib/conftest/*.dfa files that can be used in automatic build
scripts to ensure that these configurations continue to build. scripts to ensure that these configurations continue to build.
Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder.
Fixed pngvalid 'fail' function declaration on the Intel C Compiler.
This reverts to the previous 'static' implementation and works round
the 'unused static function' warning by using PNG_UNUSED().
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

5
CHANGES
View File

@ -4713,7 +4713,7 @@ Version 1.6.7rc02 [November 7, 2013]
Version 1.6.7 [November 14, 2013] Version 1.6.7 [November 14, 2013]
Version 1.6.8beta01 [November 22, 2013] Version 1.6.8beta01 [November 23, 2013]
Moved prototype for png_handle_unknown() in pngpriv.h outside of Moved prototype for png_handle_unknown() in pngpriv.h outside of
the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block.
Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile
@ -4725,6 +4725,9 @@ Version 1.6.8beta01 [November 22, 2013]
contrib/conftest/*.dfa files that can be used in automatic build contrib/conftest/*.dfa files that can be used in automatic build
scripts to ensure that these configurations continue to build. scripts to ensure that these configurations continue to build.
Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder.
Fixed pngvalid 'fail' function declaration on the Intel C Compiler.
This reverts to the previous 'static' implementation and works round
the 'unused static function' warning by using PNG_UNUSED().
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

9
contrib/libtests/pngvalid.c
View File

@ -1953,11 +1953,9 @@ typedef struct png_modifier
} png_modifier; } png_modifier;
/* This returns true if the test should be stopped now because it has already /* This returns true if the test should be stopped now because it has already
* failed and it is running silently. It is not static simply to avoid having * failed and it is running silently.
* to special case it on all the #ifdefs on which it depends.
*/ */
extern int fail(png_modifier *pm); static int fail(png_modifier *pm)
/*static*/ int fail(png_modifier *pm)
{ {
return !pm->log && !pm->this.verbose && (pm->this.nerrors > 0 || return !pm->log && !pm->this.verbose && (pm->this.nerrors > 0 ||
(pm->this.treat_warnings_as_errors && pm->this.nwarnings > 0)); (pm->this.treat_warnings_as_errors && pm->this.nwarnings > 0));
@ -10267,6 +10265,9 @@ int main(int argc, char **argv)
} }
} }
/* This is required because some very minimal configurations do not use it:
*/
UNUSED(fail)
return 0; return 0;
} }
#else /* write or low level APIs not supported */ #else /* write or low level APIs not supported */