[libpng15] Imported from libpng-1.5.6beta01.tar
diff --git a/ANNOUNCE b/ANNOUNCE index 9f3e677..179b601 100644 --- a/ANNOUNCE +++ b/ANNOUNCE
@@ -1,41 +1,51 @@ -Libpng 1.5.5 - September 22, 2011 +Libpng 1.5.6beta01 - September 22, 2011 -This is a public release of libpng, intended for use in production codes. +This is not intended to be a public release. It will be replaced +within a few weeks by a public version or by another test version. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.5.5.tar.xz (LZMA-compressed, recommended) - libpng-1.5.5.tar.gz - libpng-1.5.5.tar.bz2 + 1.5.6beta01.tar.xz (LZMA-compressed, recommended) + 1.5.6beta01.tar.gz + 1.5.6beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng155.7z (LZMA-compressed, recommended) - lpng155.zip + lp156b01.7z (LZMA-compressed, recommended) + lp156b01.zip Other information: - libpng-1.5.5-README.txt - libpng-1.5.5-LICENSE.txt + 1.5.6beta01-README.txt + 1.5.6beta01-LICENSE.txt Changes since the last public release (1.5.4): +Version 1.5.5beta01 [July 13, 2011] Fixed some typos and made other minor changes in the manual. Updated contrib/pngminus/makefile.std (Samuli Souminen) + +Version 1.5.5beta02 [July 14, 2011] Revised Makefile.am and Makefile.in to look in the right directory for pnglibconf.h.prebuilt + +Version 1.5.5beta03 [July 27, 2011] Enabled compilation with g++ compiler. This compiler does not recognize the file extension, so it always compiles with C++ rules. Made minor changes to pngrutil.c to cast results where C++ expects it but C does not. Minor editing of libpng.3 and libpng-manual.txt. + +Version 1.5.5beta04 [July 29, 2011] Revised CMakeLists.txt (Clifford Yapp) Updated commentary about the png_rgb_to_gray() default coefficients in the manual and in pngrtran.c + +Version 1.5.5beta05 [August 17, 2011] Prevent unexpected API exports from non-libpng DLLs on Windows. The "_DLL" is removed from the test of whether a DLL is being built (this erroneously caused the libpng APIs to be marked as DLL exports in static builds under @@ -51,6 +61,8 @@ configurations.) Added new types and internal functions for CIE RGB end point handling to pngpriv.h (functions yet to be implemented). + +Version 1.5.5beta06 [August 26, 2011] Ensure the CMAKE_LIBRARY_OUTPUT_DIRECTORY is set in CMakeLists.txt (Clifford Yap) Fixes to rgb_to_gray and cHRM XYZ APIs (John Bowler): @@ -68,24 +80,32 @@ the 8-bit non-gamma-corrected case (where consistency seems more important than correctness.) The code still has considerable inaccuracies in the 8-bit case because 8-bit linear arithmetic is used. + +Version 1.5.5beta07 [September 7, 2011] Added "$(ARCH)" option to makefile.darwin Added SunOS support to configure.ac and Makefile.am Changed png_chunk_benign_error() to png_warning() in png.c, in png_XYZ_from_xy_checked(). + +Version 1.5.5beta08 [September 10, 2011] Fixed 64-bit compilation errors (gcc). The errors fixed relate to conditions where types that are 32 bits in the GCC 32-bit world (uLong and png_size_t) become 64 bits in the 64-bit world. This produces potential truncation errors that the compiler correctly flags. + Relocated new HAVE_SOLARIS_LD definition in configure.ac Constant changes for 64-bit compatibility (removal of L suffixes). The 16-bit cases still use "L" as we don't have a 16-bit test system. -Send comments/corrections/commendations to png-mng-implement at lists.sf.net +Version 1.5.5rc01 [September 17, 2011] + Removed "L" suffixes from constants in pngpriv.h + +Version 1.5.5 [September 22, 2011] + No changes. + +Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement -to subscribe) -or to glennrp at users.sourceforge.net +to subscribe) or to glennrp at users.sourceforge.net Glenn R-P -*/ } -#endif
diff --git a/CMakeLists.txt b/CMakeLists.txt index 72e5269..4bcd794 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 5) +set(PNGLIB_RELEASE 6) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -262,7 +262,7 @@ # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.5 +# VERSION 15.${PNGLIB_RELEASE}.1.5.6beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1)
diff --git a/LICENSE b/LICENSE index 5e932e1..586268a 100644 --- a/LICENSE +++ b/LICENSE
@@ -10,7 +10,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.5, September 22, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.6beta01, September 22, 2011, are Copyright (c) 2004, 2006-2011 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 a540e83..31398bd 100644 --- a/README +++ b/README
@@ -1,4 +1,4 @@ -README for libpng version 1.5.5 - September 22, 2011 (shared library 15.0) +README for libpng version 1.5.6beta01 - September 22, 2011 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng.
diff --git a/configure b/configure index d078444..e22b3fc 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.68 for libpng 1.5.5. +# Generated by GNU Autoconf 2.68 for libpng 1.5.6beta01. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.5' -PACKAGE_STRING='libpng 1.5.5' +PACKAGE_VERSION='1.5.6beta01' +PACKAGE_STRING='libpng 1.5.6beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1308,7 +1308,7 @@ # 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.5.5 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.6beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1378,7 +1378,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.5:";; + short | recursive ) echo "Configuration of libpng 1.5.6beta01:";; esac cat <<\_ACEOF @@ -1486,7 +1486,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.5 +libpng configure 1.5.6beta01 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1909,7 +1909,7 @@ 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.5.5, which was +It was created by libpng $as_me 1.5.6beta01, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2724,7 +2724,7 @@ # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.5' + VERSION='1.5.6beta01' cat >>confdefs.h <<_ACEOF @@ -2788,10 +2788,10 @@ -PNGLIB_VERSION=1.5.5 +PNGLIB_VERSION=1.5.6beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=5 +PNGLIB_RELEASE=6 @@ -13073,7 +13073,7 @@ # 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.5.5, which was +This file was extended by libpng $as_me 1.5.6beta01, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13139,7 +13139,7 @@ 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.5.5 +libpng config.status 1.5.6beta01 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac index 18f62c1..3a93763 100644 --- a/configure.ac +++ b/configure.ac
@@ -18,15 +18,15 @@ dnl Version number stuff here: -AC_INIT([libpng], [1.5.5], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.6beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.5 +PNGLIB_VERSION=1.5.6beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=5 +PNGLIB_RELEASE=6 dnl End of version number stuff
diff --git a/libpng-manual.txt b/libpng-manual.txt index eb6bacb..b17753f 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt
@@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.5 - September 22, 2011 + libpng version 1.5.6beta01 - September 22, 2011 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Based on: - libpng versions 0.97, January 1998, through 1.5.5 - September 22, 2011 + libpng versions 0.97, January 1998, through 1.5.6beta01 - September 22, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4566,7 +4566,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.5.5 are Y2K compliant. It is my belief that earlier +upward through 1.5.6beta01 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 571be91..c9ad0dd 100644 --- a/libpng.3 +++ b/libpng.3
@@ -1,6 +1,6 @@ .TH LIBPNG 3 "September 22, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.6beta01 .SH SYNOPSIS \fI\fB @@ -977,7 +977,7 @@ .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.5 - September 22, 2011 + libpng version 1.5.6beta01 - September 22, 2011 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -988,7 +988,7 @@ Based on: - libpng versions 0.97, January 1998, through 1.5.5 - September 22, 2011 + libpng versions 0.97, January 1998, through 1.5.6beta01 - September 22, 2011 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5544,7 +5544,7 @@ an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.5.5 are Y2K compliant. It is my belief that earlier +upward through 1.5.6beta01 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 @@ -5799,7 +5799,7 @@ Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.5 - September 22, 2011: +Libpng version 1.5.6beta01 - September 22, 2011: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5822,7 +5822,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.5, September 22, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.5.6beta01, September 22, 2011, 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
diff --git a/libpngpf.3 b/libpngpf.3 index b1bce64..68f3b4f 100644 --- a/libpngpf.3 +++ b/libpngpf.3
@@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "September 22, 2011" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.5 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.6beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h"
diff --git a/png.c b/png.c index c521ad2..6d073c6 100644 --- a/png.c +++ b/png.c
@@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.) @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_5 Your_png_h_is_not_version_1_5_5; +typedef png_libpng_version_1_5_6beta01 Your_png_h_is_not_version_1_5_6beta01; /* 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 @@ -645,13 +645,13 @@ #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.5 - September 22, 2011" PNG_STRING_NEWLINE \ + "libpng version 1.5.6beta01 - September 22, 2011" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2011 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 "libpng version 1.5.5 - September 22, 2011\ + return "libpng version 1.5.6beta01 - September 22, 2011\ Copyright (c) 1998-2011 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 7c8a9c2..bb551d6 100644 --- a/png.h +++ b/png.h
@@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.5 - September 22, 2011 + * libpng version 1.5.6beta01 - September 22, 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.5.5 - September 22, 2011: Glenn + * libpng versions 0.97, January 1998, through 1.5.6beta01 - September 22, 2011: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -191,7 +191,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.5, September 22, 2011, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.6beta01, September 22, 2011, are * Copyright (c) 2004, 2006-2011 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: @@ -309,7 +309,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.5 are Y2K compliant. It is my belief that + * upward through 1.5.6beta01 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -364,9 +364,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.5" +#define PNG_LIBPNG_VER_STRING "1.5.6beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.5 - September 22, 2011\n" + " libpng version 1.5.6beta01 - September 22, 2011\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -374,12 +374,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 5 -#define PNG_LIBPNG_VER_RELEASE 5 +#define PNG_LIBPNG_VER_RELEASE 6 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 0 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -404,7 +404,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10505 /* 1.5.5 */ +#define PNG_LIBPNG_VER 10506 /* 1.5.6 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -526,7 +526,7 @@ /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_5_5; +typedef char* png_libpng_version_1_5_6beta01; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to
diff --git a/pngconf.h b/pngconf.h index 05dd292..851a6e5 100644 --- a/pngconf.h +++ b/pngconf.h
@@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.5 - September 22, 2011 + * libpng version 1.5.6beta01 - September 22, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngget.c b/pngget.c index 3c1b409..770c123 100644 --- a/pngget.c +++ b/pngget.c
@@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.)
diff --git a/pngpriv.h b/pngpriv.h index dad2837..8ca5d1a 100644 --- a/pngpriv.h +++ b/pngpriv.h
@@ -6,7 +6,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer
diff --git a/pngrtran.c b/pngrtran.c index f884790..c6dd288 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.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.)
diff --git a/pngrutil.c b/pngrutil.c index bfff7d6..a74353d 100644 --- a/pngrutil.c +++ b/pngrutil.c
@@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.)
diff --git a/pngset.c b/pngset.c index 7bae97c..373d21b 100644 --- a/pngset.c +++ b/pngset.c
@@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.)
diff --git a/pngstruct.h b/pngstruct.h index a9155b4..b4e5f3b 100644 --- a/pngstruct.h +++ b/pngstruct.h
@@ -5,7 +5,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer
diff --git a/pngtest.c b/pngtest.c index 4bb24f3..9c4615d 100644 --- a/pngtest.c +++ b/pngtest.c
@@ -1794,4 +1794,4 @@ } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_5 Your_png_h_is_not_version_1_5_5; +typedef png_libpng_version_1_5_6beta01 Your_png_h_is_not_version_1_5_6beta01;
diff --git a/pngvalid.c b/pngvalid.c index a3626b2..9d1ce79 100644 --- a/pngvalid.c +++ b/pngvalid.c
@@ -1,7 +1,7 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * Copyright (c) 2011 Glenn Randers-Pehrson * Written by John Cunningham Bowler *
diff --git a/pngwutil.c b/pngwutil.c index bc3e4dd..bafa406 100644 --- a/pngwutil.c +++ b/pngwutil.c
@@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.5.5 [September 22, 2011] + * Last changed in libpng 1.5.5 [(PENDING RELEASE)] * 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.)
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index e1a726b..1e2a261 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.5 - September 22, 2011 +libpng version 1.5.6beta01 - September 22, 2011 Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 31ddabf..10d9442 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.5.5 - September 22, 2011 + * libpng version 1.5.6beta01 - September 22, 2011 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson *
diff --git a/scripts/README.txt b/scripts/README.txt index a53f152..a0a309b 100644 --- a/scripts/README.txt +++ b/scripts/README.txt
@@ -1,9 +1,9 @@ -Makefiles for libpng version 1.5.5 - September 22, 2011 +Makefiles for libpng version 1.5.6beta01 - September 22, 2011 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.5.5) + (gcc, creates libpng15.so.15.1.5.6beta01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -20,7 +20,7 @@ makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng15.so.15.1.5.5) + (gcc, creates libpng15.so.15.1.5.6beta01) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -35,12 +35,12 @@ makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng15.so.15.1.5.5) + creates libpng15.so.15.1.5.6beta01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.5.5) + creates libpng15.so.15.1.5.6beta01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.5.5) + creates libpng15.so.15.1.5.6beta01) makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.sunos => Sun makefile makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 4694f6b..b38d6f4 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.5.5 +version=1.5.6beta01 prefix="" libdir="" libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index ec8f82d..b36ddce 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ Name: libpng Description: Loads and saves PNG files -Version: 1.5.5 +Version: 1.5.6beta01 Libs: -L${libdir} -lpng15 Cflags: -I${includedir}
diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc index ebf6c6d..f73929b 100644 --- a/scripts/makefile.cegcc +++ b/scripts/makefile.cegcc
@@ -23,7 +23,7 @@ VERMAJ = 1 VERMIN = 5 -VERMIC = 5 +VERMIC = 6 VER = $(VERMAJ).$(VERMIN).$(VERMIC) NAME = libpng PACKAGE = $(NAME)-$(VER)
diff --git a/scripts/makefile.linux b/scripts/makefile.linux index df8a59d..9bea401 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux
@@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng15 PNGMAJ = 15 -RELEASE = 5 +RELEASE = 6 # Shared library names: LIBSO=$(LIBNAME).so
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index d6ed321..bc04bcc 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ LIB= png15 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.5.5 +SHLIB_MINOR= 1.5.6beta01 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 45c821b..7c84ecb 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ LIB= png SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.5 +SHLIB_MINOR= 1.5.6beta01 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.openbsd b/scripts/makefile.openbsd index 9c12d60..1c67228 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.5 +SHLIB_MINOR= 1.5.6beta01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/symbols.def b/scripts/symbols.def index 3d0e1e7..8809de1 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def
@@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.5.5 +;Version 1.5.6beta01 png_access_version_number @1 png_set_sig_bytes @2 png_sig_cmp @3