From 1586ea6fe9ff3db080ecf238cf157638fedc4e35 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 4 May 2008 05:16:32 -0500 Subject: [PATCH] Imported from libpng-1.2.29rc01.tar --- ANNOUNCE | 38 ++++++++++--------- CHANGES | 4 ++ INSTALL | 16 ++++---- KNOWNBUG | 2 +- LICENSE | 4 +- Makefile.am | 2 +- README | 14 +++---- Y2KINFO | 4 +- configure.ac | 4 +- ...-1.2.29beta03.txt => libpng-1.2.29rc01.txt | 8 ++-- libpng.3 | 19 +++++----- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 4 +- png.h | 21 +++++----- pngconf.h | 2 +- pnggccrd.c | 4 +- pngtest.c | 2 +- scripts/CMakeLists.txt | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc-configure.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/makefile.solaris-x86 | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 48 files changed, 113 insertions(+), 101 deletions(-) rename libpng-1.2.29beta03.txt => libpng-1.2.29rc01.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 8869892e..03e51335 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.29beta03 - May 2, 2008 +Libpng 1.2.29rc01 - May 4, 2008 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,37 +9,37 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.29beta03.tar.gz - libpng-1.2.29beta03.tar.lzma + libpng-1.2.29rc01.tar.gz + libpng-1.2.29rc01.tar.lzma (Get the lzma codec from ). - libpng-1.2.29beta03.tar.bz2 + libpng-1.2.29rc01.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.29beta03-no-config.tar.gz - libpng-1.2.29beta03-no-config.tar.lzma - libpng-1.2.29beta03-no-config.tar.bz2 + libpng-1.2.29rc01-no-config.tar.gz + libpng-1.2.29rc01-no-config.tar.lzma + libpng-1.2.29rc01-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1229b03.zip - lp1229b03.7z - lp1229b03.tar.bz2 + lp1229r01.zip + lp1229r01.7z + lp1229r01.tar.bz2 Project files - libpng-1.2.29beta03-project-netware.zip - libpng-1.2.29beta03-project-wince.zip + libpng-1.2.29rc01-project-netware.zip + libpng-1.2.29rc01-project-wince.zip Other information: - libpng-1.2.29beta03-README.txt - libpng-1.2.29beta03-KNOWNBUGS.txt - libpng-1.2.29beta03-LICENSE.txt - libpng-1.2.29beta03-Y2K-compliance.txt - libpng-1.2.29beta03-[previous version]-diff.txt + libpng-1.2.29rc01-README.txt + libpng-1.2.29rc01-KNOWNBUGS.txt + libpng-1.2.29rc01-LICENSE.txt + libpng-1.2.29rc01-Y2K-compliance.txt + libpng-1.2.29rc01-[previous version]-diff.txt Changes since the last public release (1.2.28): @@ -55,6 +55,10 @@ version 1.2.29beta03 [May 2, 2008] automake options. Changed $(ECHO) to echo in Makefile.am and Makefile.in Updated all configure files to autoconf-2.62 + #ifdef out pnggcrd.c code if using MSC_VER + +version 1.2.29rc01 [May 4, 2008] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net diff --git a/CHANGES b/CHANGES index 8eb432e9..506fabb5 100644 --- a/CHANGES +++ b/CHANGES @@ -2156,6 +2156,10 @@ version 1.2.29beta03 [May 2, 2008] automake options. Changed $(ECHO) to echo in Makefile.am and Makefile.in Updated all configure files to autoconf-2.62 + #ifdef out pnggcrd.c code if using MSC_VER + +version 1.2.29rc01 [May 4, 2008] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/INSTALL b/INSTALL index b6a6a1ee..5ac9575e 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.29beta03 - May 2, 2008 +Installing libpng version 1.2.29rc01 - May 4, 2008 On Unix/Linux and similar systems, you can simply type @@ -44,7 +44,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.29beta03" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.29rc01" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.29beta03) + gcc, creates libpng12.so.0.1.2.29rc01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.29beta03) + (gcc, creates libpng12.so.0.1.2.29rc01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.29beta03) + creates libpng12.so.0.1.2.29rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.29beta03) + creates libpng12.so.0.1.2.29rc01) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.29beta03) + creates libpng12.so.0.1.2.29rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.29beta03) + creates libpng12.so.0.1.2.29rc01) 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/KNOWNBUG b/KNOWNBUG index fd5e396a..db544473 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.29beta03 +Known bugs in libpng version 1.2.29rc01 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index c3d831b2..4b2a9aba 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.29beta03, May 2, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.29rc01, May 4, 2008, 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 @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 2, 2008 +May 4, 2008 diff --git a/Makefile.am b/Makefile.am index f53efea3..218abf27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.29beta03.txt pngvcrd.c + example.c libpng-1.2.29rc01.txt pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/README b/README index 12e8f1d0..08ed2eca 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.29beta03 - May 2, 2008 (shared library 12.0) +README for libpng version 1.2.29rc01 - May 4, 2008 (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. @@ -191,11 +191,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 libpng12.so.0.1.2.29beta03) + gcc, creates libpng12.so.0.1.2.29rc01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.29beta03) + (gcc, creates libpng12.so.0.1.2.29rc01) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.29beta03, + (gcc, creates libpng12.so.0.1.2.29rc01, 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 @@ -217,12 +217,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.29beta03) + (gcc, creates libpng12.so.0.1.2.29rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.29beta03) + (gcc, creates libpng12.so.0.1.2.29rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.29beta03) + (gcc, creates libpng12.so.0.1.2.29rc01) 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/Y2KINFO b/Y2KINFO index b7f1d17a..1872bbfd 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - May 2, 2008 + May 4, 2008 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.29beta03 are Y2K compliant. It is my belief that earlier + upward through 1.2.29rc01 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 diff --git a/configure.ac b/configure.ac index d66abade..aeeae2e1 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.29beta03], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.29rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.29beta03 +PNGLIB_VERSION=1.2.29rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=29 diff --git a/libpng-1.2.29beta03.txt b/libpng-1.2.29rc01.txt similarity index 99% rename from libpng-1.2.29beta03.txt rename to libpng-1.2.29rc01.txt index 7ff557c1..5d14a4c0 100644 --- a/libpng-1.2.29beta03.txt +++ b/libpng-1.2.29rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.29beta03 - May 2, 2008 + libpng version 1.2.29rc01 - May 4, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -9,7 +9,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.29beta03 - May 2, 2008 + libpng versions 0.97, January 1998, through 1.2.29rc01 - May 4, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -2851,13 +2851,13 @@ application: IX. Y2K Compliance in libpng -May 2, 2008 +May 4, 2008 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.29beta03 are Y2K compliant. It is my belief that earlier +upward through 1.2.29rc01 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 c03fad1d..7b4e0743 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 2, 2008" +.TH LIBPNG 3 "May 4, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.29beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.29rc01 .SH SYNOPSIS \fB #include \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.29beta03 - May 2, 2008 + libpng version 1.2.29rc01 - May 4, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -419,7 +419,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.29beta03 - May 2, 2008 + libpng versions 0.97, January 1998, through 1.2.29rc01 - May 4, 2008 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2008 Glenn Randers-Pehrson @@ -3261,13 +3261,13 @@ application: .SH IX. Y2K Compliance in libpng -May 2, 2008 +May 4, 2008 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.29beta03 are Y2K compliant. It is my belief that earlier +upward through 1.2.29rc01 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 @@ -3496,6 +3496,7 @@ the first widely used release: 1.0.34 10 10034 10.so.0.34[.0] 1.2.28 13 10228 12.so.0.28[.0] 1.2.29beta01-03 13 10229 12.so.0.29[.0] + 1.2.29rc01 13 10229 12.so.0.29[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3551,7 +3552,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.29beta03 - May 2, 2008: +Libpng version 1.2.29rc01 - May 4, 2008: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3572,7 +3573,7 @@ included in the libpng distribution, the latter shall prevail.) If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.29beta03, May 2, 2008, are +libpng versions 1.2.6, August 15, 2004, through 1.2.29rc01, May 4, 2008, 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 @@ -3671,7 +3672,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 2, 2008 +May 4, 2008 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 24476250..0851b253 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 2, 2008" +.TH LIBPNGPF 3 "May 4, 2008" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.29beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.29rc01 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index f061add5..697ad793 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 2, 2008" +.TH PNG 5 "May 4, 2008" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 590760e1..55dbb5bd 100644 --- a/png.c +++ b/png.c @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_29beta03 Your_png_h_is_not_version_1_2_29beta03; +typedef version_1_2_29rc01 Your_png_h_is_not_version_1_2_29rc01; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.29beta03 - May 2, 2008\n\ + return ((png_charp) "\n libpng version 1.2.29rc01 - May 4, 2008\n\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); diff --git a/png.h b/png.h index 80bcffc4..62b5e126 100644 --- a/png.h +++ b/png.h @@ -1,6 +1,6 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.29beta03 - May 2, 2008 + * libpng version 1.2.29rc01 - May 4, 2008 * Copyright (c) 1998-2008 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.) @@ -8,7 +8,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.29beta03 - May 2, 2008: Glenn + * libpng versions 0.97, January 1998, through 1.2.29rc01 - May 4, 2008: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -189,6 +189,7 @@ * 1.0.34 10 10034 10.so.0.34[.0] * 1.2.28 13 10228 12.so.0.28[.0] * 1.2.29beta01-03 13 10229 12.so.0.29[.0] + * 1.2.29rc01 13 10229 12.so.0.29[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -218,7 +219,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.29beta03, May 2, 2008, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.29rc01, May 4, 2008, 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: @@ -330,13 +331,13 @@ * Y2K compliance in libpng: * ========================= * - * May 2, 2008 + * May 4, 2008 * * 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.29beta03 are Y2K compliant. It is my belief that earlier + * upward through 1.2.29rc01 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 @@ -392,9 +393,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.29beta03" +#define PNG_LIBPNG_VER_STRING "1.2.29rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.29beta03 - May 2, 2008\n" + " libpng version 1.2.29rc01 - May 4, 2008\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -406,7 +407,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -423,7 +424,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. @@ -1447,7 +1448,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_29beta03; +typedef png_structp version_1_2_29rc01; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index a63fdaec..e26d694f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.29beta03 - May 2, 2008 + * libpng version 1.2.29rc01 - May 4, 2008 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pnggccrd.c b/pnggccrd.c index a7248d6c..e61523e7 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -2,8 +2,10 @@ /* This code snippet is for use by configure's compilation test. */ -#if defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \ +#if (!defined _MSC_VER) && \ + defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \ defined(PNG_MMX_CODE_SUPPORTED) + int PNGAPI png_dummy_mmx_support(void); static int _mmx_supported = 2; // 0: no MMX; 1: MMX supported; 2: not tested diff --git a/pngtest.c b/pngtest.c index 12824d6c..d205b834 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1560,4 +1560,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_29beta03 your_png_h_is_not_version_1_2_29beta03; +typedef version_1_2_29rc01 your_png_h_is_not_version_1_2_29rc01; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index bf564dfe..1f2f17d8 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.29beta03 +# VERSION 0.${PNGLIB_RELEASE}.1.2.29rc01 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 1e0d83d5..63b665a0 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.29beta03 +version=1.2.29rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index e5c71f47..3ee58cf2 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.29beta03 +Version: 1.2.29rc01 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index ec330e7c..322ffdf7 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.29beta03 +Version: 1.2.29rc01 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index a8c62eb5..8cc12d7c 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 7bb10026..2c2faa5b 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index e488e5da..d04941ab 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 69c1133f..062ed856 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index e6910195..1607703c 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 3f51e9ae..989f3abb 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 8ccdfb9c..fc8759e9 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 02580d69..5e5f0784 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 7b646d84..bea7ec67 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index bba09a94..33248ef3 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index a97a5d18..6d3b9a51 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index bca47fe2..90503536 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 3aae24c4..fc384d24 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 3a7db7e5..460996f2 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 5892a2d4..7d3fa67a 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.29beta03 +SHLIB_MINOR= 1.2.29rc01 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 7263aabf..c662ed29 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.29beta03 +SHLIB_MINOR= 1.2.29rc01 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 1f528858..4b1a23eb 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 93bf496b..d7a6fc24 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.29beta03 +SHLIB_MINOR= 1.2.29rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 9eebd005..5d71cc15 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 395bb81e..6218b67c 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 572a88da..53dbbf48 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 0a4092a8..02c3ddbc 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index bd8b2320..bbfb1984 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index e0d5cb32..2f211d99 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29beta03 +PNGMIN = 1.2.29rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index d65b84a7..bf930d13 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.29beta03 +; Version 1.2.29rc01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 08ced6c8..dfe459f4 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.29beta03 +;Version 1.2.29rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3