diff options
| -rw-r--r-- | ANNOUNCE | 4 | ||||
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | LICENSE | 4 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | contrib/gregbook/readpng2.c | 57 | ||||
| -rw-r--r-- | libpng-manual.txt | 6 | ||||
| -rw-r--r-- | libpng.3 | 14 | ||||
| -rw-r--r-- | libpngpf.3 | 2 | ||||
| -rw-r--r-- | png.5 | 2 | ||||
| -rw-r--r-- | png.c | 4 | ||||
| -rw-r--r-- | png.h | 10 | ||||
| -rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
| -rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
| -rw-r--r-- | scripts/README.txt | 2 | ||||
| -rw-r--r-- | scripts/pnglibconf.h.prebuilt | 2 |
15 files changed, 61 insertions, 54 deletions
@@ -1,4 +1,4 @@ -Libpng 1.6.19beta04 - October 10, 2015 +Libpng 1.6.19beta04 - October 15, 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. @@ -92,7 +92,7 @@ Version 1.6.19beta03 [September 26, 2015] warning, updated pngstest-errors.h for the errors detected with the new contrib/testspngs PNG test files (John Bowler). -Version 1.6.19beta04 [October 10, 2015] +Version 1.6.19beta04 [October 15, 2015] Worked around rgb-to-gray issues in libpng 1.6. The previous attempts to ignore the errors in the code aren't quite enough to deal with the 'channel selection' encoding added to libpng 1.7; abort. @@ -5375,7 +5375,7 @@ Version 1.6.19beta03 [September 26, 2015] warning, updated pngstest-errors.h for the errors detected with the new contrib/testspngs PNG test files (John Bowler). -Version 1.6.19beta04 [October 10, 2015] +Version 1.6.19beta04 [October 15, 2015] Worked around rgb-to-gray issues in libpng 1.6. The previous attempts to ignore the errors in the code aren't quite enough to deal with the 'channel selection' encoding added to libpng 1.7; abort. @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.19beta04, September 26, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta04, October 15, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -104,4 +104,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 26, 2015 +October 15, 2015 @@ -1,4 +1,4 @@ -README for libpng version 1.6.19beta04 - September 26, 2015 (shared library 16.0) +README for libpng version 1.6.19beta04 - October 15, 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/contrib/gregbook/readpng2.c b/contrib/gregbook/readpng2.c index 4cf2600a4..a9e7ba59d 100644 --- a/contrib/gregbook/readpng2.c +++ b/contrib/gregbook/readpng2.c @@ -4,7 +4,7 @@ --------------------------------------------------------------------------- - Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. + Copyright (c) 1998-2015 Greg Roelofs. All rights reserved. This software is provided "as is," without warranty of any kind, express or implied. In no event shall the author or contributors @@ -51,6 +51,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + --------------------------------------------------------------------------- + + Changelog: + %RDATE% - Check return value of png_get_bKGD() (Glenn R-P) + ---------------------------------------------------------------------------*/ @@ -261,36 +266,38 @@ static void readpng2_info_callback(png_structp png_ptr, png_infop info_ptr) /* since we know we've read all of the PNG file's "header" (i.e., up * to IDAT), we can check for a background color here */ - if (mainprog_ptr->need_bgcolor && - png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD)) + if (mainprog_ptr->need_bgcolor) { png_color_16p pBackground; /* it is not obvious from the libpng documentation, but this function * takes a pointer to a pointer, and it always returns valid red, * green and blue values, regardless of color_type: */ - png_get_bKGD(png_ptr, info_ptr, &pBackground); - - /* however, it always returns the raw bKGD data, regardless of any - * bit-depth transformations, so check depth and adjust if necessary */ - if (bit_depth == 16) { - mainprog_ptr->bg_red = pBackground->red >> 8; - mainprog_ptr->bg_green = pBackground->green >> 8; - mainprog_ptr->bg_blue = pBackground->blue >> 8; - } else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - if (bit_depth == 1) - mainprog_ptr->bg_red = mainprog_ptr->bg_green = - mainprog_ptr->bg_blue = pBackground->gray? 255 : 0; - else if (bit_depth == 2) - mainprog_ptr->bg_red = mainprog_ptr->bg_green = - mainprog_ptr->bg_blue = (255/3) * pBackground->gray; - else /* bit_depth == 4 */ - mainprog_ptr->bg_red = mainprog_ptr->bg_green = - mainprog_ptr->bg_blue = (255/15) * pBackground->gray; - } else { - mainprog_ptr->bg_red = (uch)pBackground->red; - mainprog_ptr->bg_green = (uch)pBackground->green; - mainprog_ptr->bg_blue = (uch)pBackground->blue; + if (png_get_bKGD(png_ptr, info_ptr, &pBackground)) + { + + /* however, it always returns the raw bKGD data, regardless of any + * bit-depth transformations, so check depth and adjust if necessary + */ + if (bit_depth == 16) { + mainprog_ptr->bg_red = pBackground->red >> 8; + mainprog_ptr->bg_green = pBackground->green >> 8; + mainprog_ptr->bg_blue = pBackground->blue >> 8; + } else if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { + if (bit_depth == 1) + mainprog_ptr->bg_red = mainprog_ptr->bg_green = + mainprog_ptr->bg_blue = pBackground->gray? 255 : 0; + else if (bit_depth == 2) + mainprog_ptr->bg_red = mainprog_ptr->bg_green = + mainprog_ptr->bg_blue = (255/3) * pBackground->gray; + else /* bit_depth == 4 */ + mainprog_ptr->bg_red = mainprog_ptr->bg_green = + mainprog_ptr->bg_blue = (255/15) * pBackground->gray; + } else { + mainprog_ptr->bg_red = (uch)pBackground->red; + mainprog_ptr->bg_green = (uch)pBackground->green; + mainprog_ptr->bg_blue = (uch)pBackground->blue; + } } } diff --git a/libpng-manual.txt b/libpng-manual.txt index ffb39b739..16e520952 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.19beta04 - September 26, 2015 + libpng version 1.6.19beta04 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2015 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.19beta04 - September 26, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta04 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5314,7 +5314,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -September 26, 2015 +October 15, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "September 26, 2015" +.TH LIBPNG 3 "October 15, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta04 .SH SYNOPSIS @@ -508,7 +508,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.19beta04 - September 26, 2015 + libpng version 1.6.19beta04 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -519,7 +519,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.19beta04 - September 26, 2015 + libpng versions 0.97, January 1998, through 1.6.19beta04 - October 15, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5822,7 +5822,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -September 26, 2015 +October 15, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6143,7 +6143,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.19beta04 - September 26, 2015: +Libpng version 1.6.19beta04 - October 15, 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). @@ -6166,7 +6166,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.6.19beta04, September 26, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.6.19beta04, October 15, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -6260,7 +6260,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 26, 2015 +October 15, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index d39457b70..a36589dd8 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "September 26, 2015" +.TH LIBPNGPF 3 "October 15, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.19beta04 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "September 26, 2015" +.TH PNG 5 "October 15, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -775,13 +775,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.19beta04 - September 26, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.6.19beta04 - October 15, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.19beta04 - September 26, 2015\ + return "libpng version 1.6.19beta04 - October 15, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.19beta04, September 26, 2015 + * libpng version 1.6.19beta04, October 15, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.19beta04, September 26, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.6.19beta04, October 15, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -251,7 +251,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta04, September 26, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.6.19beta04, October 15, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors: @@ -360,7 +360,7 @@ * Y2K compliance in libpng: * ========================= * - * September 26, 2015 + * October 15, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -430,7 +430,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.19beta04" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.19beta04 - September 26, 2015\n" + " libpng version 1.6.19beta04 - October 15, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 47180662a..c207fea94 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.19beta04 - September 26, 2015 +libpng version 1.6.19beta04 - October 15, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index bb893e041..5ea12319f 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.6.19beta04 - September 26, 2015 + * libpng version 1.6.19beta04 - October 15, 2015 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 93151fc9a..0974c4371 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.6.19beta04 - September 26, 2015 +Makefiles for libpng version 1.6.19beta04 - October 15, 2015 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 620e672bd..2f041b712 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.19beta04 - September 26, 2015 */ +/* Libpng version 1.6.19beta04 - October 15, 2015 */ /* Copyright (c) 1998-2014 Glenn Randers-Pehrson */ |