diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-05-05 12:38:43 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-05-05 19:37:54 -0500 |
commit | 0794fee913ba30f31b2d9796cd5327127c006a31 (patch) | |
tree | de4b737c5b66ad4718e065fb1ca662a23e70d431 | |
parent | 319a7b842bc1184ad6aee831eb2b542fe9e5a2d0 (diff) | |
download | libpng-0794fee913ba30f31b2d9796cd5327127c006a31.tar.gz |
[libpng16] Imported from libpng-1.6.22beta06.tarv1.6.22beta06
-rw-r--r-- | ANNOUNCE | 4 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | contrib/intel/INSTALL | 9 | ||||
-rw-r--r-- | libpng-manual.txt | 4 | ||||
-rw-r--r-- | libpng.3 | 12 | ||||
-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-- | pngconf.h | 2 | ||||
-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 |
16 files changed, 33 insertions, 32 deletions
@@ -1,4 +1,4 @@ -Libpng 1.6.22beta06 - May 2, 2016 +Libpng 1.6.22beta06 - May 5, 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. @@ -91,7 +91,7 @@ Version 1.6.22beta05 [April 27, 2016] Fixed typo (missing underscore) in #define PNG_READ_16_TO_8_SUPPORTED (Bug report by Y.Ohashik). -Version 1.6.22beta06 [May 2, 2016] +Version 1.6.22beta06 [May 5, 2016] Rebased contrib/intel_sse.patch. Quieted two Coverity issues in contrib/libtests/timepng.c. Fixed issues with scripts/genout.cmake.in (David Capello, Nixon Kwok): @@ -5551,7 +5551,7 @@ Version 1.6.22beta05 [April 27, 2016] Fixed typo (missing underscore) in #define PNG_READ_16_TO_8_SUPPORTED (Bug report by Y.Ohashik). -Version 1.6.22beta06 [May 2, 2016] +Version 1.6.22beta06 [May 5, 2016] Rebased contrib/intel_sse.patch. Quieted two Coverity issues in contrib/libtests/timepng.c. Fixed issues with scripts/genout.cmake.in (David Capello, Nixon Kwok): @@ -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.22beta06, April 27, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22beta06, May 5, 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 -April 27, 2016 +May 5, 2016 @@ -1,4 +1,4 @@ -README for libpng version 1.6.22beta06 - April 27, 2016 (shared library 16.0) +README for libpng version 1.6.22beta06 - May 5, 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/contrib/intel/INSTALL b/contrib/intel/INSTALL index 00aaca945..acfa9daaf 100644 --- a/contrib/intel/INSTALL +++ b/contrib/intel/INSTALL @@ -30,6 +30,7 @@ Finally, configure libpng with -DPNG_INTEL_SSE in CPPFLAGS: ./autogen.sh --maintainer CPPFLAGS="-DPNG_INTEL_SSE" ./configure [options] + make CPPFLAGS="-DPNG_INTEL_SSE" [options] make II. Using a custom makefile: @@ -40,10 +41,10 @@ PNG_INTEL_SSE. III. Using manually updated "configure" scripts: -If you prefer, manually edit configure.ac and Makefile.am, following the -instructions below, then follow the instructions in section II of INSTALL -in the main libpng directory, then configure libpng with -DPNG_INTEL_SSE -in CPPFLAGS. +If you prefer, manually edit pngpriv.h, configure.ac, and Makefile.am, +following the instructions below, then follow the instructions in +section II of INSTALL in the main libpng directory, then configure libpng +with -DPNG_INTEL_SSE in CPPFLAGS. 1. Insert the following lines above the copyright line near the top of configure.ac: diff --git a/libpng-manual.txt b/libpng-manual.txt index 00d171ce0..e55a47030 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.22beta06 - April 27, 2016 + libpng version 1.6.22beta06 - May 5, 2016 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.22beta06 - April 27, 2016 + libpng versions 0.97, January 1998, through 1.6.22beta06 - May 5, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "April 27, 2016" +.TH LIBPNG 3 "May 5, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta06 .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.22beta06 - April 27, 2016 + libpng version 1.6.22beta06 - May 5, 2016 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.22beta06 - April 27, 2016 + libpng versions 0.97, January 1998, through 1.6.22beta06 - May 5, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -6013,7 +6013,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.22beta06 - April 27, 2016: +Libpng version 1.6.22beta06 - May 5, 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 +6038,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.22beta06, April 27, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.22beta06, May 5, 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 +6163,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 27, 2016 +May 5, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c5bbff39f..cfa221262 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "April 27, 2016" +.TH LIBPNGPF 3 "May 5, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta06 (private functions) @@ -1,4 +1,4 @@ -.TH PNG 5 "April 27, 2016" +.TH PNG 5 "May 5, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.22beta06 - April 27, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.22beta06 - May 5, 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.22beta06 - April 27, 2016\ + return "libpng version 1.6.22beta06 - May 5, 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."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.22beta06, April 27, 2016 + * libpng version 1.6.22beta06, May 5, 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.22beta06, April 27, 2016: + * libpng versions 0.97, January 1998, through 1.6.22beta06, May 5, 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.22beta06, April 27, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.22beta06, May 5, 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: * ========================= * - * April 27, 2016 + * May 5, 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.22beta06" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.22beta06 - April 27, 2016\n" + " libpng version 1.6.22beta06 - May 5, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.22beta06, April 27, 2016 + * libpng version 1.6.22beta06, May 5, 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 059c73cdc..709d059fb 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.22beta06 - April 27, 2016 +libpng version 1.6.22beta06 - May 5, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 04b193262..deb39d746 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.22beta06 - April 27, 2016 + * libpng version 1.6.22beta06 - May 5, 2016 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index c48a3ae46..299af7426 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.6.22beta06 - April 27, 2016 +Makefiles for libpng version 1.6.22beta06 - May 5, 2016 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 1f553e409..74a8fff6f 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.22beta06 - April 27, 2016 */ +/* Libpng version 1.6.22beta06 - May 5, 2016 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ |