From 324402044fd38ccd6ea4a486719c62d15f70c033 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 21 Aug 2013 18:01:32 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.4beta01.tar --- ANNOUNCE | 1 + CHANGES | 1 + LICENSE | 4 ++-- README | 2 +- arm/arm_init.c | 2 ++ libpng-manual.txt | 8 +++---- libpng.3 | 16 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 ++++----- pngconf.h | 2 +- pngread.c | 2 +- pngrtran.c | 39 +++++++++++++++++++---------------- pngrutil.c | 3 ++- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 19 files changed, 57 insertions(+), 49 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 71699702c..9d12449ca 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -27,6 +27,7 @@ Other information: Changes since the last public release (1.6.3): Version 1.6.4beta01 [August 21, 2013] + Added information about png_set_options() to the manual. Delay calling png_init_filter_functions() until a row with nonzero filter is found. diff --git a/CHANGES b/CHANGES index c21b2d725..8b0f9f168 100644 --- a/CHANGES +++ b/CHANGES @@ -4619,6 +4619,7 @@ Version 1.6.3 [July 18, 2013] may be erroneously issued by code-checking applications. Version 1.6.4beta01 [August 21, 2013] + Added information about png_set_options() to the manual. Delay calling png_init_filter_functions() until a row with nonzero filter is found. diff --git a/LICENSE b/LICENSE index 158359184..adbe5b7ce 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.4beta01, July 21, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.4beta01, August 21, 2013, are Copyright (c) 2004, 2006-2013 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 -July 21, 2013 +August 21, 2013 diff --git a/README b/README index 8554f3186..f991502cf 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.4beta01 - July 21, 2013 (shared library 16.0) +README for libpng version 1.6.4beta01 - August 21, 2013 (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 15f51625a..17aa010ae 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -17,6 +17,8 @@ #include "../pngpriv.h" #ifdef PNG_READ_SUPPORTED + if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) == + PNG_OPTION_ON) #if PNG_ARM_NEON_OPT > 0 #ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */ #include /* for sig_atomic_t */ diff --git a/libpng-manual.txt b/libpng-manual.txt index 0512515da..c36bd9709 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.4beta01 - August 17, 2013 + libpng version 1.6.4beta01 - August 21, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.4beta01 - August 17, 2013 + libpng versions 0.97, January 1998, through 1.6.4beta01 - August 21, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5059,7 +5059,7 @@ revert to the libpng-1.5.x behavior (ignoring the CMF bytes and using a png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW, PNG_OPTION_ON); -and provides a tool (contrib/tools/png-fix-too-far-back) for optimizing the CMF bytes +and provides a tool (contrib/tools/pngfix) for optimizing the CMF bytes correctly. Libpng-1.6.0 and libpng-1.6.1 wrote uncompressed iTXt chunks with the wrong @@ -5229,7 +5229,7 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -August 17, 2013 +August 21, 2013 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 6fdb567cf..6df823a93 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "August 17, 2013" +.TH LIBPNG 3 "August 21, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.4beta01 .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.4beta01 - August 17, 2013 + libpng version 1.6.4beta01 - August 21, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.4beta01 - August 17, 2013 + libpng versions 0.97, January 1998, through 1.6.4beta01 - August 21, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5564,7 +5564,7 @@ revert to the libpng-1.5.x behavior (ignoring the CMF bytes and using a png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW, PNG_OPTION_ON); -and provides a tool (contrib/tools/png-fix-too-far-back) for optimizing the CMF bytes +and provides a tool (contrib/tools/pngfix) for optimizing the CMF bytes correctly. Libpng-1.6.0 and libpng-1.6.1 wrote uncompressed iTXt chunks with the wrong @@ -5734,7 +5734,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -August 17, 2013 +August 21, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6014,7 +6014,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.4beta01 - August 17, 2013: +Libpng version 1.6.4beta01 - August 21, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6037,7 +6037,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.4beta01, August 17, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.4beta01, August 21, 2013, are Copyright (c) 2004,2006-2007 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 @@ -6136,7 +6136,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 17, 2013 +August 21, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f3891bb9b..b99114a99 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "July 21, 2013" +.TH LIBPNGPF 3 "August 21, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.4beta01 (private functions) diff --git a/png.5 b/png.5 index cbfd0072d..ac5b1047b 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "July 21, 2013" +.TH PNG 5 "August 21, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 55646c250..8de38af92 100644 --- a/png.c +++ b/png.c @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.4beta01 - July 21, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.4beta01 - August 21, 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.6.4beta01 - July 21, 2013\ + return "libpng version 1.6.4beta01 - August 21, 2013\ Copyright (c) 1998-2013 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 71ca8a027..e78c036f2 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.4beta01 - July 21, 2013 + * libpng version 1.6.4beta01 - August 21, 2013 * Copyright (c) 1998-2013 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.4beta01 - July 21, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.4beta01 - August 21, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -210,7 +210,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.4beta01, July 21, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.4beta01, August 21, 2013, are * Copyright (c) 2004, 2006-2013 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: @@ -322,7 +322,7 @@ * Y2K compliance in libpng: * ========================= * - * July 21, 2013 + * August 21, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -390,7 +390,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.4beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.4beta01 - July 21, 2013\n" + " libpng version 1.6.4beta01 - August 21, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 3adf554ef..3fe5010b6 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.4beta01 - July 21, 2013 + * libpng version 1.6.4beta01 - August 21, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index e32f31d54..8f96ca23e 100644 --- a/pngread.c +++ b/pngread.c @@ -3285,7 +3285,7 @@ png_image_read_background(png_voidp argument) case 8: /* 8-bit sRGB gray values with an alpha channel; the alpha channel is - * to be removed by composing on a backgroundi: either the row if + * to be removed by composing on a background: either the row if * display->background is NULL or display->background->green if not. * Unlike the code above ALPHA_OPTIMIZED has *not* been done. */ diff --git a/pngrtran.c b/pngrtran.c index 1816ec34e..812d6b8d7 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1884,31 +1884,34 @@ png_init_read_transformations(png_structrp png_ptr) * the number of significant bits is 0 then no shift is done (this is an * error condition which is silently ignored.) */ - if (shift > 0 && shift < 8) for (i=0; ipalette[i].red; + if (shift > 0 && shift < 8) + for (i=0; ipalette[i].red; - component >>= shift; - png_ptr->palette[i].red = (png_byte)component; - } + component >>= shift; + png_ptr->palette[i].red = (png_byte)component; + } shift = 8 - png_ptr->sig_bit.green; - if (shift > 0 && shift < 8) for (i=0; ipalette[i].green; + if (shift > 0 && shift < 8) + for (i=0; ipalette[i].green; - component >>= shift; - png_ptr->palette[i].green = (png_byte)component; - } + component >>= shift; + png_ptr->palette[i].green = (png_byte)component; + } shift = 8 - png_ptr->sig_bit.blue; - if (shift > 0 && shift < 8) for (i=0; ipalette[i].blue; + if (shift > 0 && shift < 8) + for (i=0; ipalette[i].blue; - component >>= shift; - png_ptr->palette[i].blue = (png_byte)component; - } + component >>= shift; + png_ptr->palette[i].blue = (png_byte)component; + } } #endif /* PNG_READ_SHIFT_SUPPORTED */ } diff --git a/pngrutil.c b/pngrutil.c index 112c28f5f..ff215b2dd 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -3880,7 +3880,8 @@ png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row, static void png_init_filter_functions(png_structrp pp) - /* This function is called once for every PNG image to set the + /* This function is called once for every PNG image (except for PNG images + * that only use PNG_FILTER_VALUE_NONE for all rows) to set the * implementations required to reverse the filtering of PNG rows. Reversing * the filter is the first transformation performed on the row data. It is * performed in place, therefore an implementation can be selected based on diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b28a765ae..b066f8406 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.4beta01 - July 21, 2013 +libpng version 1.6.4beta01 - August 21, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 6cb7245a6..e54a39da1 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@