diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-05-04 15:39:51 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-03 12:24:10 -0500 |
| commit | 928d84e71345f44f352cd2fde0c432229c1fbb2d (patch) | |
| tree | 3f9fdbd7d3ba35573b28340691d5948156ed3c82 | |
| parent | 764b52ad457e1bbfa41bc83d0cc455b3ebaebb15 (diff) | |
| download | libpng-928d84e71345f44f352cd2fde0c432229c1fbb2d.tar.gz | |
[libpng10] Imported from libpng-1.0.25rc1.tarv1.0.25rc1
54 files changed, 252 insertions, 194 deletions
@@ -1,48 +1,59 @@ -Libpng 1.0.24 - January 31, 2007 +Libpng 1.0.25rc1 - May 4, 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.24.tar.gz - libpng-1.0.24.tar.bz2 + libpng-1.0.25rc1.tar.gz + libpng-1.0.25rc1.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.0.24-no-config.tar.gz - libpng-1.0.24-no-config.tar.bz2 + libpng-1.0.25rc1-no-config.tar.gz + libpng-1.0.25rc1-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1024.zip - lpng1024.tar.bz2 + lp1025r01.zip + lp1025r01.tar.bz2 Project files - libpng-1.0.24-project-netware.zip - libpng-1.0.24-project-wince.zip + libpng-1.0.25rc1-project-netware.zip + libpng-1.0.25rc1-project-wince.zip Other information: - libpng-1.0.24-README.txt - libpng-1.0.24-KNOWNBUGS.txt - libpng-1.0.24-LICENSE.txt - libpng-1.0.24-Y2K-compliance.txt + libpng-1.0.25rc1-README.txt + libpng-1.0.25rc1-KNOWNBUGS.txt + libpng-1.0.25rc1-LICENSE.txt + libpng-1.0.25rc1-Y2K-compliance.txt -Changes since the last public release (1.0.23): +Changes since the last public release (1.0.24): -version 1.0.24 [January 31, 2007] +version 1.2.17beta1 [May 4, 2007] + Revised scripts/CMakeLists.txt to install both shared and static libraries. + Deleted a redundant line from pngset.c. - Fix bugs in makefile.nommx - Revised scripts/CMakeLists.txt +version 1.2.17beta2 [April 26, 2007] + Relocated misplaced test for png_ptr == NULL in pngpread.c + Use "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN flags. + Added pngerror() when write_IHDR fails in deflateInit2(). + Added "const" to some array declarations. + Mention examples of libpng usage in the libpng*.txt and libpng.3 documents. + +version 1.2.17rc1 [May 4, 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 (24) in configuration files. + Fixed typo (25) in configuration files. version 1.2.9beta7 [March 7, 2006] Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am @@ -1678,6 +1678,22 @@ version 1.2.16beta2 [January 16, 2007] version 1.2.16 [January 31, 2007] No changes. +version 1.2.17beta1 [March 6, 2007] + Revised scripts/CMakeLists.txt to install both shared and static libraries. + Deleted a redundant line from pngset.c. + +version 1.2.17beta2 [April 26, 2007] + Relocated misplaced test for png_ptr == NULL in pngpread.c + Change "==" to "&" for testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN + flags. + Changed remaining instances of PNG_ASSEMBLER_* to PNG_MMX_* + Added pngerror() when write_IHDR fails in deflateInit2(). + Added "const" to some array declarations. + Mention examples of libpng usage in the libpng*.txt and libpng.3 documents. + +version 1.2.17rc1 [May 4, 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.24 - January 31, 2007 +Installing libpng version 1.0.25rc1 - May 4, 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.24" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.0.25rc1" 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.24) + gcc, creates libpng10.so.0.1.0.25rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.24) + (gcc, creates libpng10.so.0.1.0.25rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.24, + (gcc, creates libpng10.so.0.1.0.25rc1, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.24 + (gcc, creates libpng10.so.0.1.0.25rc1 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.24) + creates libpng10.so.0.1.0.25rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng10.so.0.1.0.24) + creates libpng10.so.0.1.0.25rc1) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng10.so.0.1.0.24) + creates libpng10.so.0.1.0.25rc1) 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.24 +Known bugs in libpng version 1.0.25rc1 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 @@ -21,3 +21,8 @@ Known bugs in libpng version 1.0.24 STATUS: For now, system library builders should use the custom makefiles. +4. March 2007: Building 1.2.16 with PNG_ASSEMBLER_CODE_SUPPORTED; + PNG_MMX_CODE_SUPPORTED results in multiple definitions of png_combine_row, + png_do_read_interlace, and png_read_filter_row + + STATUS: Investigating. @@ -8,8 +8,8 @@ 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.24, January 31, 2007, are -Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.0.25rc1, May 4, 2007, are +Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -106,4 +106,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 31, 2007 +May 4, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.0.24 - January 31, 2007 (shared library 10.0) +README for libpng version 1.0.25rc1 - May 4, 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.24) + gcc, creates libpng10.so.0.1.0.25rc1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.24) + (gcc, creates libpng10.so.0.1.0.25rc1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng10.so.0.1.0.24, + (gcc, creates libpng10.so.0.1.0.25rc1, 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.24) + (gcc, creates libpng10.so.0.1.0.25rc1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng10.so.0.1.0.24) + (gcc, creates libpng10.so.0.1.0.25rc1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng10.so.0.1.0.24) + (gcc, creates libpng10.so.0.1.0.25rc1) 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 31, 2007 + May 4, 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.24 are Y2K compliant. It is my belief that earlier + upward through 1.0.25rc1 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.24. +# Generated by GNU Autoconf 2.61 for libpng 1.0.25rc1. # # 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.24' -PACKAGE_STRING='libpng 1.0.24' +PACKAGE_VERSION='1.0.25rc1' +PACKAGE_STRING='libpng 1.0.25rc1' 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.24 to adapt to many kinds of systems. +\`configure' configures libpng 1.0.25rc1 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.24:";; + short | recursive ) echo "Configuration of libpng 1.0.25rc1:";; 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.24 +libpng configure 1.0.25rc1 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.24, which was +It was created by libpng $as_me 1.0.25rc1, 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.24' + VERSION='1.0.25rc1' cat >>confdefs.h <<_ACEOF @@ -2440,10 +2440,10 @@ fi -PNGLIB_VERSION=1.0.24 +PNGLIB_VERSION=1.0.25rc1 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=24 +PNGLIB_RELEASE=25 @@ -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.24, which was +This file was extended by libpng $as_me 1.0.25rc1, 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.24 +libpng config.status 1.0.25rc1 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 25e3473cf..1965808d0 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.24], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.0.25rc1], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.0.24 +PNGLIB_VERSION=1.0.25rc1 PNGLIB_MAJOR=1 PNGLIB_MINOR=0 -PNGLIB_RELEASE=24 +PNGLIB_RELEASE=25 dnl End of version number stuff diff --git a/libpng-1.0.24.txt b/libpng-1.0.25rc1.txt index 24ade7003..655d280cc 100644 --- a/libpng-1.0.24.txt +++ b/libpng-1.0.25rc1.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.0.24 - January 31, 2007 + libpng version 1.0.25rc1 - May 4, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -33,6 +33,10 @@ it is heavily commented and should include everything most people will need. We assume that libpng is already installed; see the INSTALL file for instructions on how to install libpng. +For examples of libpng usage, see the files "example.c", "pngtest.c", +and the files in the "contrib" directory, all of which are included in the +libpng distribution. + Libpng was written as a companion to the PNG specification, as a way of reducing the amount of time and effort it takes to support the PNG file format in application programs. @@ -2762,13 +2766,13 @@ application: VIII. Y2K Compliance in libpng -January 31, 2007 +May 4, 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.24 are Y2K compliant. It is my belief that earlier +upward through 1.0.25rc1 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 31, 2007" +.TH LIBPNG 3 "May 4, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.24 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.25rc1 .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.24 - January 31, 2007 + libpng version 1.0.25rc1 - May 4, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -443,6 +443,10 @@ it is heavily commented and should include everything most people will need. We assume that libpng is already installed; see the INSTALL file for instructions on how to install libpng. +For examples of libpng usage, see the files "example.c", "pngtest.c", +and the files in the "contrib" directory, all of which are included in the +libpng distribution. + Libpng was written as a companion to the PNG specification, as a way of reducing the amount of time and effort it takes to support the PNG file format in application programs. @@ -3172,13 +3176,13 @@ application: .SH VIII. Y2K Compliance in libpng -January 31, 2007 +May 4, 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.24 are Y2K compliant. It is my belief that earlier +upward through 1.0.25rc1 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 @@ -3360,6 +3364,9 @@ the first widely used release: 1.2.16rc1 13 10216 12.so.0.16[.0] 1.0.24 10 10024 10.so.0.24[.0] 1.2.16 13 10216 12.so.0.16[.0] + 1.2.17beta1-2 13 10217 12.so.0.17[.0] + 1.0.25rc1 10 10025 10.so.0.25[.0] + 1.2.17rc1 13 10217 12.so.0.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3415,7 +3422,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.0.24 - January 31, 2007: +Libpng version 1.0.25rc1 - May 4, 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). @@ -3436,8 +3443,8 @@ 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.24, January 31, 2007, are -Copyright (c) 2004-2006 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.0.25rc1, May 4, 2007, are +Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -3535,7 +3542,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 31, 2007 +May 4, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index c2fb49f59..fa9e9b69e 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 31, 2007" +.TH LIBPNGPF 3 "May 4, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.0.24 +libpng \- Portable Network Graphics (PNG) Reference Library 1.0.25rc1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 31, 2007" +.TH PNG 5 "May 4, 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_24 Your_png_h_is_not_version_1_0_24; +typedef version_1_0_25rc1 Your_png_h_is_not_version_1_0_25rc1; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -68,7 +68,7 @@ const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; /* width of interlace block (used in assembler routines only) */ -#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +#ifdef PNG_HAVE_MMX_COMBINE_ROW const int FARDATA png_pass_width[] = {8, 4, 4, 2, 2, 1, 1}; #endif @@ -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.24 - January 31, 2007\n\ + return ((png_charp) "\n libpng version 1.0.25rc1 - May 4, 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"); @@ -796,13 +796,13 @@ png_init_mmx_flags (png_structp png_ptr) if (png_mmx_support() > 0) { png_ptr->asm_flags |= PNG_ASM_FLAG_MMX_SUPPORT_IN_CPU -# ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +# ifdef PNG_HAVE_MMX_COMBINE_ROW | PNG_ASM_FLAG_MMX_READ_COMBINE_ROW # endif -# ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE +# ifdef PNG_HAVE_MMX_READ_INTERLACE | PNG_ASM_FLAG_MMX_READ_INTERLACE # endif -# ifndef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +# ifndef PNG_HAVE_MMX_READ_FILTER_ROW ; # else | PNG_ASM_FLAG_MMX_READ_FILTER_SUB @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.0.24 - January 31, 2007 + * libpng version 1.0.25rc1 - May 4, 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.24 - January 31, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.0.25rc1 - May 4, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -143,6 +143,9 @@ * 1.2.16rc1 13 10216 12.so.0.16[.0] * 1.0.24 10 10024 10.so.0.24[.0] * 1.2.16 13 10216 12.so.0.16[.0] + * 1.2.17beta1-2 13 10217 12.so.0.17[.0] + * 1.0.25rc1 10 10025 10.so.0.25[.0] + * 1.2.17rc1 13 10217 12.so.0.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -172,8 +175,8 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.0.24, January 31, 2007, are - * Copyright (c) 2004, 2007 Glenn Randers-Pehrson, and are + * libpng versions 1.2.6, August 15, 2004, through 1.0.25rc1, May 4, 2007, are + * Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: * @@ -284,13 +287,13 @@ * Y2K compliance in libpng: * ========================= * - * January 31, 2007 + * May 4, 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.24 are Y2K compliant. It is my belief that earlier + * upward through 1.0.25rc1 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 @@ -346,9 +349,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.0.24" +#define PNG_LIBPNG_VER_STRING "1.0.25rc1" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.0.24 - January 31, 2007 (header)\n" + " libpng version 1.0.25rc1 - May 4, 2007 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 10 @@ -356,11 +359,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 24 +#define PNG_LIBPNG_VER_RELEASE 25 /* 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 @@ -377,14 +380,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 10024 /* 1.0.24 */ +#define PNG_LIBPNG_VER 10025 /* 1.0.25 */ #ifndef PNG_VERSION_INFO_ONLY /* include the compression library's header */ @@ -1394,7 +1397,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_24; +typedef png_structp version_1_0_25rc1; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.0.24 - January 31, 2007 + * libpng version 1.0.25rc1 - May 4, 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) @@ -1452,9 +1452,9 @@ typedef z_stream FAR * png_zstreamp; * MMX will be detected at run time and used if present. */ #ifdef PNG_USE_PNGVCRD -# define PNG_HAVE_ASSEMBLER_COMBINE_ROW -# define PNG_HAVE_ASSEMBLER_READ_INTERLACE -# define PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +# define PNG_HAVE_MMX_COMBINE_ROW +# define PNG_HAVE_MMX_READ_INTERLACE +# define PNG_HAVE_MMX_READ_FILTER_ROW #endif /* Set this in the makefile for gcc/as on Pentium, not here. */ @@ -1462,9 +1462,9 @@ typedef z_stream FAR * png_zstreamp; * MMX will be detected at run time and used if present. */ #ifdef PNG_USE_PNGGCCRD -# define PNG_HAVE_ASSEMBLER_COMBINE_ROW -# define PNG_HAVE_ASSEMBLER_READ_INTERLACE -# define PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +# define PNG_HAVE_MMX_COMBINE_ROW +# define PNG_HAVE_MMX_READ_INTERLACE +# define PNG_HAVE_MMX_READ_FILTER_ROW #endif /* - see pnggccrd.c for info about what is currently enabled */ diff --git a/pngerror.c b/pngerror.c index c8c58b91d..f50f65344 100644 --- a/pngerror.c +++ b/pngerror.c @@ -113,7 +113,7 @@ png_warning(png_structp png_ptr, png_const_charp warning_message) * if the character is invalid. */ #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) -static PNG_CONST char png_digit[16] = { +const static PNG_CONST char png_digit[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; diff --git a/pnggccrd.c b/pnggccrd.c index 7983f8ea1..fab523c0b 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -250,9 +250,9 @@ int PNGAPI png_mmx_support(void); #ifdef PNG_USE_LOCAL_ARRAYS -static const int FARDATA png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; -static const int FARDATA png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; -static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; +const static int FARDATA png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; +const static int FARDATA png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; +const static int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; #endif #if defined(PNG_MMX_CODE_SUPPORTED) @@ -311,30 +311,30 @@ static const int FARDATA png_pass_width[7] = {8, 4, 4, 2, 2, 1, 1}; static int _unmask; #endif -static unsigned long long _mask8_0 = 0x0102040810204080LL; +const static unsigned long long _mask8_0 = 0x0102040810204080LL; -static unsigned long long _mask16_1 = 0x0101020204040808LL; -static unsigned long long _mask16_0 = 0x1010202040408080LL; +const static unsigned long long _mask16_1 = 0x0101020204040808LL; +const static unsigned long long _mask16_0 = 0x1010202040408080LL; -static unsigned long long _mask24_2 = 0x0101010202020404LL; -static unsigned long long _mask24_1 = 0x0408080810101020LL; -static unsigned long long _mask24_0 = 0x2020404040808080LL; +const static unsigned long long _mask24_2 = 0x0101010202020404LL; +const static unsigned long long _mask24_1 = 0x0408080810101020LL; +const static unsigned long long _mask24_0 = 0x2020404040808080LL; -static unsigned long long _mask32_3 = 0x0101010102020202LL; -static unsigned long long _mask32_2 = 0x0404040408080808LL; -static unsigned long long _mask32_1 = 0x1010101020202020LL; -static unsigned long long _mask32_0 = 0x4040404080808080LL; +const static unsigned long long _mask32_3 = 0x0101010102020202LL; +const static unsigned long long _mask32_2 = 0x0404040408080808LL; +const static unsigned long long _mask32_1 = 0x1010101020202020LL; +const static unsigned long long _mask32_0 = 0x4040404080808080LL; -static unsigned long long _mask48_5 = 0x0101010101010202LL; -static unsigned long long _mask48_4 = 0x0202020204040404LL; -static unsigned long long _mask48_3 = 0x0404080808080808LL; -static unsigned long long _mask48_2 = 0x1010101010102020LL; -static unsigned long long _mask48_1 = 0x2020202040404040LL; -static unsigned long long _mask48_0 = 0x4040808080808080LL; +const static unsigned long long _mask48_5 = 0x0101010101010202LL; +const static unsigned long long _mask48_4 = 0x0202020204040404LL; +const static unsigned long long _mask48_3 = 0x0404080808080808LL; +const static unsigned long long _mask48_2 = 0x1010101010102020LL; +const static unsigned long long _mask48_1 = 0x2020202040404040LL; +const static unsigned long long _mask48_0 = 0x4040808080808080LL; -static unsigned long long _const4 = 0x0000000000FFFFFFLL; -//static unsigned long long _const5 = 0x000000FFFFFF0000LL; // NOT USED -static unsigned long long _const6 = 0x00000000000000FFLL; +const static unsigned long long _const4 = 0x0000000000FFFFFFLL; +//const static unsigned long long _const5 = 0x000000FFFFFF0000LL; // NOT USED +const static unsigned long long _const6 = 0x00000000000000FFLL; // These are used in the row-filter routines and should/would be local // variables if not for gcc addressing limitations. diff --git a/pngpread.c b/pngpread.c index d226c75d3..b787443cc 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1553,11 +1553,11 @@ void PNGAPI png_progressive_combine_row (png_structp png_ptr, png_bytep old_row, png_bytep new_row) { - if(png_ptr == NULL) return; #ifdef PNG_USE_LOCAL_ARRAYS const int FARDATA png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff}; #endif + if(png_ptr == NULL) return; if (new_row != NULL) /* new_row must == png_ptr->row_buf here. */ png_combine_row(png_ptr, old_row, png_pass_dsp_mask[png_ptr->pass]); } diff --git a/pngrtran.c b/pngrtran.c index 2fa96f312..7c3dc8514 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1293,9 +1293,9 @@ png_do_read_transformations(png_structp png_ptr) if(rgb_error) { png_ptr->rgb_to_gray_status=1; - if(png_ptr->transformations == PNG_RGB_TO_GRAY_WARN) + if(png_ptr->transformations & PNG_RGB_TO_GRAY_WARN) png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); - if(png_ptr->transformations == PNG_RGB_TO_GRAY_ERR) + if(png_ptr->transformations & PNG_RGB_TO_GRAY_ERR) png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); } } @@ -3965,7 +3965,7 @@ png_do_dither(png_row_infop row_info, png_bytep row, #ifdef PNG_FLOATING_POINT_SUPPORTED #if defined(PNG_READ_GAMMA_SUPPORTED) -static int png_gamma_shift[] = +const static int png_gamma_shift[] = {0x10, 0x21, 0x42, 0x84, 0x110, 0x248, 0x550, 0xff0, 0x00}; /* We build the 8- or 16-bit gamma tables here. Note that for 16-bit diff --git a/pngrutil.c b/pngrutil.c index 6157b3de4..972d0f0d0 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -181,7 +181,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, png_charp chunkdata, png_size_t chunklength, png_size_t prefix_size, png_size_t *newlength) { - static char msg[] = "Error decoding compressed text"; + const static char msg[] = "Error decoding compressed text"; png_charp text; png_size_t text_size; @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.15 January 5, 2007 + * Last changed in libpng 1.2.17 May 4, 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) @@ -877,7 +877,9 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr, png_textp text_ptr, textp->itxt_length = 0; #endif } +#if 0 /* appears to be redundant; */ info_ptr->text[info_ptr->num_text]= *textp; +#endif info_ptr->num_text++; png_debug1(3, "transferred text chunk %d\n", info_ptr->num_text); } @@ -1200,13 +1202,13 @@ png_set_asm_flags (png_structp png_ptr, png_uint_32 asm_flags) #ifdef PNG_MMX_CODE_SUPPORTED settable_mmx_flags = -#ifdef PNG_HAVE_ASSEMBLER_COMBINE_ROW +#ifdef PNG_HAVE_MMX_COMBINE_ROW PNG_ASM_FLAG_MMX_READ_COMBINE_ROW | #endif -#ifdef PNG_HAVE_ASSEMBLER_READ_INTERLACE +#ifdef PNG_HAVE_MMX_READ_INTERLACE PNG_ASM_FLAG_MMX_READ_INTERLACE | #endif -#ifdef PNG_HAVE_ASSEMBLER_READ_FILTER_ROW +#ifdef PNG_HAVE_MMX_READ_FILTER_ROW PNG_ASM_FLAG_MMX_READ_FILTER_SUB | PNG_ASM_FLAG_MMX_READ_FILTER_UP | PNG_ASM_FLAG_MMX_READ_FILTER_AVG | @@ -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_24 your_png_h_is_not_version_1_0_24; +typedef version_1_0_25rc1 your_png_h_is_not_version_1_0_25rc1; diff --git a/pngtrans.c b/pngtrans.c index 25f42c871..8cb4b8861 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -252,7 +252,7 @@ png_do_swap(png_row_infop row_info, png_bytep row) #endif #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED) -static PNG_CONST png_byte onebppswaptable[256] = { +const static PNG_CONST png_byte onebppswaptable[256] = { 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, @@ -287,7 +287,7 @@ static PNG_CONST png_byte onebppswaptable[256] = { 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF }; -static PNG_CONST png_byte twobppswaptable[256] = { +const static PNG_CONST png_byte twobppswaptable[256] = { 0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0, 0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0, 0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4, @@ -322,7 +322,7 @@ static PNG_CONST png_byte twobppswaptable[256] = { 0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF }; -static PNG_CONST png_byte fourbppswaptable[256] = { +const static PNG_CONST png_byte fourbppswaptable[256] = { 0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0, 0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71, @@ -652,10 +652,11 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp png_voidp PNGAPI png_get_user_transform_ptr(png_structp png_ptr) { - if (png_ptr == NULL) return (NULL); #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + if (png_ptr == NULL) return (NULL); return ((png_voidp)png_ptr->user_transform_ptr); -#endif +#else return (NULL); +#endif } #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ diff --git a/pngwutil.c b/pngwutil.c index e108c6106..314bea20d 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -523,9 +523,10 @@ png_write_IHDR(png_structp png_ptr, png_uint_32 width, png_uint_32 height, png_ptr->zlib_window_bits = 15; if (!(png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_METHOD)) png_ptr->zlib_method = 8; - deflateInit2(&png_ptr->zstream, png_ptr->zlib_level, + if (deflateInit2(&png_ptr->zstream, png_ptr->zlib_level, png_ptr->zlib_method, png_ptr->zlib_window_bits, - png_ptr->zlib_mem_level, png_ptr->zlib_strategy); + png_ptr->zlib_mem_level, png_ptr->zlib_strategy) != Z_OK) + png_error(png_ptr, "zlib failed to initialize compressor"); png_ptr->zstream.next_out = png_ptr->zbuf; png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size; /* libpng is not interested in zstream.data_type */ diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index fec284a4c..9a430264d 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 24) +set(PNGLIB_RELEASE 25) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -17,7 +17,8 @@ if(NOT WIN32) PATHS /usr/lib /usr/local/lib ) if(NOT M_LIBRARY) - message(STATUS "math library 'libm' not found - floating point support disabled") + message(STATUS + "math library 'libm' not found - floating point support disabled") endif(NOT M_LIBRARY) else(NOT WIN32) # not needed on windows @@ -27,6 +28,7 @@ endif(NOT WIN32) # COMMAND LINE OPTIONS option(PNG_SHARED "Build shared lib" YES) +option(PNG_STATIC "Build static lib" YES) option(PNG_TESTS "Build pngtest" YES) option(PNG_NO_CONSOLE_IO "FIXME" YES) option(PNG_NO_STDIO "FIXME" YES) @@ -61,16 +63,6 @@ set(PNG_LIB_NAME ${PNG_LIB_NAME}png${PNGLIB_MAJOR}${PNGLIB_MINOR}) # to distinguish between debug and release lib set(CMAKE_DEBUG_POSTFIX "d") -# append _static to static lib -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 @@ -95,13 +87,12 @@ set(libpng_sources set(pngtest_sources pngtest.c ) - - # SOME NEEDED DEFINITIONS add_definitions(-DZLIB_DLL) if(MSVC) - add_definitions(-DPNG_USE_PNGVCRD -DPNG_NO_MODULEDEF -D_CRT_SECURE_NO_DEPRECATE) + add_definitions(-DPNG_USE_PNGVCRD -DPNG_NO_MODULEDEF + -D_CRT_SECURE_NO_DEPRECATE) set(libpng_sources ${libpng_sources} pngvcrd.c ) @@ -150,11 +141,14 @@ include_directories(${PNG_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) if(PNG_SHARED) add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) -else(PNG_SHARED) - add_library(STATIC ${libpng_sources}) + target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) endif(PNG_SHARED) +if(PNG_STATIC) +# does not work without changing name + set(PNG_LIB_NAME_STATIC ${PNG_LIB_NAME}_static) + add_library(${PNG_LIB_NAME_STATIC} STATIC ${libpng_sources}) +endif(PNG_STATIC) -target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) if(PNG_SHARED AND WIN32) set_target_properties(${PNG_LIB_NAME} PROPERTIES DEFINE_SYMBOL PNG_BUILD_DLL) endif(PNG_SHARED AND WIN32) @@ -169,25 +163,39 @@ endif(PNG_TESTS) # CREATE PKGCONFIG FILES # we use the same files like ./configure, so we have to set its vars -set(prefix ${CMAKE_INSTALL_PREFIX}/bin) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin) +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in ${PNG_BINARY_DIR}/libpng.pc) -configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in ${PNG_BINARY_DIR}/libpng-config) -configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc) -configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config) +configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in + ${PNG_BINARY_DIR}/libpng.pc) +configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in + ${PNG_BINARY_DIR}/libpng-config) +configure_file(${PNG_SOURCE_DIR}/scripts/libpng.pc.in + ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc) +configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in + ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config) + +# SET UP LINKS +set_target_properties(${PNG_LIB_NAME} PROPERTIES +# VERSION 0.${PNGLIB_RELEASE}.1.0.25rc1 + VERSION 0.${PNGLIB_RELEASE}.0 + SOVERSION 0 + CLEAN_DIRECT_OUTPUT 1) +set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES + OUTPUT_NAME ${PNG_LIB_NAME} + CLEAN_DIRECT_OUTPUT 1) # INSTALL -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_targets(/lib ${PNG_LIB_NAME} ${PNG_LIB_NAME_STATIC}) +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) +install(FILES ${PNG_BINARY_DIR}/libpng-config DESTINATION bin) +install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc DESTINATION lib/pkgconfig) install(FILES ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config DESTINATION bin) # what's with libpng.txt and all the extra files? diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 5c76f2a9c..60297c8cc 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.0.24 +version=1.0.25rc1 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 772e03cb8..127010325 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.24 +Version: 1.0.25rc1 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 2adde4f2e..ccfcf0b07 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.24 +Version: 1.0.25rc1 Libs: -L${libdir} -lpng10 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 87032328d..b9cd2619f 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index c99da8849..c77699179 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 67435f182..8886eb35c 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.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 0fc237581..1f8c89b65 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index e909d6aac..af8160be5 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.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index a0126f599..8a7132752 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 0732f309a..02a11d891 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 024d1fc6e..88de510a9 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 683b4868d..7dc154ad1 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 8f05c864c..ab3f7e9f7 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.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 8d3a36f2c..4bd840ccb 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 24f9032cb..4ad42ac33 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.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 22967e104..c898a5bc3 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 0ce401101..37469dcdd 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.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index e2d6458b2..9b3af44fb 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.24 +SHLIB_MINOR= 1.0.25rc1 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 407811100..81c98bd51 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.24 +SHLIB_MINOR= 1.0.25rc1 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 100add520..d3d291e1e 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 8715eaa87..218614a0f 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.24 +SHLIB_MINOR= 1.0.25rc1 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 884da515c..d000fd51b 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 4b2a5b5ef..03a2676e5 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 872332f88..e6d297c13 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 6fb32cb32..2f3d099e3 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 565025a89..93e5bdd4d 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng10 PNGMAJ = 0 -PNGMIN = 1.0.24 +PNGMIN = 1.0.25rc1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index ff2ec59ea..dd2ee5d52 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.0.24 +; Version 1.0.25rc1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 08ce01224..03f499fde 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.0.24 +;Version 1.0.25rc1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |