diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2007-03-05 23:48:36 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2009-04-06 16:12:40 -0500 |
| commit | 11cf76edb382aaf22ea34b20e4ceb2c61a556c98 (patch) | |
| tree | caca3858c285acf0f1671c0fef10c7404d156647 | |
| parent | 8833ad415c4b103529777ded8e122a1fb6447722 (diff) | |
| download | libpng-11cf76edb382aaf22ea34b20e4ceb2c61a556c98.tar.gz | |
Imported from libpng-1.2.17beta1.tarv1.2.17beta1
47 files changed, 164 insertions, 147 deletions
@@ -1,48 +1,49 @@ -Libpng 1.2.16 - January 31, 2007 +Libpng 1.2.17beta1 - March 6, 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.2.16.tar.gz - libpng-1.2.16.tar.bz2 + libpng-1.2.17beta1.tar.gz + libpng-1.2.17beta1.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.16-no-config.tar.gz - libpng-1.2.16-no-config.tar.bz2 + libpng-1.2.17beta1-no-config.tar.gz + libpng-1.2.17beta1-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1216.zip - lpng1216.tar.bz2 + lp1217b01.zip + lp1217b01.tar.bz2 Project files - libpng-1.2.16-project-netware.zip - libpng-1.2.16-project-wince.zip + libpng-1.2.17beta1-project-netware.zip + libpng-1.2.17beta1-project-wince.zip Other information: - libpng-1.2.16-README.txt - libpng-1.2.16-KNOWNBUGS.txt - libpng-1.2.16-LICENSE.txt - libpng-1.2.16-Y2K-compliance.txt + libpng-1.2.17beta1-README.txt + libpng-1.2.17beta1-KNOWNBUGS.txt + libpng-1.2.17beta1-LICENSE.txt + libpng-1.2.17beta1-Y2K-compliance.txt -Changes since the last public release (1.2.15): - -version 1.2.16 [January 31, 2007] - - Fix bugs in makefile.nommx - Revised scripts/CMakeLists.txt +Changes since the last public release (1.2.16): +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. + 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 @@ -1480,7 +1480,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 (16) in configuration files. + Fixed typo (17) in configuration files. version 1.2.9beta7 [March 7, 2006] Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am @@ -1689,6 +1689,10 @@ 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. + 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.2.16 - January 31, 2007 +Installing libpng version 1.2.17beta1 - March 6, 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.2.16" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.17beta1" 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 libpng12.so.0.1.2.16) + gcc, creates libpng12.so.0.1.2.17beta1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.16) + (gcc, creates libpng12.so.0.1.2.17beta1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.16, + (gcc, creates libpng12.so.0.1.2.17beta1, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.16 + (gcc, creates libpng12.so.0.1.2.17beta1 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 libpng12.so.0.1.2.16) + creates libpng12.so.0.1.2.17beta1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.16) + creates libpng12.so.0.1.2.17beta1) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.16) + creates libpng12.so.0.1.2.17beta1) 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.2.16 +Known bugs in libpng version 1.2.17beta1 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,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.2.16, January 31, 2007, are -Copyright (c) 2004, 2006 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.2.17beta1, March 6, 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 +March 6, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.16 - January 31, 2007 (shared library 12.0) +README for libpng version 1.2.17beta1 - March 6, 2007 (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. @@ -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 libpng12.so.0.1.2.16) + gcc, creates libpng12.so.0.1.2.17beta1) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.16) + (gcc, creates libpng12.so.0.1.2.17beta1) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.16, + (gcc, creates libpng12.so.0.1.2.17beta1, 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 libpng12.so.0.1.2.16) + (gcc, creates libpng12.so.0.1.2.17beta1) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.16) + (gcc, creates libpng12.so.0.1.2.17beta1) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.16) + (gcc, creates libpng12.so.0.1.2.17beta1) 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 + March 6, 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.2.16 are Y2K compliant. It is my belief that earlier + upward through 1.2.17beta1 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.2.16. +# Generated by GNU Autoconf 2.61 for libpng 1.2.17beta1. # # 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.2.16' -PACKAGE_STRING='libpng 1.2.16' +PACKAGE_VERSION='1.2.17beta1' +PACKAGE_STRING='libpng 1.2.17beta1' 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.2.16 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.17beta1 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.2.16:";; + short | recursive ) echo "Configuration of libpng 1.2.17beta1:";; 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.2.16 +libpng configure 1.2.17beta1 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.2.16, which was +It was created by libpng $as_me 1.2.17beta1, 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.2.16' + VERSION='1.2.17beta1' cat >>confdefs.h <<_ACEOF @@ -2440,10 +2440,10 @@ fi -PNGLIB_VERSION=1.2.16 +PNGLIB_VERSION=1.2.17beta1 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 -PNGLIB_RELEASE=16 +PNGLIB_RELEASE=17 @@ -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.2.16, which was +This file was extended by libpng $as_me 1.2.17beta1, 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.2.16 +libpng config.status 1.2.17beta1 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 a16bfc760..f56f1544c 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.16], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.17beta1], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.16 +PNGLIB_VERSION=1.2.17beta1 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 -PNGLIB_RELEASE=16 +PNGLIB_RELEASE=17 dnl End of version number stuff diff --git a/libpng-1.2.16.txt b/libpng-1.2.17beta1.txt index bc8aa76e8..d41170e13 100644 --- a/libpng-1.2.16.txt +++ b/libpng-1.2.17beta1.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.16 - January 31, 2007 + libpng version 1.2.17beta1 - March 6, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -2917,13 +2917,13 @@ application: IX. Y2K Compliance in libpng -January 31, 2007 +March 6, 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.2.16 are Y2K compliant. It is my belief that earlier +upward through 1.2.17beta1 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 "March 6, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.16 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17beta1 .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.2.16 - January 31, 2007 + libpng version 1.2.17beta1 - March 6, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2005 Glenn Randers-Pehrson @@ -3327,13 +3327,13 @@ application: .SH IX. Y2K Compliance in libpng -January 31, 2007 +March 6, 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.2.16 are Y2K compliant. It is my belief that earlier +upward through 1.2.17beta1 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 @@ -3515,6 +3515,7 @@ 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 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 @@ -3570,7 +3571,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.16 - January 31, 2007: +Libpng version 1.2.17beta1 - March 6, 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). @@ -3591,7 +3592,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.16, January 31, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.17beta1, March 6, 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 @@ -3690,7 +3691,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 31, 2007 +March 6, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index ec4813bad..9d26ed691 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "January 31, 2007" +.TH LIBPNGPF 3 "March 6, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.16 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17beta1 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "January 31, 2007" +.TH PNG 5 "March 6, 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_2_16 Your_png_h_is_not_version_1_2_16; +typedef version_1_2_17beta1 Your_png_h_is_not_version_1_2_17beta1; /* 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.2.16 - January 31, 2007\n\ + return ((png_charp) "\n libpng version 1.2.17beta1 - March 6, 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.2.16 - January 31, 2007 + * libpng version 1.2.17beta1 - March 6, 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.2.16 - January 31, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.17beta1 - March 6, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -143,6 +143,7 @@ * 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 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 +173,8 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.16, January 31, 2007, are - * Copyright (c) 2004, 2007 Glenn Randers-Pehrson, and are + * libpng versions 1.2.6, August 15, 2004, through 1.2.17beta1, March 6, 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 +285,13 @@ * Y2K compliance in libpng: * ========================= * - * January 31, 2007 + * March 6, 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.2.16 are Y2K compliant. It is my belief that earlier + * upward through 1.2.17beta1 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 +347,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.16" +#define PNG_LIBPNG_VER_STRING "1.2.17beta1" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.16 - January 31, 2007 (header)\n" + " libpng version 1.2.17beta1 - March 6, 2007 (header)\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -356,11 +357,11 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 2 -#define PNG_LIBPNG_VER_RELEASE 16 +#define PNG_LIBPNG_VER_RELEASE 17 /* 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 +378,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_BETA /* 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 10216 /* 1.2.16 */ +#define PNG_LIBPNG_VER 10217 /* 1.2.17 */ #ifndef PNG_VERSION_INFO_ONLY /* include the compression library's header */ @@ -1394,7 +1395,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_16; +typedef png_structp version_1_2_17beta1; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.16 - January 31, 2007 + * libpng version 1.2.17beta1 - March 6, 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) @@ -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 March 6, 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); } @@ -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_2_16 your_png_h_is_not_version_1_2_16; +typedef version_1_2_17beta1 your_png_h_is_not_version_1_2_17beta1; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 7db0f45f9..9bffe8617 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -5,7 +5,7 @@ project(PNG) set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 2) -set(PNGLIB_RELEASE 16) +set(PNGLIB_RELEASE 17) 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.2.17beta1 + 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 231e51297..234121a21 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.16 +version=1.2.17beta1 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index b214564c6..0135548f3 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.16 +Version: 1.2.17beta1 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 60b837c5e..3b3a556f1 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.16 +Version: 1.2.17beta1 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index dbd80985b..3bed75cc1 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 4c3287ef0..2298242dd 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 42f04bc39..82ec5d8fe 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.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 2b2519b21..e097799f2 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index a7acdf4e3..2b1feed72 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 965a9b54a..19a8e717d 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 0c49ea589..bf8dfee64 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 07203f39b..daa3406de 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index cdd5b93d0..225a97127 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 1e4cbe207..1bc856549 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.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 99b08f7e0..b1d6c52be 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 5c2eb4c5c..f8341ffce 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.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index deccdda7b..118481b65 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 84bed8ab8..30108bbe6 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index becd005dc..556f31ca8 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.16 +SHLIB_MINOR= 1.2.17beta1 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 e2aedf7fd..1d7bef5f5 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.16 +SHLIB_MINOR= 1.2.17beta1 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 f1d0f6806..22c682937 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index f67436b08..357396f7c 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.16 +SHLIB_MINOR= 1.2.17beta1 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 fe98174d6..51a49f983 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 55d2fb3dc..d27e1ab27 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 79e2387e4..8e3c6e974 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 21dbf0e1c..a5dc3bcc4 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 0c49a1138..91afa5123 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.16 +PNGMIN = 1.2.17beta1 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 20f5efded..918dacb94 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.16 +; Version 1.2.17beta1 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index eb8ad7a66..1882312ae 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.16 +;Version 1.2.17beta1 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |