diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-01-24 06:57:00 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:24:05 -0500 |
| commit | 551892bb602a56a13e88e9b76a4a75ccc6bade7e (patch) | |
| tree | 87e3e913b08267f7c4a0632af8bc21ccf35a54fb | |
| parent | 1a2e75ccf1c19fd4d81276e1a0880ceca4ece5c2 (diff) | |
| download | libpng-551892bb602a56a13e88e9b76a4a75ccc6bade7e.tar.gz | |
[libpng10] Imported from libpng-1.0.24rc1.tarv1.0.24rc1
46 files changed, 141 insertions, 124 deletions
@@ -1,56 +1,54 @@ -Libpng 1.0.23 - January 5, 2007 +Libpng 1.0.24rc1 - January 24, 2007 -This is a public release of libpng, intended for use in production codes. +This is not intended to be a public release. It will be replaced +within a few weeks by a public version or by another test version. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.0.23.tar.gz - libpng-1.0.23.tar.bz2 + libpng-1.0.24rc1.tar.gz + libpng-1.0.24rc1.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.23-no-config.tar.gz - libpng-1.0.23-no-config.tar.bz2 + libpng-1.0.24rc1-no-config.tar.gz + libpng-1.0.24rc1-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1023.zip - lpng1023.tar.bz2 + lp1024r01.zip + lp1024r01.tar.bz2 Project files - libpng-1.0.23-project-netware.zip - libpng-1.0.23-project-wince.zip + libpng-1.0.24rc1-project-netware.zip + libpng-1.0.24rc1-project-wince.zip Other information: - libpng-1.0.23-README.txt - libpng-1.0.23-KNOWNBUGS.txt - libpng-1.0.23-LICENSE.txt - libpng-1.0.23-Y2K-compliance.txt + libpng-1.0.24rc1-README.txt + libpng-1.0.24rc1-KNOWNBUGS.txt + libpng-1.0.24rc1-LICENSE.txt + libpng-1.0.24rc1-Y2K-compliance.txt -Changes since the last public release (1.0.22): +Changes since the last public release (1.0.23): -version 1.0.23 [January 5, 2007] +version 1.2.16beta1 [January 6, 2007] + Fix bugs in makefile.nommx - Generated configure with autoconf-2.61 instead of 2.60 - Revised configure.ac to update libpng.pc and libpng-config. - Always export MMX asm functions, just stubs if not building pnggccrd.c - Add "png_bytep" typecast to profile while calculating length in pngwutil.c - Added scripts/CMakeLists.txt - Changed PNG_NO_ASSEMBLER_CODE to PNG_NO_MMX_CODE in scripts, like 1.4.0beta - Added conditional #undef jmpbuf in pngtest.c to undo #define in AIX headers. - Added scripts/makefile.nommx - Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set. - Added some (unsigned long) typecasts in pngtest.c to avoid printing errors. +version 1.2.16beta2 [January 16, 2007] + Revised scripts/CMakeLists.txt + +version 1.2.16rc1 [January 24, 2007] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net + (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement to subscribe) or to glennrp at users.sourceforge.net @@ -1469,7 +1469,7 @@ version 1.2.9beta5 [March 4, 2006] Restored scripts/makefile.elf which was inadvertently deleted. version 1.2.9beta6 [March 6, 2006] - Fixed typo (23) in configuration files. + Fixed typo (24) in configuration files. version 1.2.9beta7 [March 7, 2006] Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am @@ -1669,6 +1669,15 @@ version 1.2.15rc5 [December 31, 2006] version 1.2.15 [January 5, 2007] Added some (unsigned long) typecasts in pngtest.c to avoid printing errors. +version 1.2.16beta1 [January 6, 2007] + Fix bugs in makefile.nommx + +version 1.2.16beta2 [January 16, 2007] + Revised scripts/CMakeLists.txt + +version 1.2.16rc1 [January 24, 2007] + No changes. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -1,5 +1,5 @@ -Installing libpng version 1.0.23 - January 5, 2007 +Installing libpng version 1.0.24rc1 - January 24, 2007 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.0.23" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.0.24rc1" 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,14 +101,14 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng10.so.0.1.0.23) + gcc, creates libpng10.so.0.1.0.24rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.23) + (gcc, creates libpng10.so.0.1.0.24rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.23, + (gcc, creates libpng10.so.0.1.0.24rc1, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.23 + (gcc, creates libpng10.so.0.1.0.24rc1 does not use Intel MMX assembler code) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with @@ -131,12 +131,12 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng10.so.0.1.0.23) + creates libpng10.so.0.1.0.24rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.23) + creates libpng10.so.0.1.0.24rc1) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.23) + creates libpng10.so.0.1.0.24rc1) 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,5 +1,5 @@ -Known bugs in libpng version 1.0.23 +Known bugs in libpng version 1.0.24rc1 1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when reading interlaced PNG files, when assembler code is enabled but running @@ -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.0.23, January 5, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.0.24rc1, January 24, 2007, are Copyright (c) 2004, 2006 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 -January 5, 2007 +January 24, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.0.23 - January 5, 2007 (shared library 10.0) +README for libpng version 1.0.24rc1 - January 24, 2007 (shared library 10.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -190,11 +190,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 libpng10.so.0.1.0.23) + gcc, creates libpng10.so.0.1.0.24rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.23) + (gcc, creates libpng10.so.0.1.0.24rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.23, + (gcc, creates libpng10.so.0.1.0.24rc1, 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 @@ -216,12 +216,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng10.so.0.1.0.23) + (gcc, creates libpng10.so.0.1.0.24rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.23) + (gcc, creates libpng10.so.0.1.0.24rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.23) + (gcc, creates libpng10.so.0.1.0.24rc1) 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: ========================= - January 5, 2007 + January 24, 2007 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.0.23 are Y2K compliant. It is my belief that earlier + upward through 1.0.24rc1 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.61 for libpng 1.0.23. +# Generated by GNU Autoconf 2.61 for libpng 1.0.24rc1. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.0.23' -PACKAGE_STRING='libpng 1.0.23' +PACKAGE_VERSION='1.0.24rc1' +PACKAGE_STRING='libpng 1.0.24rc1' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' ac_unique_file="pngget.c" @@ -1405,7 +1405,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.0.23 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.24rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1475,7 +1475,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.0.23:";; + short | recursive ) echo "Configuration of libpng 1.0.24rc1:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.0.23 +libpng configure 1.0.24rc1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1599,7 +1599,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.0.23, which was +It was created by libpng $as_me 1.0.24rc1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2269,7 +2269,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.0.23' + VERSION='1.0.24rc1' cat >>confdefs.h <<_ACEOF @@ -2440,10 +2440,10 @@ fi -PNGLIB_VERSION=1.0.23 +PNGLIB_VERSION=1.0.24rc1 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=23 +PNGLIB_RELEASE=24 @@ -21119,7 +21119,7 @@ exec 6>&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.0.23, which was +This file was extended by libpng $as_me 1.0.24rc1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21172,7 +21172,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.0.23 +libpng config.status 1.0.24rc1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index f86971db9..69c53bc38 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.0.23], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.24rc1], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.23 +PNGLIB_VERSION=1.0.24rc1 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=23 +PNGLIB_RELEASE=24 dnl End of version number stuff diff --git a/libpng.txt b/libpng-1.0.24rc1.txt index 60664fb7b..319363a90 100644 --- a/libpng.txt +++ b/libpng-1.0.24rc1.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.23 - January 5, 2007 + libpng version 1.0.24rc1 - January 24, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2762,13 +2762,13 @@ application: VIII. Y2K Compliance in libpng -January 5, 2007 +January 24, 2007 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.0.23 are Y2K compliant. It is my belief that earlier +upward through 1.0.24rc1 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 "January 5, 2007" +.TH LIBPNG 3 "January 24, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.23 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.24rc1 .SH SYNOPSIS \fB #include <png.h>\fP @@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.0.23 - January 5, 2007 + libpng version 1.0.24rc1 - January 24, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3172,13 +3172,13 @@ application: .SH VIII. Y2K Compliance in libpng -January 5, 2007 +January 24, 2007 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.0.23 are Y2K compliant. It is my belief that earlier +upward through 1.0.24rc1 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 @@ -3356,6 +3356,8 @@ the first widely used release: 1.2.15rc1-5 13 10215 12.so.0.15[.0] 1.0.23 10 10023 10.so.0.23[.0] 1.2.15 13 10215 12.so.0.15[.0] + 1.2.16beta1-2 13 10216 12.so.0.16[.0] + 1.2.16rc1 13 10216 12.so.0.16[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3411,7 +3413,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.23 - January 5, 2007: +Libpng version 1.0.24rc1 - January 24, 2007: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3432,7 +3434,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.0.23, January 5, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.0.24rc1, January 24, 2007, are Copyright (c) 2004-2006 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 @@ -3531,7 +3533,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 5, 2007 +January 24, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ab3121482..99238a3ed 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 5, 2007" +.TH LIBPNGPF 3 "January 24, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.23 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.24rc1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 5, 2007" +.TH PNG 5 "January 24, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_0_23 Your_png_h_is_not_version_1_0_23; +typedef version_1_0_24rc1 Your_png_h_is_not_version_1_0_24rc1; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -701,7 +701,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.0.23 - January 5, 2007\n\ + return ((png_charp) "\n libpng version 1.0.24rc1 - January 24, 2007\n\ Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.23 - January 5, 2007 + * libpng version 1.0.24rc1 - January 24, 2007 * Copyright (c) 1998-2007 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.) @@ -9,7 +9,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.0.23 - January 5, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.0.24rc1 - January 24, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -139,6 +139,8 @@ * 1.2.15rc1-5 13 10215 12.so.0.15[.0] * 1.0.23 10 10023 10.so.0.23[.0] * 1.2.15 13 10215 12.so.0.15[.0] + * 1.2.16beta1-2 13 10216 12.so.0.16[.0] + * 1.2.16rc1 13 10216 12.so.0.16[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -168,7 +170,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.23, January 5, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.0.24rc1, January 24, 2007, are * Copyright (c) 2004, 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: @@ -280,13 +282,13 @@ * Y2K compliance in libpng: * ========================= * - * January 5, 2007 + * January 24, 2007 * * 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.0.23 are Y2K compliant. It is my belief that earlier + * upward through 1.0.24rc1 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 @@ -342,9 +344,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.23" +#define PNG_LIBPNG_VER_STRING "1.0.24rc1" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.23 - January 5, 2007 (header)\n" + " libpng version 1.0.24rc1 - January 24, 2007 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -352,11 +354,11 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 0 -#define PNG_LIBPNG_VER_RELEASE 23 +#define PNG_LIBPNG_VER_RELEASE 24 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 1 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -373,14 +375,14 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10023 /* 1.0.23 */ +#define PNG_LIBPNG_VER 10024 /* 1.0.24 */ #ifndef PNG_VERSION_INFO_ONLY /* include the compression library's header */ @@ -1390,7 +1392,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_0_23; +typedef png_structp version_1_0_24rc1; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.23 - January 5, 2007 + * libpng version 1.0.24rc1 - January 24, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1551,4 +1551,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_0_23 your_png_h_is_not_version_1_0_23; +typedef version_1_0_24rc1 your_png_h_is_not_version_1_0_24rc1; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 2aa70d494..fec284a4c 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -5,7 +5,7 @@ project(PNG) set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 0) -set(PNGLIB_RELEASE 23) +set(PNGLIB_RELEASE 24) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -66,6 +66,11 @@ if(NOT PNG_SHARED) set(PNG_LIB_NAME ${PNG_LIB_NAME}_static) endif(NOT PNG_SHARED) +if(PNG_SHARED) + add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) +else(PNG_SHARED) + add_library(${PNG_LIB_NAME} STATIC ${libpng_sources}) +endif(PNG_SHARED) # OUR SOURCES set(libpng_sources @@ -179,6 +184,7 @@ install_targets(/lib ${PNG_LIB_NAME}) install(FILES png.h pngconf.h DESTINATION include) install(FILES png.h pngconf.h DESTINATION include/${PNGLIB_NAME}) install(FILES libpng.3 libpngpf.3 DESTINATION man/man3) +install(FILES png.5 DESTINATION man/man5) install(FILES ${PNG_BINARY_DIR}/libpng.pc DESTINATION lib/pkgconfig) install(FILES ${PNG_BINARY_DIR}/libpng-config DESTINATION bin) install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc DESTINATION lib/pkgconfig) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 42ab4c3df..35761a96c 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.0.23 +version=1.0.24rc1 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 94e2fdc92..8b38b4e9f 100644 --- a/scripts/libpng.pc-configure.in +++ b/scripts/libpng.pc-configure.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.23 +Version: 1.0.24rc1 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 9677f876f..2f1fcd24f 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng10 Name: libpng Description: Loads and saves PNG files -Version: 1.0.23 +Version: 1.0.24rc1 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 2a15ddf84..76c59271c 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index c63fca6cc..ccee05473 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index d5740e973..7d88d8fea 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -20,7 +20,7 @@ LN_SF = ln -f -s LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index ac992fc75..283f2e17c 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index c9bea48e1..3eb27e856 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 CYGDLL = 10 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 1bdc3cdbb..99a23a686 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 24f3f77e5..8d127d4ca 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 622a6d600..b0910ff35 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 163d1603d..1fc7b8a32 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 5bf10dc3b..604a440c3 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 75c730ec7..852042201 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index aee5911b1..fed569d75 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 9e456f4bc..ab4fe6e19 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 67dc91590..44b9a5f56 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng10 PNGMAJ = 0 MINGDLL = 10 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 38129f857..ce047cc60 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng10 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.0.23 +SHLIB_MINOR= 1.0.24rc1 SRCS= pnggccrd.c 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 4ca5c6f14..3a05492aa 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.0.23 +SHLIB_MINOR= 1.0.24rc1 SRCS= pnggccrd.c 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 e60150b39..e001b0de4 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -93,8 +93,8 @@ libpng.a: $(OBJS) $(RANLIB) $@ libpng.pc: - cat scripts/libpng.pc.in | sed -e s!@PREFIX@!$(prefix)! \| - sed -s s!Cflags: !Cflags: -DPNG_NO_MMX_CODE !> libpng.pc + cat scripts/libpng.pc.in | sed -e s!@PREFIX@!$(prefix)! \ + | sed -e "s!Cflags: !Cflags: -DPNG_NO_MMX_CODE !"> libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 10815b402..fd3b409c3 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.0.23 +SHLIB_MINOR= 1.0.24rc1 LIB= png SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 4f273c121..959f8a50c 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index a9f679d64..fc74ff3ce 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 14f30fbc3..9a4eb1401 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 95b11048e..5909a925e 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 5acda130e..1e7e62c82 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.23 +PNGMIN = 1.0.24rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index f81ba29f9..336dcd746 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.23 +; Version 1.0.24rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 6b18675e0..6bdc2683f 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.23 +;Version 1.0.24rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |