From 249bd44ebc085352278b68b71a0e45eb2693c954 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 18 Aug 2007 05:34:04 -0500 Subject: [PATCH] Imported from libpng-1.2.19.tar --- ANNOUNCE | 152 ++++------------------ CHANGES | 3 + INSTALL | 20 +-- KNOWNBUG | 2 +- LICENSE | 4 +- README | 14 +- Y2KINFO | 4 +- configure | 22 ++-- configure.ac | 4 +- contrib/pngminim/decoder/pngusr.h | 1 + libpng-1.2.19rc6.txt => libpng-1.2.19.txt | 6 +- libpng.3 | 18 +-- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 6 +- png.h | 22 ++-- pngconf.h | 10 +- pngerror.c | 2 +- pnggccrd.c | 2 +- pngpread.c | 2 +- pngread.c | 2 +- pngrtran.c | 18 ++- pngrutil.c | 2 +- pngtest.c | 2 +- pngvcrd.c | 2 +- pngwutil.c | 2 +- scripts/CMakeLists.txt | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc-configure.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/makefile.solaris-x86 | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 56 files changed, 152 insertions(+), 236 deletions(-) rename libpng-1.2.19rc6.txt => libpng-1.2.19.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 88a14382..713f4b60 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,203 +1,99 @@ -Libpng 1.2.19rc6 - August 15, 2007 +Libpng 1.2.19 - August 18, 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.19rc6.tar.gz - libpng-1.2.19rc6.tar.bz2 + libpng-1.2.19.tar.gz + libpng-1.2.19.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.19rc6-no-config.tar.gz - libpng-1.2.19rc6-no-config.tar.bz2 + libpng-1.2.19-no-config.tar.gz + libpng-1.2.19-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1219r06.zip - lp1219r06.tar.bz2 + lpng1219.zip + lpng1219.tar.bz2 Project files - libpng-1.2.19rc6-project-netware.zip - libpng-1.2.19rc6-project-wince.zip + libpng-1.2.19-project-netware.zip + libpng-1.2.19-project-wince.zip Other information: - libpng-1.2.19rc6-README.txt - libpng-1.2.19rc6-KNOWNBUGS.txt - libpng-1.2.19rc6-LICENSE.txt - libpng-1.2.19rc6-Y2K-compliance.txt + libpng-1.2.19-README.txt + libpng-1.2.19-KNOWNBUGS.txt + libpng-1.2.19-LICENSE.txt + libpng-1.2.19-Y2K-compliance.txt Changes since the last public release (1.2.18): -version 1.2.19beta1 [May 18, 2007] +version 1.2.19 [August 18, 2007] + Changed "const static" to "static PNG_CONST" everywhere, mostly undoing change of libpng-1.2.17beta2. Changed other "const" to "PNG_CONST" - -version 1.2.19beta2 [May 18, 2007] Fixed png_do_expand() to only use the appropriate bits of tRNS value. - -version 1.2.19beta3 [May 20, 2007] + Fixed png_handle_tRNS() to only use the appropriate bits of tRNS value. Add some "png_byte" typecasts in png_check_keyword(). Write new_key instead of key in zTXt chunk. - -version 1.2.19beta4 [May 21, 2007] Add png_snprintf() function and use it in place of sprint() for improved defense against buffer overflows. - -version 1.2.19beta5 [May 21, 2007] - Fixed png_handle_tRNS() to only use the appropriate bits of tRNS value. - Changed handling of more unused parameters, to avoid compiler warnings. + Changed handling of some unused parameters, to avoid compiler warnings. Removed some PNG_CONST in pngwutil.c to avoid compiler warnings. - -version 1.2.19beta6 [May 22, 2007] Added some #ifdef PNG_MMX_CODE_SUPPORTED where needed in pngvcrd.c - Added a special "_MSC_VER" case that defines png_snprintf to _snprintf - -version 1.2.19beta7 [May 22, 2007] - Squelched png_squelch_warnings() in pnggccrd.c and added an - #ifdef PNG_MMX_CODE_SUPPORTED block around the declarations that caused - the warnings that png_squelch_warnings was squelching. - -version 1.2.19beta8 [May 22, 2007] + Squelched png_squelch_warnings() in pnggccrd.c; Use "__attribute__((used))" + instead. Removed __MMX__ from test in pngconf.h. - -version 1.2.19beta9 [May 23, 2007] - Made png_squelch_warnings() available via PNG_SQUELCH_WARNINGS macro. - Revised png_squelch_warnings() so it might work. Updated makefile.sgcc and makefile.solaris; added makefile.solaris-x86. - -version 1.2.19beta10 [May 24, 2007] - Resquelched png_squelch_warnings(), use "__attribute__((used))" instead. - -version 1.2.19beta11 [May 28, 2007] Return 0 from png_get_sPLT() and png_get_unknown_chunks() if png_ptr is NULL; changed three remaining instances of png_strcpy() to png_strncpy() (David Hill). Make test for NULL row_buf at the beginning of png_do_read_transformations unconditional. - -version 1.2.19beta12 [May 28, 2007] - Revised pnggccrd.c. - -version 1.2.19beta13 [June 14, 2007] Prefer PNG_USE_PNGVCRD when _MSC_VER is defined in pngconf.h - -version 1.2.19beta14 [June 16, 2007] - Fix bug with handling of 16-bit transparency, introduced in 1.2.19beta2 - -version 1.2.19beta15 [June 17, 2007] Revised pnggccrd.c. - -version 1.2.19beta16 [June 18, 2007] - Revised pnggccrd.c again. Updated contrib/gregbook. Changed '#include "pnggccrd.c"' to 'include "$srcdir/pnggccrd.c"' in configure.ac - -version 1.2.19beta17 [June 19, 2007] Revised many of the makefiles, to set -DPNG_NO_MMX_CODE where needed and to not use -O3 unless -DPNG_NO_MMX_CODE is also set. - -version 1.2.19beta18 [June 23, 2007] - Replaced some C++ style comments with C style comments in pnggccrd.c. Copied optimized C code from pnggccrd.c to pngrutil.c, removed dependency on pnggccrd.o from many makefiles. Added sl and dylib to list of extensions be installed by Makefile.am - -version 1.2.19beta19 [June 28, 2007] Fixed testing PNG_RGB_TO_GRAY_ERR & PNG_RGB_TO_GRAY_WARN in pngrtran.c - More cleanup of pnggccrd.c and pngvcrd.c - -version 1.2.19beta20 [June 29, 2007] + Revised pngvcrd.c. Rebuilt Makefile.in and configure using libtool-1.5.24. - Fixed typo in pnggccrd.c - -version 1.2.19beta21 [June 30, 2007] - More revision of pnggccrd.c Added "test" target to Makefile.in and Makefile.am - -version 1.2.19beta22 [July 3, 2007] Added info about pngrutil/pnggccrd/pngvcrd to png_get_header_version() - Fix type definition of dummy_value_a, b in pnggccrd.c - -version 1.2.19beta23 [July 10, 2007] - Revert change to type definition of dummy_value_a, b in pnggccrd.c - Make sure __PIC__ is defined in pnggccrd.c when PIC is defined. - Make PNG_NO_MMX_CODE the default on x86_64 GNUC platforms. - -version 1.2.19beta24 [July 14, 2007] - Added PNG_NO_READ_FILTER, PNG_NO_WRITE_FILTER, PNG_NO_WARNING macros. + Added PNG_NO_WRITE_FILTER and PNG_NO_WARNING macros. Added contrib/pngminim to demonstrate building minimal encoder and decoder - -version 1.2.19beta25 [July 15, 2007] - Removed the new PNG_NO_READ_FILTER macro since it would make the library - unable to read valid PNG files, and filtering is at the heart of the - PNG format. - -version 1.2.19beta26 [July 16, 2007] Changed "png_free(str)" to "png_free(png_ptr,str)" in pngrutil.c WinCE code (Yves Piguet). This bug was introduced in libpng-1.2.14. Updated scripts/CMakeLists.txt - Relocated a misplaced #endif in pnggccrd.c - -version 1.2.19beta27 [July 17, 2007] Fixed incorrect stride and number of bytes copied (was 4 instead of 6 bytes) in the cleanup loop of pnggccrd.c and pngvcrd.c for handling the end of 48-bit interlaced rows (Glenn R-P). - -version 1.2.19beta28 [July 19, 2007] - Removed requirement for gcc-4.1 or better to use PNG_HAVE_MMX_FILTER_ROW - on x86_64 platforms Added png_warning() in pngrutil.c for short iCCP, iTXt, sPLT, or zTXT chunks. Revised pngtest.c so warnings are displayed regardless of PNG_NO_STDIO. - -version 1.2.19beta30 [July 26, 2007] - Revised pnggccrd.c - -version 1.2.19beta31 [July 27, 2007] - Fix typos in pnggccrd.c - -version 1.2.19beta32 [August 15, 2007] Disable PNG_MMX_CODE_SUPPORTED when PNG_ASSEMBLER_CODE_SUPPORTED is off. - Enable PNG_MMX_READ_FILTER_* by default (they were inadvertently disabled in - libpng-1.2.19beta23). - Fix some debugging statements in pnggccrd.c and pngrutil.c Added information about disabling the MMX code in libpng documentation. - -version 1.0.27rc2 and 1.2.19rc2 [August 4, 2007] Removed some "#if 0" blocks. Made a global struct local in pngvcrd.c to make it thread safe. + Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. + Revise handling of png_strtod in recent versions of WINCE Issue a png_error() if application attempts to transform a row tht has not been initialized. -version 1.0.27rc3 and 1.2.19rc3 [August 9, 2007] - Slightly revised pngvcrd.c - -version 1.0.27rc4 and 1.2.19rc4 [August 9, 2007] - Revised pnggccrd.c debugging change of rc1, which was broken. - Revised scripts/CMakeLists.txt - Change default to PNG_NO_GLOBAL_ARRAYS for MSVC. - Turn off PNG_FLAG_ROW_INIT flag when setting transforms that expand pixels. - -version 1.0.27rc5 and 1.2.19rc5 [August 10, 2007] - Fix typo (missing '"') in pnggccrd.c - Revise handling of png_strtod in recent versions of WINCE - -version 1.0.27rc6 and 1.2.19rc6 [August 15, 2007] - Fix typo (missing ',') in contrib/gregbook/readpng2.c - Undid row initialization error exit added to rc2 and rc4. - 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 diff --git a/CHANGES b/CHANGES index 8036f9c4..cb7b46a6 100644 --- a/CHANGES +++ b/CHANGES @@ -1892,6 +1892,9 @@ version 1.0.27rc6 and 1.2.19rc6 [August 15, 2007] Fix typo (missing ',') in contrib/gregbook/readpng2.c Undid row initialization error exit added to rc2 and rc4. +version 1.0.27 and 1.2.19 [August 18, 2007] + Conditionally restored row initialization error exit. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/INSTALL b/INSTALL index 390c489a..95f6c89f 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.19rc6 - August 15, 2007 +Installing libpng version 1.2.19 - August 18, 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.19rc6" or "lpng109" and "zlib-1.2.1" +might be called "libpng-1.2.19" 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.19rc6) + gcc, creates libpng12.so.0.1.2.19) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc6) + (gcc, creates libpng12.so.0.1.2.19) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc6, + (gcc, creates libpng12.so.0.1.2.19, uses assembler code tuned for Intel MMX platform) makefile.nommx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc6 + (gcc, creates libpng12.so.0.1.2.19 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,14 +131,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.19rc6) + creates libpng12.so.0.1.2.19) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc6) + creates libpng12.so.0.1.2.19) makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc, - creates libpng12.so.0.1.2.19rc6) + creates libpng12.so.0.1.2.19) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.19rc6) + creates libpng12.so.0.1.2.19) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/KNOWNBUG b/KNOWNBUG index 2acfef42..30458044 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.19rc6 +Known bugs in libpng version 1.2.19 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 diff --git a/LICENSE b/LICENSE index 88f30e76..09f543f2 100644 --- a/LICENSE +++ b/LICENSE @@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.19rc6, August 15, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19, August 18, 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 -August 15, 2007 +August 18, 2007 diff --git a/README b/README index e6432396..b6048407 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.19rc6 - August 15, 2007 (shared library 12.0) +README for libpng version 1.2.19 - August 18, 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.19rc6) + gcc, creates libpng12.so.0.1.2.19) makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc6) + (gcc, creates libpng12.so.0.1.2.19) makefile.gcmmx => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.19rc6, + (gcc, creates libpng12.so.0.1.2.19, 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.19rc6) + (gcc, creates libpng12.so.0.1.2.19) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.19rc6) + (gcc, creates libpng12.so.0.1.2.19) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.19rc6) + (gcc, creates libpng12.so.0.1.2.19) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/Y2KINFO b/Y2KINFO index cf5edf39..93a36d9d 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - August 15, 2007 + August 18, 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.19rc6 are Y2K compliant. It is my belief that earlier + upward through 1.2.19 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index 1f833ff4..f5274b15 100755 --- a/configure +++ b/configure @@ -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.19rc6. +# Generated by GNU Autoconf 2.61 for libpng 1.2.19. # # Report bugs to . # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.19rc6' -PACKAGE_STRING='libpng 1.2.19rc6' +PACKAGE_VERSION='1.2.19' +PACKAGE_STRING='libpng 1.2.19' 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.19rc6 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.19 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.19rc6:";; + short | recursive ) echo "Configuration of libpng 1.2.19:";; 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.19rc6 +libpng configure 1.2.19 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.19rc6, which was +It was created by libpng $as_me 1.2.19, 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.19rc6' + VERSION='1.2.19' cat >>confdefs.h <<_ACEOF @@ -2440,7 +2440,7 @@ fi -PNGLIB_VERSION=1.2.19rc6 +PNGLIB_VERSION=1.2.19 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 @@ -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.19rc6, which was +This file was extended by libpng $as_me 1.2.19, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21335,7 +21335,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -libpng config.status 1.2.19rc6 +libpng config.status 1.2.19 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 8f5f7613..d45f22e2 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.19rc6], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.19], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.19rc6 +PNGLIB_VERSION=1.2.19 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=19 diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h index a15f1fb8..cfe5f3d8 100644 --- a/contrib/pngminim/decoder/pngusr.h +++ b/contrib/pngminim/decoder/pngusr.h @@ -45,6 +45,7 @@ #define PNG_NO_READ_OPT_PLTE #define PNG_NO_READ_STRIP_ALPHA #define PNG_NO_READ_oFFs +#define PNG_NO_WARN_UNINITIALIZED_ROW #define PNG_NO_WRITE_SUPPORTED diff --git a/libpng-1.2.19rc6.txt b/libpng-1.2.19.txt similarity index 99% rename from libpng-1.2.19rc6.txt rename to libpng-1.2.19.txt index dfd713f7..90171ce3 100644 --- a/libpng-1.2.19rc6.txt +++ b/libpng-1.2.19.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19rc6 - August 15, 2007 + libpng version 1.2.19 - August 18, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -2968,13 +2968,13 @@ application: IX. Y2K Compliance in libpng -August 15, 2007 +August 18, 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.19rc6 are Y2K compliant. It is my belief that earlier +upward through 1.2.19 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index 7bad3405..cc1f23f2 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 15, 2007" +.TH LIBPNG 3 "August 18, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19 .SH SYNOPSIS \fB #include \fP @@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.19rc6 - August 15, 2007 + libpng version 1.2.19 - August 18, 2007 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2007 Glenn Randers-Pehrson @@ -3378,13 +3378,13 @@ application: .SH IX. Y2K Compliance in libpng -August 15, 2007 +August 18, 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.19rc6 are Y2K compliant. It is my belief that earlier +upward through 1.2.19 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 @@ -3576,6 +3576,8 @@ the first widely used release: 1.2.19beta1-31 13 10219 12.so.0.19[.0] 1.0.27rc1-6 10 10027 10.so.0.27[.0] 1.2.19rc1-6 13 10219 12.so.0.19[.0] + 1.0.27 10 10027 10.so.0.27[.0] + 1.2.19 13 10219 12.so.0.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3631,7 +3633,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.19rc6 - August 15, 2007: +Libpng version 1.2.19 - August 18, 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). @@ -3652,7 +3654,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.19rc6, August 15, 2007, are +libpng versions 1.2.6, August 15, 2004, through 1.2.19, August 18, 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 @@ -3751,7 +3753,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 15, 2007 +August 18, 2007 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 9c254fd4..a53846c2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 15, 2007" +.TH LIBPNGPF 3 "August 18, 2007" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19rc6 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.19 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 7943c5d7..84ab23f2 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 15, 2007" +.TH PNG 5 "August 18, 2007" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index b2e169e1..8aa4131a 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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) @@ -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_19rc6 Your_png_h_is_not_version_1_2_19rc6; +typedef version_1_2_19 Your_png_h_is_not_version_1_2_19; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -698,7 +698,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.19rc6 - August 15, 2007\n\ + return ((png_charp) "\n libpng version 1.2.19 - August 18, 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"); diff --git a/png.h b/png.h index c7a172b8..04f786d4 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.19rc6 - August 15, 2007 + * libpng version 1.2.19 - August 18, 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.19rc6 - August 15, 2007: Glenn + * libpng versions 0.97, January 1998, through 1.2.19 - August 18, 2007: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -153,6 +153,8 @@ * 1.2.19beta1-31 13 10219 12.so.0.19[.0] * 1.0.27rc1-6 10 10027 10.so.0.27[.0] * 1.2.19rc1-6 13 10219 12.so.0.19[.0] + * 1.0.27 10 10027 10.so.0.27[.0] + * 1.2.19 13 10219 12.so.0.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -182,7 +184,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.19rc6, August 15, 2007, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.19, August 18, 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: @@ -294,13 +296,13 @@ * Y2K compliance in libpng: * ========================= * - * August 15, 2007 + * August 18, 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.19rc6 are Y2K compliant. It is my belief that earlier + * upward through 1.2.19 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 @@ -356,9 +358,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.19rc6" +#define PNG_LIBPNG_VER_STRING "1.2.19" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.19rc6 - August 15, 2007\n" + " libpng version 1.2.19 - August 18, 2007\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -370,7 +372,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 @@ -387,7 +389,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. @@ -1409,7 +1411,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_19rc6; +typedef png_structp version_1_2_19; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index e55b814f..43dfe04c 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.19rc6 - August 15, 2007 + * libpng version 1.2.19 - August 18, 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) @@ -75,6 +75,14 @@ /* End of material added to libpng-1.2.8 */ +/* Added at libpng-1.2.19 */ +#ifndef PNG_NO_WARN_UNINITIALIZED_ROW +# ifndef PNG_WARN_UNINITIALIZED_ROW +# define PNG_WARN_UNINITIALIZED_ROW 1 /* 0: warning; 1: error */ +# endif +#endif +/* End of material added at libpng-1.2.19 */ + /* This is the size of the compression buffer, and thus the size of * an IDAT chunk. Make this whatever size you feel is best for your * machine. One of these will be allocated per png_struct. When this diff --git a/pngerror.c b/pngerror.c index fa6d2167..b1d5fbe7 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.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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/pnggccrd.c b/pnggccrd.c index 2994a24d..f63867cd 100644 --- a/pnggccrd.c +++ b/pnggccrd.c @@ -3,7 +3,7 @@ * * For Intel/AMD x86 or x86-64 CPU (Pentium-MMX or later) and GNU C compiler. * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998 Intel Corporation * Copyright (c) 1999-2002,2007 Greg Roelofs diff --git a/pngpread.c b/pngpread.c index 53f0d29d..7d29e984 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.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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/pngread.c b/pngread.c index aedc3682..2e561e8f 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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/pngrtran.c b/pngrtran.c index d591aa21..3f040513 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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) @@ -548,7 +548,7 @@ png_set_expand(png_structp png_ptr) png_debug(1, "in png_set_expand\n"); if(png_ptr == NULL) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); -#if 0 +#ifdef PNG_WARN_UNINITIALIZED_ROW png_ptr->flags &= !(PNG_FLAG_ROW_INIT); #endif } @@ -577,7 +577,7 @@ png_set_palette_to_rgb(png_structp png_ptr) png_debug(1, "in png_set_palette_to_rgb\n"); if(png_ptr == NULL) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); -#if 0 +#ifdef PNG_WARN_UNINITIALIZED_ROW png_ptr->flags &= !(PNG_FLAG_ROW_INIT); #endif } @@ -590,7 +590,7 @@ png_set_expand_gray_1_2_4_to_8(png_structp png_ptr) png_debug(1, "in png_set_expand_gray_1_2_4_to_8\n"); if(png_ptr == NULL) return; png_ptr->transformations |= PNG_EXPAND; -#if 0 +#ifdef PNG_WARN_UNINITIALIZED_ROW png_ptr->flags &= !(PNG_FLAG_ROW_INIT); #endif } @@ -615,7 +615,7 @@ png_set_tRNS_to_alpha(png_structp png_ptr) { png_debug(1, "in png_set_tRNS_to_alpha\n"); png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); -#if 0 +#ifdef PNG_WARN_UNINITIALIZED_ROW png_ptr->flags &= !(PNG_FLAG_ROW_INIT); #endif } @@ -627,7 +627,7 @@ png_set_gray_to_rgb(png_structp png_ptr) { png_debug(1, "in png_set_gray_to_rgb\n"); png_ptr->transformations |= PNG_GRAY_TO_RGB; -#if 0 +#ifdef PNG_WARN_UNINITIALIZED_ROW png_ptr->flags &= !(PNG_FLAG_ROW_INIT); #endif } @@ -1272,12 +1272,16 @@ png_do_read_transformations(png_structp png_ptr) png_error(png_ptr, "NULL row buffer"); #endif } -#if 0 +#ifdef PNG_WARN_UNINITIALIZED_ROW if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) /* Application has failed to call either png_read_start_image() * or png_read_update_info() after setting transforms that expand * pixels. This check added to libpng-1.2.19 */ +#if (PNG_WARN_UNINITIALIZED_ROW==1) png_error(png_ptr, "Uninitialized row"); +#else + png_warning(png_ptr, "Uninitialized row"); +#endif #endif #if defined(PNG_READ_EXPAND_SUPPORTED) diff --git a/pngrutil.c b/pngrutil.c index 0183958e..86e924c2 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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/pngtest.c b/pngtest.c index 40a211b4..866fd8c8 100644 --- a/pngtest.c +++ b/pngtest.c @@ -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_19rc6 your_png_h_is_not_version_1_2_19rc6; +typedef version_1_2_19 your_png_h_is_not_version_1_2_19; diff --git a/pngvcrd.c b/pngvcrd.c index 7732e017..34d42c99 100644 --- a/pngvcrd.c +++ b/pngvcrd.c @@ -3,7 +3,7 @@ * * For Intel x86 CPU and Microsoft Visual C++ compiler * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 2007 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2007 Glenn Randers-Pehrson * Copyright (c) 1998, Intel Corporation diff --git a/pngwutil.c b/pngwutil.c index 3a16a0a8..849ee7db 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.2.19 August 15, 2007 + * Last changed in libpng 1.2.19 August 18, 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/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index b32aba2a..db151755 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -180,7 +180,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.19rc6 +# VERSION 0.${PNGLIB_RELEASE}.1.2.19 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 d09ff3fe..ea24ab70 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -8,7 +8,7 @@ # Modeled after libxml-config. -version=1.2.19rc6 +version=1.2.19 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc-configure.in b/scripts/libpng.pc-configure.in index 57e80515..91a2b322 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.19rc6 +Version: 1.2.19 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} @LIBPNG_NO_MMX@ diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index cd49a67c..dda9eff9 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.19rc6 +Version: 1.2.19 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index f94c90c4..031207b3 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 800c402f..7ac52893 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index c471958a..1a5a07d1 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.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 8a3d7aaa..703205e7 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -8,7 +8,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 0d0ba92a..b0bcb6c2 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 4f4ba025..10d64830 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -19,7 +19,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 9692bdca..6c5b45b5 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -5,7 +5,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 8196d506..ed2f91fb 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index de903f7f..a8b33ca6 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 9edca563..45e98b96 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.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 898b05fc..ed365d58 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 74a65372..da936f7b 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.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 5ae00b06..6b3ac987 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -6,7 +6,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 9c140f69..5aca3bb6 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -78,7 +78,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index abe3018e..c3eede64 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.19rc6 +SHLIB_MINOR= 1.2.19 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 38c5048a..c6d3b0b9 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.19rc6 +SHLIB_MINOR= 1.2.19 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 d9b1d5b1..a74a33b6 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -7,7 +7,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 12c82b91..91e167ad 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.19rc6 +SHLIB_MINOR= 1.2.19 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 db42e65b..3f3eafcf 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -9,7 +9,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 7f15e07d..8251e868 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index b22eb4bb..cf0fde57 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -6,7 +6,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index fa826177..b9aa58c2 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index e2d1caf4..57905d26 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 7941dd48..dbdf9f06 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -8,7 +8,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.19rc6 +PNGMIN = 1.2.19 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/pngos2.def b/scripts/pngos2.def index e9e2fea1..4393a573 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.19rc6 +; Version 1.2.19 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index b7e9d2ee..f4205f2d 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.19rc6 +;Version 1.2.19 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3