diff options
49 files changed, 127 insertions, 147 deletions
@@ -1,87 +1,53 @@ -Libpng 1.2.20rc6 - September 3, 2007 +Libpng 1.2.20 - September 8, 2007 -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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.20rc6.tar.gz - libpng-1.2.20rc6.tar.bz2 + libpng-1.2.20.tar.gz + libpng-1.2.20.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.20rc6-no-config.tar.gz - libpng-1.2.20rc6-no-config.tar.bz2 + libpng-1.2.20-no-config.tar.gz + libpng-1.2.20-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1220r06.zip - lp1220r06.tar.bz2 + lpng1220.zip + lpng1220.tar.bz2 Project files - libpng-1.2.20rc6-project-netware.zip - libpng-1.2.20rc6-project-wince.zip + libpng-1.2.20-project-netware.zip + libpng-1.2.20-project-wince.zip Other information: - libpng-1.2.20rc6-README.txt - libpng-1.2.20rc6-KNOWNBUGS.txt - libpng-1.2.20rc6-LICENSE.txt - libpng-1.2.20rc6-Y2K-compliance.txt + libpng-1.2.20-README.txt + libpng-1.2.20-KNOWNBUGS.txt + libpng-1.2.20-LICENSE.txt + libpng-1.2.20-Y2K-compliance.txt Changes since the last public release (1.2.19): -version 1.2.20beta01 [August 19, 2007] - Fixed problem with compiling pnggccrd.c on Intel-Apple platforms. +version 1.2.20 [September 8, 2007] + Added PNG_NO_ERROR_TEXT feature, with demo in contrib/pngminim Removed define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */ because it caused some trouble. - -version 1.2.20beta02 [August 20, 2007] - Avoid compiling pnggccrd.c on Intel-Apple platforms. - -version 1.2.20beta03 [August 20, 2007] - Added "/D PNG_NO_MMX_CODE" to the non-mmx builds of projects/visualc6 - and visualc71. - -version 1.2.20beta04 [August 21, 2007] - Revised pngvcrd.c for improved efficiency (Steve Snyder). - -version 1.2.20rc1 [August 23, 2007] - Revised pngconf.h to set PNG_NO_MMX_CODE for gcc-3.x compilers. - -version 1.2.20rc2 [August 27, 2007] Revised scripts/CMakeLists.txt - Revised #ifdefs to ensure one and only one of pnggccrd.c, pngvcrd.c, - or part of pngrutil.c is selected. - -version 1.2.20rc3 [September 3, 2007] Remove a little more code in pngwutil.c when PNG_NO_WRITE_FILTER is selected. Added /D _CRT_SECURE_NO_WARNINGS to visual6c and visualc71 projects. - Compile png_mmx_support() in png.c even when PNG_NO_MMX_CODE is defined. - Restored a "superfluous" #ifdef that was removed from 1.2.20rc2 pnggccrd.c, - breaking the png_mmx_support() function. - -version 1.2.20rc4 [September 1, 2007] Removed Intel contributions (MMX, Optimized C). -version 1.2.20rc5 [September 2, 2007] - Restored configure and Makefile.in to rc3 and put a snippet of code in - pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection - -version 1.2.20rc6 [September 3, 2007] - Fixed bugs in scripts/CMakeLists.txt - Removed pngvcrd.c references from msvc projects. - 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 @@ -1933,10 +1933,13 @@ version 1.2.20rc5 [September 2, 2007] Restored configure and Makefile.in to rc3 and put a snippet of code in pnggccrd.c, to ensure configure makes the same PNG_NO_MMX_CODE selection -version 1.2.20rc6 [September 3, 2007] +version 1.2.20rc6 [September 2, 2007] Fixed bugs in scripts/CMakeLists.txt Removed pngvcrd.c references from msvc projects. +version 1.0.28 and 1.2.20 [September 8, 2007] + Removed "(NO READ SUPPORT)" from png_get_header_version() string. + 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.20rc6 - September 3, 2007 +Installing libpng version 1.2.20 - September 8, 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.20rc6" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.20" or "lpng109" and "zlib-1.2.1" or "zlib121") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: @@ -101,9 +101,9 @@ include CMakeLists.txt => "cmake" script makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.20rc6) + gcc, creates libpng12.so.0.1.2.20) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20rc6) + (gcc, creates libpng12.so.0.1.2.20) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -125,14 +125,14 @@ include makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.20rc6) + creates libpng12.so.0.1.2.20) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.20rc6) + creates libpng12.so.0.1.2.20) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.20rc6) + creates libpng12.so.0.1.2.20) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.20rc6) + creates libpng12.so.0.1.2.20) 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.20rc6 +Known bugs in libpng version 1.2.20 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -10,3 +10,13 @@ Known bugs in libpng version 1.2.20rc6 fails to install symbolic links libpng12.so => libpng12.so.0.1.2.9betaN that are generated by the custom makefiles. + +3. September 4, 2007: There is a report that pngtest crashes on MacOS 10. + + STATUS: workarounds are + 1) Compile without optimization (crashes are observed with + -arch i386 and -O2 or -O3, using gcc-4.0.1. + 2) Compile pngtest.c with PNG_DEBUG defined (the bug goes away if + you try to look at it). + 3) Ignore the crash. The library itself seems to be OK. + @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.20rc6, September 3, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.20, September 8, 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 -September 3, 2007 +September 8, 2007 @@ -1,4 +1,4 @@ -README for libpng version 1.2.20rc6 - September 3, 2007 (shared library 12.0) +README for libpng version 1.2.20 - September 8, 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.20rc6) + gcc, creates libpng12.so.0.1.2.20) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20rc6) + (gcc, creates libpng12.so.0.1.2.20) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.20rc6, + (gcc, creates libpng12.so.0.1.2.20, 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.20rc6) + (gcc, creates libpng12.so.0.1.2.20) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.20rc6) + (gcc, creates libpng12.so.0.1.2.20) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.20rc6) + (gcc, creates libpng12.so.0.1.2.20) 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: ========================= - September 3, 2007 + September 8, 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.20rc6 are Y2K compliant. It is my belief that earlier + upward through 1.2.20 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.20rc6. +# Generated by GNU Autoconf 2.61 for libpng 1.2.20. # # 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.20rc6' -PACKAGE_STRING='libpng 1.2.20rc6' +PACKAGE_VERSION='1.2.20' +PACKAGE_STRING='libpng 1.2.20' 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.20rc6 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.20 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.20rc6:";; + short | recursive ) echo "Configuration of libpng 1.2.20:";; 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.20rc6 +libpng configure 1.2.20 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.20rc6, which was +It was created by libpng $as_me 1.2.20, 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.20rc6' + VERSION='1.2.20' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.20rc6 +PNGLIB_VERSION=1.2.20 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=20 @@ -21282,7 +21282,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.20rc6, which was +This file was extended by libpng $as_me 1.2.20, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.20rc6 +libpng config.status 1.2.20 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 dbc9c1e5d..e8393b7a2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.20rc6], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.20], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.20rc6 +PNGLIB_VERSION=1.2.20 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=20 diff --git a/libpng-1.2.20rc6.txt b/libpng-1.2.20.txt index 730a21aff..dba113f83 100644 --- a/libpng-1.2.20rc6.txt +++ b/libpng-1.2.20.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.20rc6 - September 3, 2007 + libpng version 1.2.20 - September 8, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2796,13 +2796,13 @@ application: IX. Y2K Compliance in libpng -September 3, 2007 +September 8, 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.20rc6 are Y2K compliant. It is my belief that earlier +upward through 1.2.20 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 "September 3, 2007" +.TH LIBPNG 3 "September 8, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20 .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.20rc6 - September 3, 2007 + libpng version 1.2.20 - September 8, 2007 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3206,13 +3206,13 @@ application: .SH IX. Y2K Compliance in libpng -September 3, 2007 +September 8, 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.20rc6 are Y2K compliant. It is my belief that earlier +upward through 1.2.20 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 @@ -3466,7 +3466,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.20rc6 - September 3, 2007: +Libpng version 1.2.20 - September 8, 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). @@ -3487,7 +3487,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.20rc6, September 3, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.20, September 8, 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 @@ -3586,7 +3586,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 3, 2007 +September 8, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f434f3bfc..0a3ed69f3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 3, 2007" +.TH LIBPNGPF 3 "September 8, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20rc6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.20 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "September 3, 2007" +.TH PNG 5 "September 8, 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_20rc6 Your_png_h_is_not_version_1_2_20rc6; +typedef version_1_2_20 Your_png_h_is_not_version_1_2_20; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -693,7 +693,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.20rc6 - September 3, 2007\n\ + return ((png_charp) "\n libpng version 1.2.20 - September 8, 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"); @@ -729,7 +729,7 @@ png_get_header_version(png_structp png_ptr) /* Returns longer string containing both version and date */ png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ return ((png_charp) PNG_HEADER_VERSION_STRING -#ifdef PNG_READ_SUPPORTED +#ifndef PNG_READ_SUPPORTED " (NO READ SUPPORT)" #endif "\n"); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.20rc6 - September 3, 2007 + * libpng version 1.2.20 - September 8, 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.20rc6 - September 3, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.20 - September 8, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -189,7 +189,7 @@ * If you modify libpng you may insert additional notices immediately following * this sentence. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.20rc6, September 3, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.20, September 8, 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: @@ -301,13 +301,13 @@ * Y2K compliance in libpng: * ========================= * - * September 3, 2007 + * September 8, 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.20rc6 are Y2K compliant. It is my belief that earlier + * upward through 1.2.20 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 @@ -363,9 +363,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.20rc6" +#define PNG_LIBPNG_VER_STRING "1.2.20" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.20rc6 - September 3, 2007\n" + " libpng version 1.2.20 - September 8, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -377,7 +377,7 @@ /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 6 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -394,7 +394,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1412,7 +1412,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_20rc6; +typedef png_structp version_1_2_20; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.20rc6 - September 3, 2007 + * libpng version 1.2.20 - September 8, 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) diff --git a/pngerror.c b/pngerror.c index a6b23429f..159c5d42c 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.2.20 September 3, 2007 + * Last changed in libpng 1.2.20 September 8, 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) diff --git a/pngpread.c b/pngpread.c index 3c35ac49a..66b31bcd1 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.2.20 September 3, 2007 + * Last changed in libpng 1.2.20 September 8, 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) @@ -1548,4 +1548,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_20rc6 your_png_h_is_not_version_1_2_20rc6; +typedef version_1_2_20 your_png_h_is_not_version_1_2_20; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 0e95876fc..41667653f 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -169,7 +169,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.20rc6 +# VERSION 0.${PNGLIB_RELEASE}.1.2.20 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index e5698d324..60bfcd954 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.20rc6 +version=1.2.20 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 7e90c54ce..1b87da164 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.20rc6 +Version: 1.2.20 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index ea7c9521e..17f9bc258 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.20rc6 +Version: 1.2.20 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 0cf36cad2..0b5e4da05 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 81d390080..747fb3995 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 651b017ec..0646eb8de 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.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 99c3651ae..525534c03 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index d3b1e0b06..3e5996dc4 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 8f1c92886..5ca13827b 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 5becd107b..9c7791c1d 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 07344d72e..aa42c1adf 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index e806b6abb..a570b583e 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -14,7 +14,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 2819cbf77..2a7450eed 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.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 4ebfbb70d..1e2869b48 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index c7747042f..5fed4d27e 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.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 0f1abe653..31f70f698 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 6006ac9b5..1d1dfee45 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -74,7 +74,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index e8c2b909e..fbdb5e353 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.20rc6 +SHLIB_MINOR= 1.2.20 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index f6cd2fe00..d010c9027 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.20rc6 +SHLIB_MINOR= 1.2.20 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index dbd885d0c..bbb7ed67c 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 609d98f05..187f6fce2 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.20rc6 +SHLIB_MINOR= 1.2.20 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index 0b29c1395..5df252337 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 2c9723b18..9f0dfbbc7 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index da2926116..4eb1816e8 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 8d7a44013..8f1633753 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 5afb01293..3398d95da 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index c61d8fb8e..ec4d49da6 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.20rc6 +PNGMIN = 1.2.20 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 926234507..6cc2fc2ce 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.20rc6 +; Version 1.2.20 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" @@ -224,7 +224,6 @@ EXPORTS png_set_expand_gray_1_2_4_to_8 ; These are not present when libpng is compiled with PNG_NO_GLOBAL_ARRAYS - png_libpng_ver png_pass_start png_pass_inc png_pass_ystart diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 9c5728498..58a826d63 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.20rc6 +;Version 1.2.20 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 @@ -180,7 +180,9 @@ EXPORTS png_write_init_2 @167 png_access_version_number @168 ; png_sig_bytes @169 - png_libpng_ver @170 +; Removed from version 1.2.20 +; png_libpng_ver @170 +; png_init_io @171 png_convert_to_rfc1123 @172 png_set_invalid @173 |