From 66f796e74c1082ab433f94d1b7ceff6553fc0c36 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 4 Jul 2016 08:31:04 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.24beta03.tar --- ANNOUNCE | 4 ++-- CHANGES | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 2 +- contrib/libtests/pngstest.c | 2 +- contrib/libtests/pngvalid.c | 2 +- libpng-manual.txt | 11 ++++++++--- libpng.3 | 19 ++++++++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/README.txt | 4 +++- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 18 files changed, 45 insertions(+), 33 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 30e6ef33b..bacb373f9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.24beta03 - July 3, 2016 +Libpng 1.6.24beta03 - July 4, 2016 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. @@ -67,7 +67,7 @@ Version 1.6.24beta02 [June 23, 2016] structure padding is fixable, but it would be a signficant change (moving structure members around). -Version 1.6.24beta03 [July 3, 2016] +Version 1.6.24beta03 [July 4, 2016] Optimized absolute value calculation in filter selection, similar to code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to use this. diff --git a/CHANGES b/CHANGES index a2ca189ad..63dd06b54 100644 --- a/CHANGES +++ b/CHANGES @@ -5638,7 +5638,7 @@ Version 1.6.24beta02 [June 23, 2016] structure padding is fixable, but it would be a signficant change (moving structure members around). -Version 1.6.24beta03 [July 3, 2016] +Version 1.6.24beta03 [July 4, 2016] Optimized absolute value calculation in filter selection, similar to code in the PAETH decoder in pngrutil.c. Build with PNG_USE_ABS to use this. diff --git a/LICENSE b/LICENSE index 107c3f27d..cdd26fa1d 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.6.24beta03, June 23, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 4, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 23, 2016 +July 4, 2016 diff --git a/README b/README index f374b519a..a937d819c 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.24beta03 - June 23, 2016 (shared library 16.0) +README for libpng version 1.6.24beta03 - July 4, 2016 (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/configure.ac b/configure.ac index 4f14546ab..18d262f21 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac # Copyright (c) 2004-2015 Glenn Randers-Pehrson -# Last changed in libpng 1.6.22 [(PENDING RELEASE)] +# Last changed in libpng 1.6.22 [May 26, 2016] # 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 250f05513..d4c9c17d7 100644 --- a/contrib/libtests/pngstest.c +++ b/contrib/libtests/pngstest.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013-2016 John Cunningham Bowler * - * Last changed in libpng 1.6.22 [May 26, 2016] + * Last changed in libpng 1.6.24 [(PENDING RELEASE)] * * 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 14be8ad98..13b0b8df2 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.6.23 [June 9, 2016] + * Last changed in libpng 1.6.24 [(PENDING RELEASE)] * Copyright (c) 2014-2016 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/libpng-manual.txt b/libpng-manual.txt index 00cea6db4..000e75d4e 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.24beta03 - June 23, 2016 + libpng version 1.6.24beta03 - July 4, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.24beta03 - June 23, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta03 - July 4, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -2230,7 +2230,8 @@ is exactly the same. If you are planning on displaying the image after each pass, the "rectangle" effect is generally considered the better looking one. -If you only want the "sparkle" effect, just call png_read_rows() as +If you only want the "sparkle" effect, just call png_read_row() or +png_read_rows() as normal, with the third parameter NULL. Make sure you make pass over the image number_of_passes times, and you don't change the data in the rows between calls. You can change the locations of the data, just @@ -2239,6 +2240,8 @@ pass, and assumes the data from previous passes is still valid. png_read_rows(png_ptr, row_pointers, NULL, number_of_rows); + or + png_read_row(png_ptr, row_pointers, NULL); If you only want the first effect (the rectangles), do the same as before except pass the row buffer in the third parameter, and leave @@ -2246,6 +2249,8 @@ the second parameter NULL. png_read_rows(png_ptr, NULL, row_pointers, number_of_rows); + or + png_read_row(png_ptr, NULL, row_pointers); If you don't want libpng to handle the interlacing details, just call png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images. diff --git a/libpng.3 b/libpng.3 index 30113a5aa..77c4da7b1 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "June 23, 2016" +.TH LIBPNG 3 "July 4, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta03 .SH SYNOPSIS @@ -510,7 +510,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.24beta03 - June 23, 2016 + libpng version 1.6.24beta03 - July 4, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.24beta03 - June 23, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta03 - July 4, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -2740,7 +2740,8 @@ is exactly the same. If you are planning on displaying the image after each pass, the "rectangle" effect is generally considered the better looking one. -If you only want the "sparkle" effect, just call png_read_rows() as +If you only want the "sparkle" effect, just call png_read_row() or +png_read_rows() as normal, with the third parameter NULL. Make sure you make pass over the image number_of_passes times, and you don't change the data in the rows between calls. You can change the locations of the data, just @@ -2749,6 +2750,8 @@ pass, and assumes the data from previous passes is still valid. png_read_rows(png_ptr, row_pointers, NULL, number_of_rows); + or + png_read_row(png_ptr, row_pointers, NULL); If you only want the first effect (the rectangles), do the same as before except pass the row buffer in the third parameter, and leave @@ -2756,6 +2759,8 @@ the second parameter NULL. png_read_rows(png_ptr, NULL, row_pointers, number_of_rows); + or + png_read_row(png_ptr, NULL, row_pointers); If you don't want libpng to handle the interlacing details, just call png_read_rows() PNG_INTERLACE_ADAM7_PASSES times to read in all the images. @@ -6013,7 +6018,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.24beta03 - June 23, 2016: +Libpng version 1.6.24beta03 - July 4, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6038,7 +6043,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, June 23, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 4, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -6163,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 23, 2016 +July 4, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f0eca15e0..2b0a3ad9e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "June 23, 2016" +.TH LIBPNGPF 3 "July 4, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta03 (private functions) diff --git a/png.5 b/png.5 index 4ba51a196..912d8e7df 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 23, 2016" +.TH PNG 5 "July 4, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 4d09380c5..dfaf13dcb 100644 --- a/png.c +++ b/png.c @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.24beta03 - July 3, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.24beta03 - July 4, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.24beta03 - July 3, 2016\ + return "libpng version 1.6.24beta03 - July 4, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 3309102ef..b7c6cb93d 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.24beta03, July 1, 2016 + * libpng version 1.6.24beta03, July 4, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 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.24beta03, July 1, 2016: + * libpng versions 0.97, January 1998, through 1.6.24beta03, July 4, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 1, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta03, July 4, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -245,7 +245,7 @@ * Y2K compliance in libpng: * ========================= * - * July 1, 2016 + * July 4, 2016 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -315,7 +315,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.24beta03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.24beta03 - July 1, 2016\n" + " libpng version 1.6.24beta03 - July 4, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 1c470f06d..6e58dc3ea 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.24beta03, June 23, 2016 + * libpng version 1.6.24beta03, July 4, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 5f08db78e..c7312d788 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.24beta03 - June 23, 2016 +libpng version 1.6.24beta03 - July 4, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson @@ -93,3 +93,5 @@ as follows: DLL /MD /MDd Static Library /MD /MDd +Also, be sure to build libpng, zlib, and your project all for the same +platform (e.g., 32-bit or 64-bit). diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b0ca6fa9d..74d1689f8 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@