diff --git a/ANNOUNCE b/ANNOUNCE index c46b7bced..09ed650f8 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta24 - November 24, 2013 +Libpng 1.7.0beta24 - November 25, 2013 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. @@ -425,17 +425,21 @@ Version 1.7.0beta23 [November 24, 2013] Moved prototype for png_handle_unknown() in pngpriv.h outside of the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile + Conditionally compile some unused functions reported by -Wall in + pngminim. Fixed 'minimal' builds. Various obviously useful minimal configurations - don't build because of missing contrib/libtests test programs and overly - complex dependencies in scripts/pnglibconf.dfa. This change adds - contrib/conftest/*.dfa files that can be used in automatic build + don't build because of missing contrib/libtests test programs and + overly complex dependencies in scripts/pnglibconf.dfa. This change + adds contrib/conftest/*.dfa files that can be used in automatic build scripts to ensure that these configurations continue to build. 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(). -Version 1.7.0beta24 [November 24, 2013] +Version 1.7.0beta24 [November 25, 2013] + Removed or marked PNG_UNUSED some harmless "dead assignments" reported + by clang scan-build. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 0ad81cf56..f6cc2fa5f 100644 --- a/CHANGES +++ b/CHANGES @@ -4714,17 +4714,21 @@ Version 1.7.0beta23 [November 24, 2013] Moved prototype for png_handle_unknown() in pngpriv.h outside of the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile + Conditionally compile some unused functions reported by -Wall in + pngminim. Fixed 'minimal' builds. Various obviously useful minimal configurations - don't build because of missing contrib/libtests test programs and overly - complex dependencies in scripts/pnglibconf.dfa. This change adds - contrib/conftest/*.dfa files that can be used in automatic build + don't build because of missing contrib/libtests test programs and + overly complex dependencies in scripts/pnglibconf.dfa. This change + adds contrib/conftest/*.dfa files that can be used in automatic build scripts to ensure that these configurations continue to build. 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(). -Version 1.7.0beta24 [November 24, 2013] +Version 1.7.0beta24 [November 25, 2013] + Removed or marked PNG_UNUSED some harmless "dead assignments" reported + by clang scan-build. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.c b/png.c index bf1ef65d2..bde2372f5 100644 --- a/png.c +++ b/png.c @@ -201,6 +201,7 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver) pos = png_safecat(m, (sizeof m), pos, user_png_ver); pos = png_safecat(m, (sizeof m), pos, " but running with "); pos = png_safecat(m, (sizeof m), pos, png_libpng_ver); + PNG_UNUSED(pos) png_warning(png_ptr, m); #endif @@ -695,13 +696,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta24 - November 24, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta24 - November 25, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.7.0beta24 - November 24, 2013\ + return "libpng version 1.7.0beta24 - November 25, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1634,6 +1635,7 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace, # endif /* The 'reason' is an arbitrary message, allow +79 maximum 195 */ pos = png_safecat(message, (sizeof message), pos, reason); + PNG_UNUSED(pos) /* This is recoverable, but make it unconditionally an app_error on write to * avoid writing invalid ICC profiles into PNG files. (I.e. we handle them diff --git a/pngread.c b/pngread.c index eea102531..cf57b54ee 100644 --- a/pngread.c +++ b/pngread.c @@ -2811,7 +2811,6 @@ png_image_read_and_map(png_voidp argument) break; default: - passes = 0; png_error(png_ptr, "unknown interlace type"); } @@ -3130,7 +3129,6 @@ png_image_read_composite(png_voidp argument) break; default: - passes = 0; png_error(png_ptr, "unknown interlace type"); } @@ -3279,7 +3277,6 @@ png_image_read_background(png_voidp argument) break; default: - passes = 0; png_error(png_ptr, "unknown interlace type"); } diff --git a/pngrutil.c b/pngrutil.c index f5f3f8eac..e4d184d04 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -3794,7 +3794,6 @@ png_read_filter_row_paeth_1byte_pixel(png_row_infop row_info, png_bytep row, /* Calculate the current pixel in a, and move the previous row pixel to c * for the next time round the loop */ - c = b; a += *row; *row++ = (png_byte)a; }