diff --git a/ANNOUNCE b/ANNOUNCE index d43d487f0..96829e44f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.29beta01 - March 30, 2017 +Libpng 1.5.29beta01 - April 1, 2017 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. @@ -26,12 +26,13 @@ Other information: Changes since the last public release (1.5.28): -version 1.5.29beta01 [March 30, 2017] +version 1.5.29beta01 [April 1, 2017] Suppress clang warnings about implicit sign changes in png.c Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer). Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in makefile.linux and makefile.solaris-x86 (Cosmin). - Silence clang -Wcomma warnings (Viktor SzaKats). + Silence clang -Wcomma warnings (Viktor Szakats). + Update Sourceforge URLs in documentation (https instead of http). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index de907523b..26167a45e 100644 --- a/CHANGES +++ b/CHANGES @@ -4531,12 +4531,13 @@ version 1.5.28 [December 29, 2016] Fixed a potential null pointer dereference in png_set_text_2() (bug report and patch by Patrick Keshishian, CVE-2016-10087). -version 1.5.29beta01 [March 30, 2017] +version 1.5.29beta01 [April 1, 2017] Suppress clang warnings about implicit sign changes in png.c Avoid potential overflow of shift operations in png_do_expand() (Aaron Boxer). Added missing "$(CPPFLAGS)" to the compile line for c.pic.o in makefile.linux and makefile.solaris-x86 (Cosmin). - Silence clang -Wcomma warnings (Viktor SzaKats). + Silence clang -Wcomma warnings (Viktor Szakats). + Update Sourceforge URLs in documentation (https instead of http). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index f4de81747..058b3b268 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.5.29beta01, December 30, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.5.29beta01, April 1, 2017 are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -126,4 +126,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 30, 2016 +April 1, 2017 diff --git a/README b/README index 8c419be4b..2c2eee2aa 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.29beta01 - December 30, 2016 (shared library 15.0) +README for libpng version 1.5.29beta01 - April 1, 2017 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -90,7 +90,7 @@ You may also want a copy of the PNG specification. It is available as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find these at http://www.libpng.org/pub/png/documents/ -This code is currently being archived at libpng.sf.net in the +This code is currently being archived at libpng.sourceforge.io in the [DOWNLOAD] area, and at ftp://ftp.simplesystems.org. If you can't find it in any of those places, e-mail me, and I'll help you find it. diff --git a/contrib/gregbook/README b/contrib/gregbook/README index fd30f0581..4d7be4260 100644 --- a/contrib/gregbook/README +++ b/contrib/gregbook/README @@ -55,7 +55,7 @@ mation and links to the latest version of the source code, and Chapters 13-15 of the book for detailed discussion of the three programs. Greg Roelofs -http://pobox.com/~newt/greg_contact.html +https://pobox.com/~newt/greg_contact.html 16 March 2008 diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index b0b75b94b..7f2852f7a 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,8 +1,8 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.6.27 [(PENDING RELEASE)] - * Copyright (c) 2014-2016 John Cunningham Bowler + * Last changed in libpng 1.6.29 [(PENDING RELEASE)] + * Copyright (c) 2014-2017 John Cunningham Bowler * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -7742,13 +7742,11 @@ image_transform_png_set_rgb_to_gray_ini(const image_transform *this, * NOTE: this number only affects the internal limit check in pngvalid, * it has no effect on the limits applied to the libpng values. */ - that->pm->limit += pow( -# if DIGITIZE - 2.0 -# else - 1.0 -# endif - /255, data.gamma); +#if DIGITIZE + that->pm->limit += pow( 2.0/255, data.gamma); +#else + that->pm->limit += pow( 1.0/255, data.gamma); +#endif } } diff --git a/libpng-manual.txt b/libpng-manual.txt index df6e67c30..285e0c34b 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.5.29beta01 - December 30, 2016 + libpng version 1.5.29beta01 - April 1, 2017 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.5.29beta01 - December 30, 2016 + libpng versions 0.97, January 1998, through 1.5.29beta01 - April 1, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -47,17 +47,17 @@ file format in application programs. The PNG specification (second edition), November 2003, is available as a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2004 (E)) at -. +. It is technically equivalent to the PNG specification (second edition) but has some additional material. -The PNG-1.0 specification is available as RFC 2083 - and as a -W3C Recommendation . +The PNG-1.0 specification is available as RFC 2083 + and as a +W3C Recommendation . Some additional chunks are described in the special-purpose public chunks documents at @@ -3605,7 +3605,7 @@ However, there are some uncertainties about the status of local variables after a longjmp, so the user may want to be careful about doing anything after setjmp returns non-zero besides returning itself. Consult your compiler documentation for more details. For an alternative approach, you -may wish to use the "cexcept" facility (see http://cexcept.sourceforge.net), +may wish to use the "cexcept" facility (see https://cexcept.sourceforge.io/), which is illustrated in pngvalid.c and in contrib/visupng. Beginning in libpng-1.4.0, the png_set_benign_errors() API became available. @@ -3822,7 +3822,7 @@ in a MNG datastream. As a minimum, it must have the MNG 8-byte signature and the MHDR and MEND chunks. Libpng does not provide support for these or any other MNG chunks; your application must provide its own support for them. You may wish to consider using libmng (available at -http://www.libmng.com) instead. +https://www.libmng.com/) instead. VII. Changes to Libpng from version 0.88 @@ -4369,7 +4369,7 @@ control. The git repository was built from old libpng-x.y.z.tar.gz files going back to version 0.70. You can access the git repository (read only) at - git://git.code.sf.net/p/libpng/code + https://git.code.sf.net/p/libpng/code.git or you can browse it with a web browser by selecting the "code" button at @@ -4379,7 +4379,7 @@ Patches can be sent to glennrp at users.sourceforge.net or to png-mng-implement at lists.sourceforge.net or you can upload them to the libpng bug tracker at - http://libpng.sourceforge.net + https://libpng.sourceforge.io/ We also accept patches built from the tar or zip distributions, and simple verbal discriptions of bug fixes, reported either to the @@ -4389,7 +4389,7 @@ mailing list, or directly to glennrp. XIII. Coding style Our coding style is similar to the "Allman" style -(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly +(See https://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly braces on separate lines: if (condition) @@ -4479,7 +4479,7 @@ preprocessor macros begin with "PNG". We request that applications that use libpng *not* begin any of their own symbols with either of these strings. Control keywords if, for, while, and switch are always followed by a space -to distinguish them from function calls, which have no trailing space. +to distinguish them from function calls, which have no trailing space. We put a space after each comma and after each semicolon in "for" statements, and we put spaces before and after each diff --git a/libpng.3 b/libpng.3 index 4e1ae53b1..260f83381 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 30, 2016" +.TH LIBPNG 3 "April 1, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.29beta01 .SH SYNOPSIS @@ -496,7 +496,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.5.29beta01 - December 30, 2016 + libpng version 1.5.29beta01 - April 1, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -507,7 +507,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.29beta01 - December 30, 2016 + libpng versions 0.97, January 1998, through 1.5.29beta01 - April 1, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -543,17 +543,17 @@ file format in application programs. The PNG specification (second edition), November 2003, is available as a W3C Recommendation and as an ISO Standard (ISO/IEC 15948:2004 (E)) at -. +. It is technically equivalent to the PNG specification (second edition) but has some additional material. -The PNG-1.0 specification is available as RFC 2083 - and as a -W3C Recommendation . +The PNG-1.0 specification is available as RFC 2083 + and as a +W3C Recommendation . Some additional chunks are described in the special-purpose public chunks documents at @@ -4101,7 +4101,7 @@ However, there are some uncertainties about the status of local variables after a longjmp, so the user may want to be careful about doing anything after setjmp returns non-zero besides returning itself. Consult your compiler documentation for more details. For an alternative approach, you -may wish to use the "cexcept" facility (see http://cexcept.sourceforge.net), +may wish to use the "cexcept" facility (see https://cexcept.sourceforge.io/), which is illustrated in pngvalid.c and in contrib/visupng. Beginning in libpng-1.4.0, the png_set_benign_errors() API became available. @@ -4318,7 +4318,7 @@ in a MNG datastream. As a minimum, it must have the MNG 8-byte signature and the MHDR and MEND chunks. Libpng does not provide support for these or any other MNG chunks; your application must provide its own support for them. You may wish to consider using libmng (available at -http://www.libmng.com) instead. +https://www.libmng.com/) instead. .SH VII. Changes to Libpng from version 0.88 @@ -4865,7 +4865,7 @@ control. The git repository was built from old libpng-x.y.z.tar.gz files going back to version 0.70. You can access the git repository (read only) at - git://git.code.sf.net/p/libpng/code + https://git.code.sf.net/p/libpng/code.git or you can browse it with a web browser by selecting the "code" button at @@ -4875,7 +4875,7 @@ Patches can be sent to glennrp at users.sourceforge.net or to png-mng-implement at lists.sourceforge.net or you can upload them to the libpng bug tracker at - http://libpng.sourceforge.net + https://libpng.sourceforge.io/ We also accept patches built from the tar or zip distributions, and simple verbal discriptions of bug fixes, reported either to the @@ -4885,7 +4885,7 @@ mailing list, or directly to glennrp. .SH XIII. Coding style Our coding style is similar to the "Allman" style -(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly +(See https://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly braces on separate lines: if (condition) @@ -4975,7 +4975,7 @@ preprocessor macros begin with "PNG". We request that applications that use libpng *not* begin any of their own symbols with either of these strings. Control keywords if, for, while, and switch are always followed by a space -to distinguish them from function calls, which have no trailing space. +to distinguish them from function calls, which have no trailing space. We put a space after each comma and after each semicolon in "for" statements, and we put spaces before and after each @@ -5167,7 +5167,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.29beta01 - December 30, 2016: +Libpng version 1.5.29beta01 - April 1, 2017: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5192,7 +5192,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.29beta01, December 30, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.5.29beta01, April 1, 2017, are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -5316,7 +5316,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 30, 2016 +April 1, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c0965fdf3..bf6ad2da9 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 30, 2016" +.TH LIBPNGPF 3 "April 1, 2017" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.29beta01 (private functions) diff --git a/png.5 b/png.5 index 6e786e870..b0cbd2cfa 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 30, 2016" +.TH PNG 5 "April 1, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -23,11 +23,11 @@ platforms. PNG specification (second edition), November 2003: .IP .br - (THIS LINK IS DEAD June 2008 but * versions dated 1998 through November 2002 have been archived at - * http://web.archive.org/web/20000816232553/http://www.inforamp.net/ + * https://web.archive.org/web/20000816232553/www.inforamp.net/ * ~poynton/notes/colour_and_gamma/ColorFAQ.txt ) * Charles Poynton poynton at poynton.com * diff --git a/projects/owatcom/pngconfig.mak b/projects/owatcom/pngconfig.mak index 054a3fc20..3ef2948ca 100644 --- a/projects/owatcom/pngconfig.mak +++ b/projects/owatcom/pngconfig.mak @@ -126,7 +126,7 @@ $# to work, download Brian Kernighan's awk (Brian Kernighan is the author of $# awk.) You can find source code and a built executable (called awk95.exe) $# here: $# -$# http://www.cs.princeton.edu/~bwk/btl.mirror/ +$# https://www.cs.princeton.edu/~bwk/btl.mirror/ $# $# The executable works just fine. $# diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 79a3241a7..63e4657e9 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.29beta01 - December 30, 2016 +libpng version 1.5.29beta01 - April 1, 2017 Copyright (c) 2010,2013,2016 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 679f50e84..85c4e619d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@