diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-09-26 08:50:34 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2016-09-26 08:58:31 -0500 |
commit | 1757736115239ad923a7a99fef2d82c80a443f32 (patch) | |
tree | d36d911634cf5d773829b0165ea1de59bf55a64a | |
parent | 6f9a39848e3140a6c41984e4acc23643f0f2022c (diff) | |
download | libpng-1757736115239ad923a7a99fef2d82c80a443f32.tar.gz |
[libpng17] Bump version to 1.7.0beta85
-rw-r--r-- | ANNOUNCE | 18 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libpng-manual.txt | 6 | ||||
-rw-r--r-- | libpng.3 | 12 | ||||
-rw-r--r-- | libpngpf.3 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 16 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngtest.c | 4 | ||||
-rw-r--r-- | projects/vstudio/README.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 10 | ||||
-rw-r--r-- | scripts/def.c | 2 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 4 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
24 files changed, 57 insertions, 53 deletions
@@ -1,5 +1,5 @@ -Libpng 1.7.0beta84 - September 26, 2016 +Libpng 1.7.0beta85 - September 26, 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.7.0beta84.tar.xz (LZMA-compressed, recommended) - 1.7.0beta84.tar.gz + 1.7.0beta85.tar.xz (LZMA-compressed, recommended) + 1.7.0beta85.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - /scratch/glennrp/Libpng17/lp170b84.7z (LZMA-compressed, recommended) - /scratch/glennrp/Libpng17/lp170b84.zip + /scratch/glennrp/Libpng17/lp170b85.7z (LZMA-compressed, recommended) + /scratch/glennrp/Libpng17/lp170b85.zip Other information: - 1.7.0beta84-README.txt - 1.7.0beta84-LICENSE.txt - libpng-1.7.0beta84-*.asc (armored detached GPG signatures) + 1.7.0beta85-README.txt + 1.7.0beta85-LICENSE.txt + libpng-1.7.0beta85-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.0): @@ -1408,6 +1408,8 @@ Version 1.7.0beta84 [September 26, 2016] Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error(). Add tests/badcrc.png and tests/badadler.png to tests/pngtest. +Version 1.7.0beta85 [September 26, 2016] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -5708,6 +5708,8 @@ Version 1.7.0beta84 [September 26, 2016] Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error(). Add tests/badcrc.png and tests/badadler.png to tests/pngtest. +Version 1.7.0beta85 [September 26, 2016] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CMakeLists.txt b/CMakeLists.txt index dcdfe307f..3ebd516d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -697,7 +697,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta84 +# VERSION 17.${PNGLIB_RELEASE}.1.7.0beta85 VERSION 17.${PNGLIB_RELEASE}.0 SOVERSION 17 CLEAN_DIRECT_OUTPUT 1) @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, September 26, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta85, September 26, 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 @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta84 - September 26, 2016 (shared library 17.0) +README for libpng version 1.7.0beta85 - September 26, 2016 (shared library 17.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 5d24cc242..3bcc54d8c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.7.0beta84],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.7.0beta85],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -40,7 +40,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.7.0beta84 +PNGLIB_VERSION=1.7.0beta85 PNGLIB_MAJOR=1 PNGLIB_MINOR=7 PNGLIB_RELEASE=0 diff --git a/libpng-manual.txt b/libpng-manual.txt index ff504e6a4..6d914d304 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.7.0beta84 - September 26, 2016 + libpng version 1.7.0beta85 - September 26, 2016 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.7.0beta84 - September 26, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta85 - September 26, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5356,7 +5356,7 @@ 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.7.0beta84 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta85 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 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "September 26, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta84 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta85 .SH SYNOPSIS \fB #include <png.h>\fP @@ -500,7 +500,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.7.0beta84 - September 26, 2016 + libpng version 1.7.0beta85 - September 26, 2016 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -511,7 +511,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta84 - September 26, 2016 + libpng versions 0.97, January 1998, through 1.7.0beta85 - September 26, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2015 Glenn Randers-Pehrson @@ -5856,7 +5856,7 @@ 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.7.0beta84 are Y2K compliant. It is my belief that earlier +upward through 1.7.0beta85 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 @@ -6016,7 +6016,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta84 - September 26, 2016: +Libpng version 1.7.0beta85 - September 26, 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). @@ -6041,7 +6041,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, September 26, 2016, are +libpng versions 1.0.7, July 1, 2000, through 1.7.0beta85, September 26, 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 diff --git a/libpngpf.3 b/libpngpf.3 index d6c38f83f..595daa375 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "September 26, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta84 +libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta85 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -15,7 +15,7 @@ #define PNG_SRC_FILE PNG_SRC_FILE_png /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta84 Your_png_h_is_not_version_1_7_0beta84; +typedef png_libpng_version_1_7_0beta85 Your_png_h_is_not_version_1_7_0beta85; /* 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 @@ -704,14 +704,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta84 - September 26, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta85 - September 26, 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.7.0beta84 - September 26, 2016\ + return "libpng version 1.7.0beta85 - September 26, 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.7.0beta84, September 26, 2016 + * libpng version 1.7.0beta85, September 26, 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.7.0beta84, September 26, 2016: + * libpng versions 0.97, January 1998, through 1.7.0beta85, September 26, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -25,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta84, September 26, 2016, are + * libpng versions 1.0.7, July 1, 2000, through 1.7.0beta85, September 26, 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 @@ -223,7 +223,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.7.0beta84 are Y2K compliant. It is my belief that + * upward through 1.7.0beta85 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 @@ -285,8 +285,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.7.0beta84" -#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta84 - September 26, 2016\n" +#define PNG_LIBPNG_VER_STRING "1.7.0beta85" +#define PNG_HEADER_VERSION_STRING " libpng version 1.7.0beta85 - September 26, 2016\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 @@ -300,7 +300,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 84 +#define PNG_LIBPNG_VER_BUILD 85 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -560,7 +560,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_7_0beta84; +typedef char* png_libpng_version_1_7_0beta85; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta84, September 26, 2016 + * libpng version 1.7.0beta85, September 26, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] + * Last changed in libpng 1.6.26 [(PENDING RELEASE)] * Copyright (c) 1998-2002,2004,2006-2016 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.) @@ -2083,4 +2083,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_7_0beta84 Your_png_h_is_not_version_1_7_0beta84; +typedef png_libpng_version_1_7_0beta85 Your_png_h_is_not_version_1_7_0beta85; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index ac90424c4..a29981659 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta84 - September 26, 2016 +libpng version 1.7.0beta85 - September 26, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index eb9dd285e..adf9c11a2 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.7.0beta84 - September 26, 2016 + * libpng version 1.7.0beta85 - September 26, 2016 * * Copyright (c) 2011,2013,2014 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 73941641a..05b3a09c9 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.7.0beta84 - September 26, 2016 +Makefiles for libpng version 1.7.0beta85 - September 26, 2016 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng17.so.17.1.7.0beta84) + (gcc, creates libpng17.so.17.1.7.0beta85) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -33,12 +33,12 @@ pnglibconf.h.prebuilt => Stores configuration settings makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng17.so.17.1.7.0beta84) + creates libpng17.so.17.1.7.0beta85) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng17.so.17.1.7.0beta84) + creates libpng17.so.17.1.7.0beta85) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng17.so.17.1.7.0beta84) + creates libpng17.so.17.1.7.0beta85) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile diff --git a/scripts/def.c b/scripts/def.c index 8b2605a26..2dca03e84 100644 --- a/scripts/def.c +++ b/scripts/def.c @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library"" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "" PNG_DFN "EXPORTS" -PNG_DFN ";Version 1.7.0beta84" +PNG_DFN ";Version 1.7.0beta85" #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index f391e644a..066c853a0 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.7.0beta84 +version=1.7.0beta85 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 012b946ff..179535fb4 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng17 Name: libpng Description: Loads and saves PNG files -Version: 1.7.0beta84 +Version: 1.7.0beta85 Libs: -L${libdir} -lpng17 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index c716ffd92..14b8a25da 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng17 LIB= png17 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.7.0beta84 +SHLIB_MINOR= 1.7.0beta85 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 4fbd04b53..39de2b872 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 17 -SHLIB_MINOR= 1.7.0beta84 +SHLIB_MINOR= 1.7.0beta85 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 3af6aa6ba..db1fd4ebd 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 17 -SHLIB_MINOR= 1.7.0beta84 +SHLIB_MINOR= 1.7.0beta85 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 811507d89..ca5faee9f 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,8 +1,8 @@ -/* libpng 1.7.0beta84 STANDARD API DEFINITION */ +/* libpng 1.7.0beta85 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.7.0beta84, September 26, 2016 */ +/* libpng version 1.7.0beta85, September 26, 2016 */ /* Copyright (c) 1998-2016 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index c28a5c7b2..dede9d390 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.7.0beta84 +;Version 1.7.0beta85 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |