diff --git a/ANNOUNCE b/ANNOUNCE index 705f67dfbcb782a55fcc246349c00c3af543fc90..5b731bde57fff4ac1d9695b7a38ef525b19addfa 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.0rc02 - November 18, 2009 +Libpng 1.4.0beta102 - November 18, 2009 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.4.0rc02.tar.xz (LZMA-compressed, recommended) - 1.4.0rc02.tar.gz - 1.4.0rc02.tar.bz2 + 1.4.0beta102.tar.xz (LZMA-compressed, recommended) + 1.4.0beta102.tar.gz + 1.4.0beta102.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp140r02.zip - lp140r02.7z + lp140b102.zip + lp140b102.7z Other information: - 1.4.0rc02-README.txt - 1.4.0rc02-LICENSE.txt + 1.4.0beta102-README.txt + 1.4.0beta102-LICENSE.txt Changes since the last public release (1.2.10): @@ -692,8 +692,6 @@ version 1.4.0beta102 [November 18, 2009] scripts/README.txt Updated the copyright year in scripts/pngwin.rc from 2006 to 2009. -version 1.4.0rc02 [November 18, 2009] - 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/CHANGES b/CHANGES index 2693200879ce384fe88fedb34c1872f4e008a9e8..bd162ec8aeb0131aaacb296eb93d70910fadd2b5 100644 --- a/CHANGES +++ b/CHANGES @@ -2379,8 +2379,6 @@ version 1.4.0beta102 [November 18, 2009] scripts/README.txt Updated the copyright year in scripts/pngwin.rc from 2006 to 2009. -version 1.4.0rc02 [November 18, 2009] - 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 9155bd3dfa36095e0f222e992ed49c0030a42d4a..f9a3bb5bb179bc55ddded856fe5dfb3ac2d2e00a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,7 +203,7 @@ configure_file(${PNG_SOURCE_DIR}/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.0rc02 +# VERSION 14.${PNGLIB_RELEASE}.1.4.0beta102 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index eea66c32d7b3c3ca8177787a6c4a98431c80558f..8760c5e29b4c7b12323decf03aba6e3094457607 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.0rc02 - November 18, 2009 +Installing libpng version 1.4.0beta102 - November 18, 2009 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.4.0rc02" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.0beta102" or "libpng14" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/LICENSE b/LICENSE index 7c194b5ff1fbd11bfea1ba2216bd7a82304a43ac..db154ea237f407e6ff618f75813cf7ff4f068d70 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.4.0rc02, November 18, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta102, November 18, 2009, 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 diff --git a/Makefile.am b/Makefile.am index 79e95ed6607ba79113dc73de45f35d51f70c20a9..7d89c32a150927d265e0bc9459dad212d7e187ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -80,7 +80,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0rc02.txt + example.c libpng-1.4.0beta102.txt CLEANFILES= pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index e205bc4068e523be4925d5527716bb1f28790c66..eb4d1304a22d40c3bb8291c46dc2461296502cf4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -329,7 +329,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.0rc02.txt + example.c libpng-1.4.0beta102.txt CLEANFILES = pngout.png libpng14.pc libpng14-config libpng.vers \ libpng.sym diff --git a/README b/README index 3ae8640260e26b2a7cb694f45b42a7723e0550d0..970f46553d69ec079b0e00cc48add4266579e0e7 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.0rc02 - November 18, 2009 (shared library 14.0) +README for libpng version 1.4.0beta102 - November 18, 2009 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -184,11 +184,11 @@ Files in this distribution: descrip.mms => VMS makefile for MMS or MMK makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.14.1.4.0rc02) + gcc, creates libpng14.so.14.1.4.0beta102) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc02) + (gcc, creates libpng14.so.14.1.4.0beta102) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc02, + (gcc, creates libpng14.so.14.1.4.0beta102, uses assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -209,12 +209,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.0rc02) + (gcc, creates libpng14.so.14.1.4.0beta102) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.0rc02) + (gcc, creates libpng14.so.14.1.4.0beta102) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.0rc02) + (gcc, creates libpng14.so.14.1.4.0beta102) 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 diff --git a/configure b/configure index 4d55947660447b573f63ae94a7566c679bba51e1..b3a34a20a7c70d03e80a837a0da3efa568753767 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for libpng 1.4.0rc02. +# Generated by GNU Autoconf 2.64 for libpng 1.4.0beta102. # # Report bugs to . # @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.0rc02' -PACKAGE_STRING='libpng 1.4.0rc02' +PACKAGE_VERSION='1.4.0beta102' +PACKAGE_STRING='libpng 1.4.0beta102' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1431,7 +1431,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.4.0rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.0beta102 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.0rc02:";; + short | recursive ) echo "Configuration of libpng 1.4.0beta102:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.0rc02 +libpng configure 1.4.0beta102 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2033,7 +2033,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.4.0rc02, which was +It was created by libpng $as_me 1.4.0beta102, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2841,7 +2841,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.0rc02' + VERSION='1.4.0beta102' cat >>confdefs.h <<_ACEOF @@ -2905,7 +2905,7 @@ fi -PNGLIB_VERSION=1.4.0rc02 +PNGLIB_VERSION=1.4.0beta102 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 @@ -12022,7 +12022,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.4.0rc02, which was +This file was extended by libpng $as_me 1.4.0beta102, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12086,7 +12086,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libpng config.status 1.4.0rc02 +libpng config.status 1.4.0beta102 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index acb0c503851be5a66fc6ad4da195df68db51bc4f..cd9677be097f5203581925cd6144ed72d85010b7 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.4.0rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.0beta102], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.4.0rc02 +PNGLIB_VERSION=1.4.0beta102 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=0 diff --git a/libpng-1.4.0rc02.txt b/libpng-1.4.0beta102.txt similarity index 99% rename from libpng-1.4.0rc02.txt rename to libpng-1.4.0beta102.txt index 2cdeac222a157f3bd42d52b77b014b41d0b31717..e07ca71bab6e57f102736c00da87bfb2a74c1315 100644 --- a/libpng-1.4.0rc02.txt +++ b/libpng-1.4.0beta102.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.0rc02 - November 18, 2009 + libpng version 1.4.0beta102 - November 18, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 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.4.0rc02 - November 18, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta102 - November 18, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 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.4.0rc02, not all possible expansions are supported. +As of libpng version 1.4.0beta102, 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 @@ -3231,7 +3231,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.4.0rc02 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta102 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 diff --git a/libpng.3 b/libpng.3 index ea9540b9bed49cce3686614e09d2ff9d3f224018..dee6a7ca72090c62d198860928b0d1e5a887a76d 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "November 18, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta102 .SH SYNOPSIS \fI\fB @@ -777,7 +777,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.4.0rc02 - November 18, 2009 + libpng version 1.4.0beta102 - November 18, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -788,7 +788,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.0rc02 - November 18, 2009 + libpng versions 0.97, January 1998, through 1.4.0beta102 - November 18, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1655,7 +1655,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.4.0rc02, not all possible expansions are supported. +As of libpng version 1.4.0beta102, 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 @@ -4008,7 +4008,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.4.0rc02 are Y2K compliant. It is my belief that earlier +upward through 1.4.0beta102 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 @@ -4179,7 +4179,6 @@ the first widely used release: 1.4.0beta37-87 14 10400 14.so.14.0[.0] 1.4.0rc01 14 10400 14.so.14.0[.0] 1.4.0beta88-102 14 10400 14.so.14.0[.0] - 1.4.0rc02 14 10400 14.so.14.0[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4235,7 +4234,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.0rc02 - November 18, 2009: +Libpng version 1.4.0beta102 - November 18, 2009: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4258,7 +4257,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.0rc02, November 18, 2009, are +libpng versions 1.2.6, August 15, 2004, through 1.4.0beta102, November 18, 2009, 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 diff --git a/libpngpf.3 b/libpngpf.3 index 7e394904a071c66d40be0031587084944b5d2445..4c51ed703222e5974c039191736529f9116bf61f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "November 18, 2009" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta102 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index 075c2fdfb58a90661a337d7b8a2ae8be869379b7..f72a6cac60bac1593b4b1e13e525465b1508a229 100644 --- a/png.c +++ b/png.c @@ -16,7 +16,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0rc02 Your_png_h_is_not_version_1_4_0rc02; +typedef version_1_4_0beta102 Your_png_h_is_not_version_1_4_0beta102; /* Version information for C files. This had better match the version * string defined in png.h. @@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.0rc02 - November 18, 2009" PNG_STRING_NEWLINE \ + "libpng version 1.4.0beta102 - November 18, 2009" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2009 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.4.0rc02 - November 18, 2009\ + return ((png_charp) "libpng version 1.4.0beta102 - November 18, 2009\ Copyright (c) 1998-2009 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 3cbcb2244581a12589db0ffd61221e6cba4d5ed0..7dbfbd411cf3fee3d27360317896ac8a3ef86aa8 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.0rc02 - November 18, 2009 + * libpng version 1.4.0beta102 - November 18, 2009 * Copyright (c) 1998-2009 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.4.0rc02 - November 18, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.4.0beta102 - November 18, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -132,7 +132,6 @@ * 1.4.0beta37-87 14 10400 14.so.14.0[.0] * 1.4.0rc01 14 10400 14.so.14.0[.0] * 1.4.0beta88-102 14 10400 14.so.14.0[.0] - * 1.4.0rc02 14 10400 14.so.14.0[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -164,7 +163,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.0rc02, November 18, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta102, November 18, 2009, 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: @@ -282,7 +281,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.0rc02 are Y2K compliant. It is my belief that earlier + * upward through 1.4.0beta102 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 @@ -338,9 +337,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.0rc02" +#define PNG_LIBPNG_VER_STRING "1.4.0beta102" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.0rc02 - November 18, 2009\n" + " libpng version 1.4.0beta102 - November 18, 2009\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -353,7 +352,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 102 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1334,7 +1333,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_4_0rc02; +typedef png_structp version_1_4_0beta102; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index b9f503b5f206a627cf2eeb1bb1fecc2cf37c821d..8d088f1d0c85cd5e1c0ca11ab178c6a2bd80b664 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.0rc02 - November 18, 2009 + * libpng version 1.4.0beta102 - November 18, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index a0b8c37c94cd54d49224ee31340c7a4634eaa54d..7ddf079bc591a77c4421468f1e4b5dbdf334c5a2 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.0rc02 - November 18, 2009 + * libpng version 1.4.0beta102 - November 18, 2009 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 52751912e422e2ddf0e3d5c401c913d80ed01d33..160c24735f308cdb16b89bfc7f8516cbe0498d47 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1619,4 +1619,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_0rc02 your_png_h_is_not_version_1_4_0rc02; +typedef version_1_4_0beta102 your_png_h_is_not_version_1_4_0beta102; diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index fa10dd71d49d93aad66f36588f2a8391b75adac2..aa688f87c6c16a0b657eb9b1910246e96f12a893 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -226,7 +226,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 14; DYLIB_CURRENT_VERSION = 14; - FRAMEWORK_VERSION = 1.4.0rc02; + FRAMEWORK_VERSION = 1.4.0beta102; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -244,7 +244,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 14; DYLIB_CURRENT_VERSION = 14; - FRAMEWORK_VERSION = 1.4.0rc02; + FRAMEWORK_VERSION = 1.4.0beta102; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index 862337e2e1ce8cc4abbbad23d463e84f397adb06..f6736a0dee0ec821e7a69a7f25dac3f6c9fab809 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.0rc02 - November 18, 2009 +Makefiles for libpng version 1.4.0beta102 - November 18, 2009 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.0rc02) + (gcc, creates libpng14.so.14.1.4.0beta102) 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.4.0rc02 - November 18, 2009 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng14.so.14.1.4.0rc02) + gcc, creates libpng14.so.14.1.4.0beta102) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.0rc02 - November 18, 2009 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 libpng14.so.14.1.4.0rc02) + creates libpng14.so.14.1.4.0beta102) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.0rc02) + creates libpng14.so.14.1.4.0beta102) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.0rc02) + creates libpng14.so.14.1.4.0beta102) 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 60bebafc8f65ce73668526a958ac6f89bb41ec45..78fc10557ca902809538c0928286fe5ae9f04676 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.0rc02 +version=1.4.0beta102 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index ea23ac84b114bd6039d86ba0ba4f078284d50a1f..60f1d23c8baac5d437409f369fac73cc33eddb59 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.0rc02 +Version: 1.4.0beta102 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index d69d87c926879a961ffba07b1eeb2ac65f9cf0f8..1968138a1806636b0be103a1cb9b5597253a8239 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 62651739eddea011cd5c4ede1b94a6a8104c4f0c..515611d87ede8b6073cb087f90331377a1acb23d 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index ed66529acafab86df877eb7914557e38fb3cfe0d..16b983a8115f1dd323446b5228c2c40aa14062b3 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index d9ba80c1931b7e34a8576ab8080bf9ded29b0358..976db9a4026b09cea7500dfe2c6eceab3b74ec67 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 5112b8ebf022336b703448a1ae6b16cc090e60ac..4ad940cbbf43733d559839cdde9c9028ac7d27f1 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -68,7 +68,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng14 PNGMAJ = 14 CYGDLL = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index c3738fc8220db51dc3a9fec6e3710711f53c632d..aa6836e84fda7a212330ebcbaafc9d1deb90c939 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 9250e90bf4846c42edc4a26f5fac82fbebe8183c..f77fca8f303853a7c3762f94ed208bdca2830dd8 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 80315a183d10ecc79a0c6d5d7b63acbe7ee2149e..5d481d4640520a00ce5aefaa9f0da7a3880797a7 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 045f2f41ff771337d38ff717ff3b33cd08051a07..94c1a3b029e93695412d3182d78102af4f1e0176 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 3eb19009a98f82652f1b0185b05726542dd24d39..f6ccc4cdef130deaf5ba47defec480cd82570aad 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 9ca5f094fd8125f8a2f0efaf7e46df814c3c862d..046d397b537f9a38a916fd4565cd817997b44854 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index a8b8f87fa5c53af67770d221e534985117b8e66a..3272cf0533245c04d8dfc6431a3a6aa35b4da08b 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index ae103ef6152adf565ac712289b5f9b0e7d8b34da..4f43faccf0e3f9e87905aa8174fca20f602d1384 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -68,7 +68,7 @@ CFLAGS= -DPNG_CONFIGURE_LIBPNG $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC LIBNAME = libpng14 PNGMAJ = 14 MINGDLL = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 42c5d05226c2a4ebca50fe0e7b5310072d50de71..e25b980fe92044ff3fa0c388655a56c0f2170e95 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.0rc02 +SHLIB_MINOR= 1.4.0beta102 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 c6f8ef8cace966c71c4661189256d6bbfd2a6e45..206e482a4ecadc15f9f226f97c3be9f6a08f7e0e 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.0rc02 +SHLIB_MINOR= 1.4.0beta102 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 4db31346a4c405be3af7f559f5f6ac7eb78ac13f..be60cec7d143b5b78c35dd1e374d0eb060acf698 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.4.0rc02 +SHLIB_MINOR= 1.4.0beta102 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index b3efd876ee15db9311ad0e29c28c2699ecb6eb81..a36f97bb6f6b4cbd334d5184b6364b3556d9a79f 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index f9a8a4e8c44500d9431e10f397cc315d54f15ec4..f43a6f539c775913b883c45d96bd19fa96d4b4eb 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 24497a1d55f39123d36db0ba13d0639bd0b99a0f..5ebf373657e810a7e9965d601e8ba66f4315026c 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 8a65eb122bf89190784528c433b247077a9d95e3..8af1031c85624db1659be0c7bd77c011a1fb432e 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng14 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 4f6be66810d4f9a3fd828e89b8dd6b8b98d97a60..c649d6684e3e545d243c57d0ca457f77bff527bd 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 708ad2c681c4eaf7c52521853714f478b366b441..ed5787a74c8949c974a7c07aa29081bdbc64c461 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng14 PNGMAJ = 14 -PNGMIN = 1.4.0rc02 +PNGMIN = 1.4.0beta102 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 703e1f287fd5cb07314249975bc347485c152207..abb506c712653e4546de418010479b7ebc77a5d6 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.0rc02 +;Version 1.4.0beta102 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 0458ea10ae1fdcff3bf53b0d667b31aeed235a57..2bde117613b21dd5a2f990fe10e283fcd13d8b03 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.0rc02 +; Version 1.4.0beta102 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 9c0055fda6298d81ff5fc519529a01f217333378..49e5361fcaf8e4c28c5fc446d4511ee42a8708f1 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.0rc02 +;Version 1.4.0beta102 png_build_grayscale_palette png_chunk_error png_chunk_warning