diff --git a/ANNOUNCE b/ANNOUNCE index cfdc20244..f99399565 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.17beta01 - December 29, 2014 +Libpng 1.6.17beta01 - January 1, 2015 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. @@ -25,7 +25,7 @@ Other information: Changes since the last public release (1.6.16): -Version 1.6.17beta01 [December 29, 2014] +Version 1.6.17beta01 [January 1, 2015] Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h Corrected the width limit calculation in png_check_IHDR(). Removed user limits from pngfix. Also pass NULL pointers to diff --git a/CHANGES b/CHANGES index f254347bb..836fd1ec8 100644 --- a/CHANGES +++ b/CHANGES @@ -5125,7 +5125,7 @@ Version 1.6.16rc03 [December 21, 2014] Version 1.6.16 [December 22, 2014] No changes. -Version 1.6.17beta01 [December 29, 2014] +Version 1.6.17beta01 [January 1, 2015] Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h Corrected the width limit calculation in png_check_IHDR(). Removed user limits from pngfix. Also pass NULL pointers to diff --git a/LICENSE b/LICENSE index ab948aefd..9848c7ee6 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.17beta01, December 22, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17beta01, January 1, 2015, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 22, 2014 +January 1, 2015 diff --git a/README b/README index 0d10dec93..8cf8bd6b2 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.17beta01 - December 22, 2014 (shared library 16.0) +README for libpng version 1.6.17beta01 - January 1, 2015 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/arm/arm_init.c b/arm/arm_init.c index d87b6e727..fb3d50d04 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon.S b/arm/filter_neon.S index b7c0a90b4..3b061d6bb 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index a2b5011f6..d42c78890 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -5,7 +5,7 @@ * Written by James Yu , October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c index 376709c34..abae9e33b 100644 --- a/contrib/arm-neon/linux.c +++ b/contrib/arm-neon/linux.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c index c65406be9..d7c1c1e79 100644 --- a/contrib/libtests/pngstest.c +++ b/contrib/libtests/pngstest.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013-2014 John Cunningham Bowler * - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 7336be031..8852f87ba 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -2,7 +2,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * * Last changed in libpng 1.6.17 [(PENDING RELEASE)] - * Copyright (c) 2014 Glenn Randers-Pehrson + * Copyright (c) 2014-2015 Glenn Randers-Pehrson * Written by John Cunningham Bowler * * This code is released under the libpng license. diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index 5b5d1888a..048579b0b 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -1,6 +1,6 @@ /* pngfix.c * - * Copyright (c) 2014 John Cunningham Bowler + * Copyright (c) 2014-2015 John Cunningham Bowler * * Last changed in libpng 1.6.17 [(PENDING RELEASE)] * diff --git a/libpng-manual.txt b/libpng-manual.txt index 696af6bed..4cfe7eb4f 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.17beta01 - December 22, 2014 + libpng version 1.6.17beta01 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.17beta01 - December 22, 2014 + libpng versions 0.97, January 1998, through 1.6.17beta01 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5274,7 +5274,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -December 22, 2014 +January 1, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index e83d921ec..baf848309 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 22, 2014" +.TH LIBPNG 3 "January 1, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta01 .SH SYNOPSIS @@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.17beta01 - December 22, 2014 + libpng version 1.6.17beta01 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.17beta01 - December 22, 2014 + libpng versions 0.97, January 1998, through 1.6.17beta01 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5778,7 +5778,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -December 22, 2014 +January 1, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6093,7 +6093,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.17beta01 - December 22, 2014: +Libpng version 1.6.17beta01 - January 1, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6116,7 +6116,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.17beta01, December 22, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.6.17beta01, January 1, 2015, are Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6215,7 +6215,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 22, 2014 +January 1, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index cd0522099..17639c900 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 22, 2014" +.TH LIBPNGPF 3 "January 1, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17beta01 (private functions) diff --git a/png.5 b/png.5 index ff6083ce6..f5896baad 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 22, 2014" +.TH PNG 5 "January 1, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 791e9b6e3..241923d08 100644 --- a/png.c +++ b/png.c @@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.17beta01 - December 23, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.6.17beta01 - January 1, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.6.17beta01 - December 23, 2014\ + return "libpng version 1.6.17beta01 - January 1, 2015\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 0e1aeac83..74393c9ac 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.17beta01, December 22, 2014 + * libpng version 1.6.17beta01, January 1, 2015 * Copyright (c) 1998-2014 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.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.17beta01, December 22, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.17beta01, January 1, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -244,7 +244,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta01, December 22, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17beta01, January 1, 2015, are * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -356,7 +356,7 @@ * Y2K compliance in libpng: * ========================= * - * December 22, 2014 + * January 1, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -426,7 +426,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.17beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.17beta01 - December 22, 2014\n" + " libpng version 1.6.17beta01 - January 1, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 798518ae7..98ca88e2a 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,9 +1,9 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.17beta01,December 23, 2014 + * libpng version 1.6.17beta01, (PENDING RELEASE) * - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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.) * diff --git a/pngrtran.c b/pngrtran.c index 4bbb911b5..8ee61f7d8 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -2,7 +2,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * * Last changed in libpng 1.6.17 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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.) * diff --git a/pngrutil.c b/pngrutil.c index 4c26be48c..645bbf241 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -4444,8 +4444,11 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) png_debug1(3, "height = %u,", png_ptr->height); png_debug1(3, "iwidth = %u,", png_ptr->iwidth); png_debug1(3, "num_rows = %u,", png_ptr->num_rows); - png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes); - png_debug1(3, "irowbytes = %lu", + png_debug1(3, "row_bytes = %lu,", (unsigned long)row_bytes); + png_debug1(3, "png_ptr->rowbytes = %lu,", (unsigned long)png_ptr->rowbytes); + png_debug1(3, "png_ptr->info_rowbytes = %lu,", + (unsigned long)png_ptr->info_rowbytes); + png_debug1(3, "PNG_ROWBYTES = %lu", (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1); /* The sequential reader needs a buffer for IDAT, but the progressive reader diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index bdec85538..f397356a6 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.17beta01 - December 22, 2014 +libpng version 1.6.17beta01 - January 1, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index a6f092bcb..7bfea2f14 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@