From 29890b0439104abec9edb6f36d1ec63f0e06b23e Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 26 Jan 2013 12:03:52 -0600 Subject: [PATCH] [libpng16] Imported from libpng-1.6.0rc01.tar --- ANNOUNCE | 17 +++++++++-------- CHANGES | 3 ++- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 11 ++++------- libpng.3 | 24 +++++++++++------------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 23 ++++++++++++----------- pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/def.dfn | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- scripts/symbols.def | 2 +- 25 files changed, 68 insertions(+), 70 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index aebf4d302..c544fa044 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta41 - January 20, 2013 +Libpng 1.6.0rc01 - January 26, 2013 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. @@ -9,19 +9,19 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.0beta41.tar.xz (LZMA-compressed, recommended) - 1.6.0beta41.tar.gz + 1.6.0rc01.tar.xz (LZMA-compressed, recommended) + 1.6.0rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp160b41.7z (LZMA-compressed, recommended) - lp160b41.zip + lp160r01.7z (LZMA-compressed, recommended) + lp160r01.zip Other information: - 1.6.0beta41-README.txt - 1.6.0beta41-LICENSE.txt + 1.6.0rc01-README.txt + 1.6.0rc01-LICENSE.txt Changes since the last public release (1.5.7): @@ -594,7 +594,8 @@ Version 1.6.0beta39 [January 19, 2013] Version 1.6.0beta40 [January 20, 2013] Use consistent handling of overflows in text, sPLT and unknown png_set_* APIs -Version 1.6.0beta41 [January 20, 2013] +Version 1.6.0rc01 [January 26, 2013] + No changes. =========================================================================== NOTICE November 17, 2012: diff --git a/CHANGES b/CHANGES index 93f848867..973e197d5 100644 --- a/CHANGES +++ b/CHANGES @@ -4347,7 +4347,8 @@ Version 1.6.0beta39 [January 19, 2013] Version 1.6.0beta40 [January 20, 2013] Use consistent handling of overflows in text, sPLT and unknown png_set_* APIs -Version 1.6.0beta41 [January 20, 2013] +Version 1.6.0rc01 [January 26, 2013] + No changes. =========================================================================== NOTICE November 17, 2012: diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f4ede3fa..2f7f667b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,7 +260,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.0beta41 +# VERSION 16.${PNGLIB_RELEASE}.1.6.0rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b80b223de..34fba0572 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.0beta41, January 20, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 2013, are Copyright (c) 2004, 2006-2012 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 -January 20, 2013 +January 26, 2013 diff --git a/README b/README index f39273f7c..dec2ad7ad 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.0beta41 - January 20, 2013 (shared library 16.0) +README for libpng version 1.6.0rc01 - January 26, 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/configure.ac b/configure.ac index 9a2c42553..5935685f3 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.0beta41],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.0rc01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -37,7 +37,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.0beta41 +PNGLIB_VERSION=1.6.0rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index 72db16f54..d53a587db 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.0beta41 - January 20, 2013 + libpng version 1.6.0rc01 - January 26, 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.0beta41 - January 20, 2013 + libpng versions 0.97, January 1998, through 1.6.0rc01 - January 26, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -675,9 +675,6 @@ where 0x7fffffffL means unlimited. You can retrieve this limit with chunk_cache_max = png_get_chunk_cache_max(png_ptr); -This limit also applies to the number of buffers that can be allocated -by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks. - You can also set a limit on the amount of memory that a compressed chunk other than IDAT can occupy, with @@ -5128,13 +5125,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -January 20, 2013 +January 26, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.0beta41 are Y2K compliant. It is my belief that earlier +upward through 1.6.0rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index b3e84c221..cd0650427 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "January 20, 2013" +.TH LIBPNG 3 "January 26, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta41 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc01 .SH SYNOPSIS \fB #include \fP @@ -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.0beta41 - January 20, 2013 + libpng version 1.6.0rc01 - January 26, 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.0beta41 - January 20, 2013 + libpng versions 0.97, January 1998, through 1.6.0rc01 - January 26, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -1179,9 +1179,6 @@ where 0x7fffffffL means unlimited. You can retrieve this limit with chunk_cache_max = png_get_chunk_cache_max(png_ptr); -This limit also applies to the number of buffers that can be allocated -by png_decompress_chunk() while decompressing iTXt, zTXt, and iCCP chunks. - You can also set a limit on the amount of memory that a compressed chunk other than IDAT can occupy, with @@ -5633,13 +5630,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -January 20, 2013 +January 26, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.0beta41 are Y2K compliant. It is my belief that earlier +upward through 1.6.0rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -5844,7 +5841,8 @@ the first widely used release: 1.5.7beta01-05 15 10507 15.so.15.7[.0] 1.5.7rc01-03 15 10507 15.so.15.7[.0] 1.5.7 15 10507 15.so.15.7[.0] - 1.6.0beta01-41 16 10600 16.so.16.0[.0] + 1.6.0beta01-40 16 10600 16.so.16.0[.0] + 1.6.0rc01 16 10600 16.so.16.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5901,7 +5899,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.0beta41 - January 20, 2013: +Libpng version 1.6.0rc01 - January 26, 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). @@ -5924,7 +5922,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.0beta41, January 20, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 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 @@ -6023,7 +6021,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 20, 2013 +January 26, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e4faf7822..0b28a0f21 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 20, 2013" +.TH LIBPNGPF 3 "January 26, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0beta41 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 2406f32f5..713d382f1 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 20, 2013" +.TH PNG 5 "January 26, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index c77a674eb..bcb12e3c7 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_0beta41 Your_png_h_is_not_version_1_6_0beta41; +typedef png_libpng_version_1_6_0rc01 Your_png_h_is_not_version_1_6_0rc01; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.0beta41 - January 20, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.0rc01 - January 26, 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.0beta41 - January 20, 2013\ + return "libpng version 1.6.0rc01 - January 26, 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 f3b32bd5b..60b09bcd8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.0beta41 - January 20, 2013 + * libpng version 1.6.0rc01 - January 26, 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.0beta41 - January 20, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.0rc01 - January 26, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -166,7 +166,8 @@ * 1.5.7beta01-05 15 10507 15.so.15.7[.0] * 1.5.7rc01-03 15 10507 15.so.15.7[.0] * 1.5.7 15 10507 15.so.15.7[.0] - * 1.6.0beta01-41 16 10600 16.so.16.0[.0] + * 1.6.0beta01-40 16 10600 16.so.16.0[.0] + * 1.6.0rc01 16 10600 16.so.16.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -198,7 +199,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.0beta41, January 20, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 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: @@ -310,13 +311,13 @@ * Y2K compliance in libpng: * ========================= * - * January 20, 2013 + * January 26, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.0beta41 are Y2K compliant. It is my belief that + * upward through 1.6.0rc01 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -376,9 +377,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.0beta41" +#define PNG_LIBPNG_VER_STRING "1.6.0rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.0beta41 - January 20, 2013\n" + " libpng version 1.6.0rc01 - January 26, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -392,7 +393,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 41 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -409,7 +410,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -522,7 +523,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_0beta41; +typedef char* png_libpng_version_1_6_0rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 62b8a390f..d785078e8 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.0beta41 - January 20, 2013 + * libpng version 1.6.0rc01 - January 26, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 36c765317..be0104587 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1949,4 +1949,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_0beta41 Your_png_h_is_not_version_1_6_0beta41; +typedef png_libpng_version_1_6_0rc01 Your_png_h_is_not_version_1_6_0rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 140fdbc72..07d08f249 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.0beta41 - January 20, 2013 +libpng version 1.6.0rc01 - January 26, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 77cc1eaca..f81368313 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@