diff options
56 files changed, 136 insertions, 218 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.48beta02 - February 29, 2012 +Libpng 1.2.48rc02 - March 2, 2012 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,36 +9,36 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.48beta02.tar.xz (LZMA-compressed, recommended) - libpng-1.2.48beta02.tar.gz - libpng-1.2.48beta02.tar.bz2 + libpng-1.2.48rc02.tar.xz (LZMA-compressed, recommended) + libpng-1.2.48rc02.tar.gz + libpng-1.2.48rc02.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.48beta02-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.48beta02-no-config.tar.gz - libpng-1.2.48beta02-no-config.tar.bz2 + libpng-1.2.48rc02-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.48rc02-no-config.tar.gz + libpng-1.2.48rc02-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1248b02.zip - lp1248b02.7z - lp1248b02.tar.bz2 + lp1248r02.zip + lp1248r02.7z + lp1248r02.tar.bz2 Project files - libpng-1.2.48beta02-project-netware.zip - libpng-1.2.48beta02-project-wince.zip + libpng-1.2.48rc02-project-netware.zip + libpng-1.2.48rc02-project-wince.zip Other information: - libpng-1.2.48beta02-README.txt - libpng-1.2.48beta02-KNOWNBUGS.txt - libpng-1.2.48beta02-LICENSE.txt - libpng-1.2.48beta02-Y2K-compliance.txt - libpng-1.2.48beta02-[previous version]-diff.txt + libpng-1.2.48rc02-README.txt + libpng-1.2.48rc02-KNOWNBUGS.txt + libpng-1.2.48rc02-LICENSE.txt + libpng-1.2.48rc02-Y2K-compliance.txt + libpng-1.2.48rc02-[previous version]-diff.txt Changes since the last public release (1.2.46): @@ -55,7 +55,7 @@ version 1.2.48beta01 [Febuary 27, 2012] causing out-of-bounds read in png_set_sCAL() because of failure to copy the string terminators (Franke Busse). -version 1.2.48beta02 [February 29, 2012] +version 1.2.48rc01 [March 2, 2012] Removed the png_free() of unused png_ptr->current_text from pngread.c. Added libpng license text to pnggccrd.c and pngvcrd.c (requested by Chrome). @@ -2760,10 +2760,13 @@ version 1.2.48beta01 [February 27, 2012] the string terminators. This bug was introduced in libpng-1.0.6 (Frank Busse). -version 1.2.48beta02 [February 29, 2012] +version 1.2.48rc01 [March 2, 2012] Removed the png_free() of unused png_ptr->current_text from pngread.c. Added libpng license text to pnggccrd.c and pngvcrd.c (requested by Chrome). +version 1.2.48rc02 [March 2, 2012] + Removed all of the assembler code from pnggccrd.c and just "return 2;". + 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 67b21447c..52814aed4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.48beta02 +# VERSION 0.${PNGLIB_RELEASE}.1.2.48rc02 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.2.48beta02 - February 27, 2012 +Installing libpng version 1.2.48rc02 - March 2, 2012 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.48beta02" or "libpng12" and "zlib-1.2.3" +might be called "libpng-1.2.48rc02" 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.48beta02 +Known bugs in libpng version 1.2.48rc02 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.48beta02, February 27, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.2.48rc02, March 2, 2012, are Copyright (c) 2004, 2006-2009 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 -February 27, 2012 +March 2, 2012 diff --git a/Makefile.am b/Makefile.am index 4052e4ff1..7bb2411da 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.48beta02.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.48rc02.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 6511e2189..6ee8ad679 100644 --- a/Makefile.in +++ b/Makefile.in @@ -354,7 +354,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.48beta02.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.48rc02.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.48beta02 - February 27, 2012 (shared library 12.0) +README for libpng version 1.2.48rc02 - March 2, 2012 (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. @@ -199,11 +199,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.48beta02) + creates libpng12.so.0.1.2.48rc02) makefile.linux => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.48beta02) + libpng12.so.0.1.2.48rc02) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.48beta02, previously + libpng12.so.0.1.2.48rc02, previously used assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static @@ -228,12 +228,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.48beta02) + (gcc, creates libpng12.so.0.1.2.48rc02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.48beta02) + (gcc, creates libpng12.so.0.1.2.48rc02) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.48beta02) + (gcc, creates libpng12.so.0.1.2.48rc02) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - February 27, 2012 + March 2, 2012 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.48beta02 are Y2K compliant. It is my belief that earlier + upward through 1.2.48rc02 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.65 for libpng 1.2.48beta02. +# Generated by GNU Autoconf 2.65 for libpng 1.2.48rc02. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.48beta02' -PACKAGE_STRING='libpng 1.2.48beta02' +PACKAGE_VERSION='1.2.48rc02' +PACKAGE_STRING='libpng 1.2.48rc02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1435,7 +1435,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.48beta02 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.48rc02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1505,7 +1505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.48beta02:";; + short | recursive ) echo "Configuration of libpng 1.2.48rc02:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.48beta02 +libpng configure 1.2.48rc02 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2037,7 +2037,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.48beta02, which was +It was created by libpng $as_me 1.2.48rc02, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2845,7 +2845,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.48beta02' + VERSION='1.2.48rc02' cat >>confdefs.h <<_ACEOF @@ -2909,7 +2909,7 @@ fi -PNGLIB_VERSION=1.2.48beta02 +PNGLIB_VERSION=1.2.48rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=48 @@ -12079,7 +12079,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.48beta02, which was +This file was extended by libpng $as_me 1.2.48rc02, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12145,7 +12145,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.48beta02 +libpng config.status 1.2.48rc02 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 49312e396..60ec70d9e 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.48beta02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.48rc02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.48beta02 +PNGLIB_VERSION=1.2.48rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=48 diff --git a/libpng-1.2.48beta02.txt b/libpng-1.2.48rc02.txt index a4f3f9662..1d07ad26e 100644 --- a/libpng-1.2.48beta02.txt +++ b/libpng-1.2.48rc02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.48beta02 - February 27, 2012 + libpng version 1.2.48rc02 - March 2, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.2.48beta02 - February 27, 2012 + libpng versions 0.97, January 1998, through 1.2.48rc02 - March 2, 2012 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.2.48beta02, not all possible expansions are supported. +As of libpng version 1.2.48rc02, 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 @@ -3179,13 +3179,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -February 27, 2012 +March 2, 2012 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.48beta02 are Y2K compliant. It is my belief that earlier +upward through 1.2.48rc02 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 27, 2012" +.TH LIBPNG 3 "March 2, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.48beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.48rc02 .SH SYNOPSIS \fI\fB @@ -821,7 +821,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.48beta02 - February 27, 2012 + libpng version 1.2.48rc02 - March 2, 2012 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -832,7 +832,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.48beta02 - February 27, 2012 + libpng versions 0.97, January 1998, through 1.2.48rc02 - March 2, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -1699,7 +1699,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.48beta02, not all possible expansions are supported. +As of libpng version 1.2.48rc02, 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 @@ -4000,13 +4000,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -February 27, 2012 +March 2, 2012 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.48beta02 are Y2K compliant. It is my belief that earlier +upward through 1.2.48rc02 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 @@ -4320,7 +4320,8 @@ the first widely used release: 1.0.57rc01 10 10057 10.so.0.57[.0] 1.2.47 13 10247 12.so.0.47[.0] 1.0.57 10 10057 10.so.0.57[.0] - 1.2.48beta01-02 13 10248 12.so.0.48[.0] + 1.2.48beta01 13 10248 12.so.0.48[.0] + 1.2.48rc01 13 10248 12.so.0.48[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4376,7 +4377,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.48beta02 - February 27, 2012: +Libpng version 1.2.48rc02 - March 2, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -4399,7 +4400,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.2.48beta02, February 27, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.2.48rc02, March 2, 2012, 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 @@ -4498,7 +4499,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 27, 2012 +March 2, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 355a4127d..3ead1881a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "February 27, 2012" +.TH LIBPNGPF 3 "March 2, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.48beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.48rc02 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "February 27, 2012" +.TH PNG 5 "March 2, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_48beta02 Your_png_h_is_not_version_1_2_48beta02; +typedef version_1_2_48rc02 Your_png_h_is_not_version_1_2_48rc02; /* 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.48beta02 - February 27, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.2.48rc02 - March 2, 2012" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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.48beta02 - February 27, 2012\ + return ((png_charp) "libpng version 1.2.48rc02 - March 2, 2012\ Copyright (c) 1998-2011 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.48beta02 - February 27, 2012 + * libpng version 1.2.48rc02 - March 2, 2012 * Copyright (c) 1998-2012 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.48beta02 - February 27, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.2.48rc02 - March 2, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -275,7 +275,8 @@ * 1.0.57rc01 10 10057 10.so.0.57[.0] * 1.2.47 13 10247 12.so.0.47[.0] * 1.0.57 10 10057 10.so.0.57[.0] - * 1.2.48beta01-02 13 10248 12.so.0.48[.0] + * 1.2.48beta01 13 10248 12.so.0.48[.0] + * 1.2.48rc01 13 10248 12.so.0.48[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -307,7 +308,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.48beta02, February 27, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.48rc02, March 2, 2012, are * Copyright (c) 2004, 2006-2011 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: @@ -419,13 +420,13 @@ * Y2K compliance in libpng: * ========================= * - * February 27, 2012 + * March 2, 2012 * * 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.48beta02 are Y2K compliant. It is my belief that earlier + * upward through 1.2.48rc02 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 @@ -481,9 +482,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.48beta02" +#define PNG_LIBPNG_VER_STRING "1.2.48rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.48beta02 - February 27, 2012\n" + " libpng version 1.2.48rc02 - March 2, 2012\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -513,7 +514,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. @@ -1561,7 +1562,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_48beta02; +typedef png_structp version_1_2_48rc02; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.48beta02 - February 27, 2012 + * libpng version 1.2.48rc02 - March 2, 2012 * Copyright (c) 1998-2012 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.) diff --git a/pnggccrd.c b/pnggccrd.c index 51b90d0b1..033bf8b36 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -1,6 +1,6 @@ /* pnggccrd.c * - * Last changed in libpng 1.2.48 [February 29, 2012] + * Last changed in libpng 1.2.48 [March 2, 2012] * Copyright (c) 1998-2012 Glenn Randers-Pehrson * * This code is released under the libpng license. @@ -8,7 +8,7 @@ * and license in png.h * * This code snippet is for use by configure's compilation test. The - * remainder of the file was removed from libpng-1.2.20. + * remainder of the file was removed from libpng-1.2.20. */ #if (!defined _MSC_VER) && \ @@ -17,96 +17,9 @@ int PNGAPI png_dummy_mmx_support(void); -static int _mmx_supported = 2; // 0: no MMX; 1: MMX supported; 2: not tested - -int PNGAPI -png_dummy_mmx_support(void) __attribute__((noinline)); - -int PNGAPI -png_dummy_mmx_support(void) +int PNGAPI png_dummy_mmx_support(void) { - int result; -#ifdef PNG_MMX_CODE_SUPPORTED // superfluous, but what the heck - __asm__ __volatile__ ( -#ifdef __x86_64__ - "pushq %%rbx \n\t" // rbx gets clobbered by CPUID instruction - "pushq %%rcx \n\t" // so does rcx... - "pushq %%rdx \n\t" // ...and rdx (but rcx & rdx safe on Linux) - "pushfq \n\t" // save Eflag to stack - "popq %%rax \n\t" // get Eflag from stack into rax - "movq %%rax, %%rcx \n\t" // make another copy of Eflag in rcx - "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21) - "pushq %%rax \n\t" // save modified Eflag back to stack - "popfq \n\t" // restore modified value to Eflag reg - "pushfq \n\t" // save Eflag to stack - "popq %%rax \n\t" // get Eflag from stack - "pushq %%rcx \n\t" // save original Eflag to stack - "popfq \n\t" // restore original Eflag -#else - "pushl %%ebx \n\t" // ebx gets clobbered by CPUID instruction - "pushl %%ecx \n\t" // so does ecx... - "pushl %%edx \n\t" // ...and edx (but ecx & edx safe on Linux) - "pushfl \n\t" // save Eflag to stack - "popl %%eax \n\t" // get Eflag from stack into eax - "movl %%eax, %%ecx \n\t" // make another copy of Eflag in ecx - "xorl $0x200000, %%eax \n\t" // toggle ID bit in Eflag (i.e., bit 21) - "pushl %%eax \n\t" // save modified Eflag back to stack - "popfl \n\t" // restore modified value to Eflag reg - "pushfl \n\t" // save Eflag to stack - "popl %%eax \n\t" // get Eflag from stack - "pushl %%ecx \n\t" // save original Eflag to stack - "popfl \n\t" // restore original Eflag -#endif - "xorl %%ecx, %%eax \n\t" // compare new Eflag with original Eflag - "jz 0f \n\t" // if same, CPUID instr. is not supported - - "xorl %%eax, %%eax \n\t" // set eax to zero -// ".byte 0x0f, 0xa2 \n\t" // CPUID instruction (two-byte opcode) - "cpuid \n\t" // get the CPU identification info - "cmpl $1, %%eax \n\t" // make sure eax return non-zero value - "jl 0f \n\t" // if eax is zero, MMX is not supported - - "xorl %%eax, %%eax \n\t" // set eax to zero and... - "incl %%eax \n\t" // ...increment eax to 1. This pair is - // faster than the instruction "mov eax, 1" - "cpuid \n\t" // get the CPU identification info again - "andl $0x800000, %%edx \n\t" // mask out all bits but MMX bit (23) - "cmpl $0, %%edx \n\t" // 0 = MMX not supported - "jz 0f \n\t" // non-zero = yes, MMX IS supported - - "movl $1, %%eax \n\t" // set return value to 1 - "jmp 1f \n\t" // DONE: have MMX support - - "0: \n\t" // .NOT_SUPPORTED: target label for jump instructions - "movl $0, %%eax \n\t" // set return value to 0 - "1: \n\t" // .RETURN: target label for jump instructions -#ifdef __x86_64__ - "popq %%rdx \n\t" // restore rdx - "popq %%rcx \n\t" // restore rcx - "popq %%rbx \n\t" // restore rbx -#else - "popl %%edx \n\t" // restore edx - "popl %%ecx \n\t" // restore ecx - "popl %%ebx \n\t" // restore ebx -#endif - -// "ret \n\t" // DONE: no MMX support - // (fall through to standard C "ret") - - : "=a" (result) // output list - - : // any variables used on input (none) - - // no clobber list -// , "%ebx", "%ecx", "%edx" // GRR: we handle these manually -// , "memory" // if write to a variable gcc thought was in a reg -// , "cc" // "condition codes" (flag bits) - ); - _mmx_supported = result; -#else - _mmx_supported = 0; -#endif /* PNG_MMX_CODE_SUPPORTED */ - - return _mmx_supported; + /* 0: no MMX; 1: MMX supported; 2: not tested */ + return 2; } #endif @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.48 [February 27, 2012] + * Last changed in libpng 1.2.48 [March 2, 2012] * Copyright (c) 1998-2012 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.) diff --git a/pngrutil.c b/pngrutil.c index 7154dd63c..f9301448e 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.48 [February 27, 2012] + * Last changed in libpng 1.2.48 [March 2, 2012] * Copyright (c) 1998-2012 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_48beta02 your_png_h_is_not_version_1_2_48beta02; +typedef version_1_2_48rc02 your_png_h_is_not_version_1_2_48rc02; @@ -1,6 +1,6 @@ /* pngvcrd.c * - * Last changed in libpng 1.2.48 [February 29, 2012] + * Last changed in libpng 1.2.48 [March 2, 2012] * Copyright (c) 1998-2012 Glenn Randers-Pehrson * * This code is released under the libpng license. diff --git a/projects/wince.txt b/projects/wince.txt index 0bf4ac89d..5993afc67 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.48beta02-project-wince.zip from a libpng distribution +libpng-1.2.48rc02-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.48beta02-project-wince.zip" +"unzip -a libpng-1.2.48rc02-project-wince.zip" diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index f27a9bfe4..92b95f670 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.48beta02; + FRAMEWORK_VERSION = 1.2.48rc02; 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.48beta02; + FRAMEWORK_VERSION = 1.2.48rc02; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index fae720dd2..85b223e3f 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.2.48beta02 - February 27, 2012 +Makefiles for libpng version 1.2.48rc02 - March 2, 2012 makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.48beta02) + (gcc, creates libpng12.so.0.1.2.48rc02) 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.48beta02 - February 27, 2012 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.48beta02) + gcc, creates libpng12.so.0.1.2.48rc02) 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.48beta02 - February 27, 2012 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.48beta02) + creates libpng12.so.0.1.2.48rc02) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.48beta02) + creates libpng12.so.0.1.2.48rc02) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng12.so.0.1.2.48beta02) + creates libpng12.so.0.1.2.48rc02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.48beta02) + creates libpng12.so.0.1.2.48rc02) 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 e8801c3a4..9c0428341 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.48beta02 +version=1.2.48rc02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index beb9d1e89..10d8131d9 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.48beta02 +Version: 1.2.48rc02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 345e1d3fa..810ef348a 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 565b1215d..b36211df9 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index f50e908c9..cbe8770f2 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.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 1ba87f516..21636f1c9 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index dd4949c95..1de2068dd 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.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index e7129a99d..a7b13fcb6 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 35c1c163c..0782f79e3 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 2953112d2..663114fa6 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index effff9b6c..be0101094 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index e22216f5d..c598714f0 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.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 327722e80..2193d5afe 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 4a54851ad..0bc64f444 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.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index e8b28c550..975c24f04 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index fd0d1cf93..945ab570f 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.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index b8d22123f..055b38011 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.48beta02 +SHLIB_MINOR= 1.2.48rc02 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 eb5f36adb..1e0457e46 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.48beta02 +SHLIB_MINOR= 1.2.48rc02 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 13e9a68d1..e6534d465 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 7cb82bd3d..148f3bfe1 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.48beta02 +SHLIB_MINOR= 1.2.48rc02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index c22cd5a9a..d7bf8f394 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index c9ad4f1b8..25367ff04 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 75369ab5b..780f9a79f 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index bf5df2dcc..90d466e38 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index fe20e2910..16aaa9d4b 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 3e0ee0dc9..e2c9b2cb4 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.48beta02 +PNGMIN = 1.2.48rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 0ddbe5c5c..577b877c3 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.2.48beta02 +;Version 1.2.48rc02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 2f2c4966f..0b5a2c8a6 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.48beta02 +; Version 1.2.48rc02 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index d771fc595..4909049d6 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.48beta02 +;Version 1.2.48rc02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |