From a2336bcf054ebff5cd51b43a873204ee08f68728 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 19 Mar 2011 09:06:58 -0500 Subject: [PATCH] [master] Bump to version 1.4.6beta07 --- CMakeLists.txt | 2 +- INSTALL | 4 ++-- LICENSE | 2 +- README | 12 +++++----- configure | 22 +++++++++---------- configure.ac | 4 ++-- ...-1.4.6beta06.txt => libpng-1.4.6beta07.txt | 0 libpngpf.3 | 2 +- png.c | 6 ++--- png.h | 18 +++++++-------- pngpriv.h | 2 +- pngread.c | 2 ++ pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 +++++----- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/png32ce.def | 2 +- scripts/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 24 files changed, 56 insertions(+), 54 deletions(-) rename libpng-1.4.6beta06.txt => libpng-1.4.6beta07.txt (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8692ff314..1e4d83c55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta06 +# VERSION 14.${PNGLIB_RELEASE}.1.4.6beta07 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index d831869ab..d8bfff742 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.6beta06 - March 19, 2011 +Installing libpng version 1.4.6beta07 - March 19, 2011 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,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.4.6beta06" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.6beta07" or "libpng14" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/LICENSE b/LICENSE index b4f116304..a4fc0a70c 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.6beta06, March 19, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.4.6beta07, March 19, 2011, are Copyright (c) 2004, 2006-2010 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 diff --git a/README b/README index c45539ce3..bf6435665 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.6beta06 - March 19, 2011 (shared library 14.0) +README for libpng version 1.4.6beta07 - March 19, 2011 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -185,9 +185,9 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.6beta06) + (gcc, creates libpng14.so.14.1.4.6beta07) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.6beta06) + (gcc, creates libpng14.so.14.1.4.6beta07) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -209,12 +209,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.6beta06) + (gcc, creates libpng14.so.14.1.4.6beta07) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.6beta06) + (gcc, creates libpng14.so.14.1.4.6beta07) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.6beta06) + (gcc, creates libpng14.so.14.1.4.6beta07) 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/configure b/configure index 6223ba868..c7b5932a5 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.65 for libpng 1.4.6beta06. +# Generated by GNU Autoconf 2.65 for libpng 1.4.6beta07. # # Report bugs to . # @@ -562,8 +562,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.6beta06' -PACKAGE_STRING='libpng 1.4.6beta06' +PACKAGE_VERSION='1.4.6beta07' +PACKAGE_STRING='libpng 1.4.6beta07' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1292,7 +1292,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.4.6beta06 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.6beta07 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.6beta06:";; + short | recursive ) echo "Configuration of libpng 1.4.6beta07:";; esac cat <<\_ACEOF @@ -1467,7 +1467,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.6beta06 +libpng configure 1.4.6beta07 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1892,7 +1892,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.4.6beta06, which was +It was created by libpng $as_me 1.4.6beta07, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2700,7 +2700,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.6beta06' + VERSION='1.4.6beta07' cat >>confdefs.h <<_ACEOF @@ -2764,7 +2764,7 @@ fi -PNGLIB_VERSION=1.4.6beta06 +PNGLIB_VERSION=1.4.6beta07 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=6 @@ -12175,7 +12175,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.6beta06, which was +This file was extended by libpng $as_me 1.4.6beta07, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12241,7 +12241,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.4.6beta06 +libpng config.status 1.4.6beta07 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5944d10b8..ef44f0041 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.6beta06], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.6beta07], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE dnl Version number stuff here: -PNGLIB_VERSION=1.4.6beta06 +PNGLIB_VERSION=1.4.6beta07 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=6 diff --git a/libpng-1.4.6beta06.txt b/libpng-1.4.6beta07.txt similarity index 100% rename from libpng-1.4.6beta06.txt rename to libpng-1.4.6beta07.txt diff --git a/libpngpf.3 b/libpngpf.3 index c403023f3..6b05508a3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "March 19, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta06 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.6beta07 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.c b/png.c index 8ba807ef3..25ce11a32 100644 --- a/png.c +++ b/png.c @@ -17,7 +17,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_6beta06 Your_png_h_is_not_version_1_4_6beta06; +typedef version_1_4_6beta07 Your_png_h_is_not_version_1_4_6beta07; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -547,13 +547,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.6beta06 - March 19, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.4.6beta07 - March 19, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else - return ((png_charp) "libpng version 1.4.6beta06 - March 19, 2011\ + return ((png_charp) "libpng version 1.4.6beta07 - March 19, 2011\ Copyright (c) 1998-2010 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); diff --git a/png.h b/png.h index 68cac4d53..f228fc3e7 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.6beta06 - March 19, 2011 + * libpng version 1.4.6beta07 - March 19, 2011 * Copyright (c) 1998-2011 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.) @@ -11,7 +11,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.4.6beta06 - March 19, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.4.6beta07 - March 19, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -153,7 +153,7 @@ * 1.4.5beta05-07 14 10405 14.so.14.5[.0] * 1.4.5rc02-03 14 10405 14.so.14.5[.0] * 1.4.5 14 10405 14.so.14.5[.0] - * 1.4.6beta01-06 14 10406 14.so.14.6[.0] + * 1.4.6beta01-07 14 10406 14.so.14.6[.0] * 1.4.6rc01 14 10406 14.so.14.6[.0] * * Henceforth the source version will match the shared-library major @@ -186,7 +186,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.6beta06, March 19, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.6beta07, March 19, 2011, are * Copyright (c) 2004, 2006-2010 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: @@ -304,7 +304,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.4.6beta06 are Y2K compliant. It is my belief that earlier + * upward through 1.4.6beta07 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 @@ -360,9 +360,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.6beta06" +#define PNG_LIBPNG_VER_STRING "1.4.6beta07" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.6beta06 - March 19, 2011\n" + " libpng version 1.4.6beta07 - March 19, 2011\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -375,7 +375,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 06 +#define PNG_LIBPNG_VER_BUILD 07 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1486,7 +1486,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_4_6beta06; +typedef png_structp version_1_4_6beta07; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngpriv.h b/pngpriv.h index b406fc851..b7021270e 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.6beta06 - March 19, 2011 + * libpng version 1.4.6beta07 - March 19, 2011 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngread.c b/pngread.c index f4a2956bb..7d6b76a9d 100644 --- a/pngread.c +++ b/pngread.c @@ -439,10 +439,12 @@ void PNGAPI png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row) { PNG_IDAT; +#ifdef PNG_READ_INTERLACING_SUPPORTED PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55, 0xff}; PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff}; int ret; +#endif if (png_ptr == NULL) return; diff --git a/pngtest.c b/pngtest.c index c58daf75f..035963fe2 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1687,4 +1687,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_6beta06 your_png_h_is_not_version_1_4_6beta06; +typedef version_1_4_6beta07 your_png_h_is_not_version_1_4_6beta07; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b7a7470c4..6568a5eed 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.6beta06 - March 19, 2011 +libpng version 1.4.6beta07 - March 19, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0501ec3c9..b6bb60723 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@