diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-02-06 10:30:17 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-02-06 10:42:16 -0600 |
| commit | ee6be8733241b2f68dcb614701d70fb085cbd0d5 (patch) | |
| tree | 358be11e3ce4848f3793c4c8082a59106d34b0dc | |
| parent | 849b2c9cbfcb144ac06459cdad06cd0b652fbd7a (diff) | |
| download | libpng-ee6be8733241b2f68dcb614701d70fb085cbd0d5.tar.gz | |
[libpng12] Bump version to 1.2.52beta01
52 files changed, 128 insertions, 140 deletions
@@ -1,65 +1,49 @@ -Libpng 1.2.51 - February 6, 2014 +Libpng 1.2.52beta01 - February 6, 2014 -This is a public release of libpng, intended for use in production codes. +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. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.51.tar.xz (LZMA-compressed, recommended) - libpng-1.2.51.tar.gz - libpng-1.2.51.tar.bz2 + libpng-1.2.52beta01.tar.xz (LZMA-compressed, recommended) + libpng-1.2.52beta01.tar.gz + libpng-1.2.52beta01.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.51-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.51-no-config.tar.gz - libpng-1.2.51-no-config.tar.bz2 + libpng-1.2.52beta01-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.52beta01-no-config.tar.gz + libpng-1.2.52beta01-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1251.zip - lpng1251.7z - lpng1251.tar.bz2 + lp1252b01.zip + lp1252b01.7z + lp1252b01.tar.bz2 Project files - libpng-1.2.51-project-netware.zip - libpng-1.2.51-project-wince.zip + libpng-1.2.52beta01-project-netware.zip + libpng-1.2.52beta01-project-wince.zip Other information: - libpng-1.2.51-README.txt - libpng-1.2.51-KNOWNBUGS.txt - libpng-1.2.51-LICENSE.txt - libpng-1.2.51-Y2K-compliance.txt - libpng-1.2.51-[previous version]-diff.txt - -Changes since the last public release (1.2.50): - -version 1.2.51 [February 6, 2014] - -version 1.0.61 and 1.2.51 [February 6, 2014] - Ignore, with a warning, out-of-range value of num_trans in png_set_tRNS(). - Replaced AM_CONFIG_HEADER(config.h) with AC_CONFIG_HEADERS([config.h]) - in configure.ac - Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h. - Avoid a possible memory leak in contrib/gregbook/readpng.c - Revised libpng.3 so that "doclifter" can process it. - Changed '"%s"m' to '"%s" m' in png_debug macros to improve portability - among compilers. - Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1 - Removed potentially misleading warning from png_check_IHDR(). - Quiet set-but-not-used warnings in pngset.c - Quiet an uninitialized memory warning from VC2013 in png_get_png(). - Quiet unused variable warnings from clang by porting PNG_UNUSED() from - libpng-1.4.6. - Added -DZ_SOLO to CFLAGS in contrib/pngminim/*/makefile - Added an #ifdef PNG_FIXED_POINT_SUPPORTED/#endif in pngset.c + libpng-1.2.52beta01-README.txt + libpng-1.2.52beta01-KNOWNBUGS.txt + libpng-1.2.52beta01-LICENSE.txt + libpng-1.2.52beta01-Y2K-compliance.txt + libpng-1.2.52beta01-[previous version]-diff.txt + libpng-1.2.52beta01-*.asc (armored detached GPG signatures) + +Changes since the last public release (1.2.51): + +version 1.2.52beta01 [February 6, 2014] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2814,6 +2814,8 @@ version 1.2.51rc04 [February 3, 2014] version 1.0.61 and 1.2.51 [February 6, 2014] Added an #ifdef PNG_FIXED_POINT_SUPPORTED/#endif in pngset.c +version 1.2.52beta01 [February 6, 2014] + 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 c7976a037..450d332ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 2) -set(PNGLIB_RELEASE 51) +set(PNGLIB_RELEASE 52) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -215,7 +215,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.51 +# VERSION 0.${PNGLIB_RELEASE}.1.2.52beta01 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.2.51 - February 6, 2014 +Installing libpng version 1.2.52beta01 - February 6, 2014 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.51" or "libpng12" and "zlib-1.2.3" +might be called "libpng-1.2.52beta01" or "libpng12" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.51 +Known bugs in libpng version 1.2.52beta01 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.51, February 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, February 6, 2014, are Copyright (c) 2004, 2006-2014 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 diff --git a/Makefile.am b/Makefile.am index 3d8780f7f..6d8a277f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.51.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.52beta01.txt pnggccrd.c pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 71be1dd06..7d9ce8486 100644 --- a/Makefile.in +++ b/Makefile.in @@ -637,7 +637,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.51.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.52beta01.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym @@ -1,4 +1,4 @@ -README for libpng version 1.2.51 - February 6, 2014 (shared library 12.0) +README for libpng version 1.2.52beta01 - February 6, 2014 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -201,11 +201,11 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF gcc makefile symbol versioning, - creates libpng12.so.0.1.2.51) + creates libpng12.so.0.1.2.52beta01) makefile.linux => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.51) + libpng12.so.0.1.2.52beta01) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.51, previously + libpng12.so.0.1.2.52beta01, previously used assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static @@ -230,12 +230,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.51) + (gcc, creates libpng12.so.0.1.2.52beta01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.51) + (gcc, creates libpng12.so.0.1.2.52beta01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.51) + (gcc, creates libpng12.so.0.1.2.52beta01) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc @@ -7,7 +7,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and - upward through 1.2.51 are Y2K compliant. It is my belief that earlier + upward through 1.2.52beta01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.2.51. +# Generated by GNU Autoconf 2.69 for libpng 1.2.52beta01. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.51' -PACKAGE_STRING='libpng 1.2.51' +PACKAGE_VERSION='1.2.52beta01' +PACKAGE_STRING='libpng 1.2.52beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.2.51 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.52beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1401,7 +1401,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.51:";; + short | recursive ) echo "Configuration of libpng 1.2.52beta01:";; esac cat <<\_ACEOF @@ -1515,7 +1515,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.51 +libpng configure 1.2.52beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1938,7 +1938,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.2.51, which was +It was created by libpng $as_me 1.2.52beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2801,7 +2801,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.51' + VERSION='1.2.52beta01' cat >>confdefs.h <<_ACEOF @@ -2917,10 +2917,10 @@ fi -PNGLIB_VERSION=1.2.51 +PNGLIB_VERSION=1.2.52beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 -PNGLIB_RELEASE=51 +PNGLIB_RELEASE=52 @@ -13123,7 +13123,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.51, which was +This file was extended by libpng $as_me 1.2.52beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13189,7 +13189,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.2.51 +libpng config.status 1.2.52beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 1dc7e6d9a..eab433a68 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.51], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.52beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.51 +PNGLIB_VERSION=1.2.52beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 -PNGLIB_RELEASE=51 +PNGLIB_RELEASE=52 dnl End of version number stuff diff --git a/libpng-1.2.51.txt b/libpng-1.2.52beta01.txt index 98f50706d..6857d4f7f 100644 --- a/libpng-1.2.51.txt +++ b/libpng-1.2.52beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.51 - February 6, 2014 + libpng version 1.2.52beta01 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.51 - February 6, 2014 + libpng versions 0.97, January 1998, through 1.2.52beta01 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -878,7 +878,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.2.51, not all possible expansions are supported. +As of libpng version 1.2.52beta01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3188,7 +3188,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.2.51 are Y2K compliant. It is my belief that earlier +upward through 1.2.52beta01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -1,6 +1,6 @@ .TH LIBPNG 3 "February 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.51 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.52beta01 .SH SYNOPSIS \fB #include <png.h>\fP @@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.51 - February 6, 2014 + libpng version 1.2.52beta01 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -421,7 +421,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.51 - February 6, 2014 + libpng versions 0.97, January 1998, through 1.2.52beta01 - February 6, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -1288,7 +1288,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.2.51, not all possible expansions are supported. +As of libpng version 1.2.52beta01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3598,7 +3598,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.2.51 are Y2K compliant. It is my belief that earlier +upward through 1.2.52beta01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3925,6 +3925,7 @@ the first widely used release: 1.2.51rc01-04 13 10251 12.so.0.51[.0] 1.0.61 10 10061 10.so.0.61[.0] 1.2.51 13 10251 12.so.0.51[.0] + 1.2.52beta01 13 10252 12.so.0.52[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3980,7 +3981,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.51 - February 6, 2014: +Libpng version 1.2.52beta01 - February 6, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4003,7 +4004,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.51, February 6, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, February 6, 2014, are Copyright (c) 2004,2006-2008 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 diff --git a/libpngpf.3 b/libpngpf.3 index 37c5d6460..368ee8f2a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "February 6, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.51 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.52beta01 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -17,7 +17,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_51 Your_png_h_is_not_version_1_2_51; +typedef version_1_2_52beta01 Your_png_h_is_not_version_1_2_52beta01; /* Version information for C files. This had better match the version * string defined in png.h. @@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.51 - February 6, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.2.52beta01 - February 6, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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 ((png_charp) "libpng version 1.2.51 - February 6, 2014\ + return ((png_charp) "libpng version 1.2.52beta01 - February 6, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.51 - February 6, 2014 + * libpng version 1.2.52beta01 - February 6, 2014 * Copyright (c) 1998-2014 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.) @@ -10,7 +10,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.2.51 - February 6, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.2.52beta01 - February 6, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -288,6 +288,7 @@ * 1.2.51rc01-04 13 10251 12.so.0.51[.0] * 1.0.61 10 10061 10.so.0.61[.0] * 1.2.51 13 10251 12.so.0.51[.0] + * 1.2.52beta01 13 10252 12.so.0.52[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -319,7 +320,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.51, February 6, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, February 6, 2014, 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: @@ -437,7 +438,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.51 are Y2K compliant. It is my belief that earlier + * upward through 1.2.52beta01 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -493,9 +494,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.51" +#define PNG_LIBPNG_VER_STRING "1.2.52beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.51 - February 6, 2014\n" + " libpng version 1.2.52beta01 - February 6, 2014\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -503,12 +504,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 2 -#define PNG_LIBPNG_VER_RELEASE 51 +#define PNG_LIBPNG_VER_RELEASE 52 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -525,7 +526,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_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -533,7 +534,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10251 /* 1.2.51 */ +#define PNG_LIBPNG_VER 10252 /* 1.2.52 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1573,7 +1574,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_2_51; +typedef png_structp version_1_2_52beta01; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.51 - February 6, 2014 + * libpng version 1.2.52beta01 - February 6, 2014 * 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.) @@ -1702,4 +1702,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_51 your_png_h_is_not_version_1_2_51; +typedef version_1_2_52beta01 your_png_h_is_not_version_1_2_52beta01; diff --git a/projects/wince.txt b/projects/wince.txt index cab640717..f307c041a 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.51-project-wince.zip from a libpng distribution +libpng-1.2.52beta01-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net/index.html Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.51-project-wince.zip" +"unzip -a libpng-1.2.52beta01-project-wince.zip" diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index ecff0bbf2..3577fa408 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.51; + FRAMEWORK_VERSION = 1.2.52beta01; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -240,7 +240,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.51; + FRAMEWORK_VERSION = 1.2.52beta01; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index 6411db86a..401ec2566 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.2.51 - February 6, 2014 +Makefiles for libpng version 1.2.52beta01 - February 6, 2014 makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.51) + (gcc, creates libpng12.so.0.1.2.52beta01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -20,7 +20,7 @@ Makefiles for libpng version 1.2.51 - February 6, 2014 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.51) + gcc, creates libpng12.so.0.1.2.52beta01) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.gccmmx => Generic gcc makefile previously using MMX code @@ -38,14 +38,14 @@ Makefiles for libpng version 1.2.51 - February 6, 2014 makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.51) + creates libpng12.so.0.1.2.52beta01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.51) + creates libpng12.so.0.1.2.52beta01) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng12.so.0.1.2.51) + creates libpng12.so.0.1.2.52beta01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.51) + creates libpng12.so.0.1.2.52beta01) 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/libpng-config-head.in b/scripts/libpng-config-head.in index 5d19b0c1f..f37cb8d4d 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.51 +version=1.2.52beta01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 7a5eb1cc3..74586d690 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.51 +Version: 1.2.52beta01 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index e25d7c1bc..c21729b19 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 7b96647a2..9faa3f5b4 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 131c2efbd..eccc56cc2 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 1f0a32ff6..30768a13c 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index 775e8e883..153846f97 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc @@ -23,7 +23,7 @@ VERMAJ = 1 VERMIN = 2 -VERMIC = 51 +VERMIC = 52 VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER) diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 15e8e616b..512c99934 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 4baf5be1e..5d98166cb 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 2c9f73750..ca091c8c3 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index a7fe690c2..2c37afe12 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 817bf5210..9fa2a2b06 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index f654a114d..fd37a2ad7 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 58c6044c1..0d76a1061 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 999d6b620..e03e2a9bb 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index ae2a8718b..1dda9ab63 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 3b9190da1..e3363de14 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 7e5377e56..e383490a2 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.51 +SHLIB_MINOR= 1.2.52beta01 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 fc90f8357..3de164540 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.51 +SHLIB_MINOR= 1.2.52beta01 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.nommx b/scripts/makefile.nommx index b29a7ca34..9dae9d03f 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index f055da9e8..02efbc74b 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.51 +SHLIB_MINOR= 1.2.52beta01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 11e8030c4..f03fe9fd5 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index ad82f9dd0..9db08ed6f 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 807025f69..37f9e92e7 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index aa663fd52..234c7e49f 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 59048d0d8..f5301fd3e 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 1f6551c69..10d0383aa 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.51 +PNGMIN = 1.2.52beta01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index a64f4df8e..0cc13cc9f 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.2.51 +;Version 1.2.52beta01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index afe7b6c9e..135839e06 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.51 +; Version 1.2.52beta01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index bc5b7db4d..eb167321c 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.51 +;Version 1.2.52beta01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |