diff --git a/ANNOUNCE b/ANNOUNCE index dbc2ed173..944571367 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,64 +1,36 @@ -Libpng 1.5.10 - March 29, 2012 +Libpng 1.5.11beta01 - April 12, 2012 -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.10.tar.xz (LZMA-compressed, recommended) - libpng-1.5.10.tar.gz - libpng-1.5.10.tar.bz2 + 1.5.11beta01.tar.xz (LZMA-compressed, recommended) + 1.5.11beta01.tar.gz + 1.5.11beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1510.7z (LZMA-compressed, recommended) - lpng1510.zip + lp1511b01.7z (LZMA-compressed, recommended) + lp1511b01.zip Other information: - libpng-1.5.10-README.txt - libpng-1.5.10-LICENSE.txt + 1.5.11beta01-README.txt + 1.5.11beta01-LICENSE.txt -Changes since the last public release (1.5.9): +Changes since the last public release (1.5.10): - Removed two useless #ifdef directives from pngread.c and one from pngrutil.c - Always put the CMAKE_LIBRARY in "lib" (removed special WIN32 case). - Removed empty vstudio/pngstest directory (Clifford Yapp). - Eliminated redundant png_push_read_tEXt|zTXt|iTXt|unknown code from - pngpread.c and use the sequential png_handle_tEXt, etc., in pngrutil.c; - now that png_ptr->buffer is inaccessible to applications, the special - handling is no longer useful. - Fixed bug with png_handle_hIST with odd chunk length (Frank Busse). - Added PNG_SAFE_LIMITS feature to pnglibconf.dfa and code in pngconf.h - to reset the user limits to safe ones if PNG_SAFE_LIMITS is defined. - To enable, use "CPPFLAGS=-DPNG_SAFE_LIMITS_SUPPORTED" on the configure - command or put "#define PNG_SAFE_LIMITS_SUPPORTED" in pnglibconf.h. - Revised the SAFE_LIMITS feature to be the same as the feature in libpng16. - Added information about the new limits in the manual. - Updated Makefile.in - Removed unused "current_text" members of png_struct and the png_free() - of png_ptr->current_text from pngread.c - Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition. - Fixed CMF optimization of non-IDAT compressed chunks, which was added at - libpng-1.5.4. It sometimes produced too small of a window. - Reject all iCCP chunks after the first, even if the first one is invalid. - Added palette-index checking. Issue a png_benign_error() if an invalid - index is found. - Revised example.c to put text strings in a temporary character array - instead of directly assigning string constants to png_textp members. - This avoids compiler warnings when -Wwrite-strings is enabled. - Prevent PNG_EXPAND+PNG_SHIFT doing the shift twice. - Revised png_set_text_2() to avoid potential memory corruption (fixes - CVE-2011-3048). +Version 1.5.11 [April 12, 2012] -Send comments/corrections/commendations to png-mng-implement at lists.sf.net +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 diff --git a/CHANGES b/CHANGES index 70af8273e..d62444d87 100644 --- a/CHANGES +++ b/CHANGES @@ -3854,6 +3854,8 @@ Version 1.5.10 [March 29, 2012] Revised png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048). +Version 1.5.11 [April 12, 2012] + 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/CMakeLists.txt b/CMakeLists.txt index b5117891d..c9a8ddeea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 10) +set(PNGLIB_RELEASE 11) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -225,7 +225,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.10 +# VERSION 15.${PNGLIB_RELEASE}.1.5.11beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index b72d1258e..3858bcb57 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.5.10, March 29, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 12, 2012, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 29, 2012 +April 12, 2012 diff --git a/README b/README index e821ee4c8..eadbd03e1 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.10 - March 29, 2012 (shared library 15.0) +README for libpng version 1.5.11beta01 - April 12, 2012 (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 df2d1734c..6994a9bfe 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.10. +# Generated by GNU Autoconf 2.68 for libpng 1.5.11beta01. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.10' -PACKAGE_STRING='libpng 1.5.10' +PACKAGE_VERSION='1.5.11beta01' +PACKAGE_STRING='libpng 1.5.11beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1321,7 +1321,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.5.10 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.11beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1391,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.10:";; + short | recursive ) echo "Configuration of libpng 1.5.11beta01:";; esac cat <<\_ACEOF @@ -1502,7 +1502,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.10 +libpng configure 1.5.11beta01 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1925,7 +1925,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.5.10, which was +It was created by libpng $as_me 1.5.11beta01, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2740,7 +2740,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.10' + VERSION='1.5.11beta01' cat >>confdefs.h <<_ACEOF @@ -2804,10 +2804,10 @@ fi -PNGLIB_VERSION=1.5.10 +PNGLIB_VERSION=1.5.11beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=10 +PNGLIB_RELEASE=11 @@ -13417,7 +13417,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.5.10, which was +This file was extended by libpng $as_me 1.5.11beta01, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13483,7 +13483,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.5.10 +libpng config.status 1.5.11beta01 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 023aba43b..d425297dd 100644 --- a/configure.ac +++ b/configure.ac @@ -18,15 +18,15 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.10], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.11beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.10 +PNGLIB_VERSION=1.5.11beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=10 +PNGLIB_RELEASE=11 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index d55e80a00..ff5aae8de 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.10 - March 29, 2012 + libpng version 1.5.11beta01 - April 12, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012 + libpng versions 0.97, January 1998, through 1.5.11beta01 - April 12, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -4597,13 +4597,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -March 29, 2012 +April 12, 2012 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.5.10 are Y2K compliant. It is my belief that earlier +upward through 1.5.11beta01 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 bba25afa7..a6a073e45 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 29, 2012" +.TH LIBPNG 3 "April 12, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11beta01 .SH SYNOPSIS \fI\fB @@ -981,7 +981,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.10 - March 29, 2012 + libpng version 1.5.11beta01 - April 12, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -992,7 +992,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.10 - March 29, 2012 + libpng versions 0.97, January 1998, through 1.5.11beta01 - April 12, 2012 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2011 Glenn Randers-Pehrson @@ -5579,13 +5579,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -March 29, 2012 +April 12, 2012 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.5.10 are Y2K compliant. It is my belief that earlier +upward through 1.5.11beta01 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 @@ -5798,6 +5798,7 @@ the first widely used release: 1.5.9 15 10509 15.so.15.9[.0] 1.5.10beta01-05 15 10510 15.so.15.10[.0] 1.5.10 15 10510 15.so.15.10[.0] + 1.5.11beta01 15 10511 15.so.15.11[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5854,7 +5855,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.10 - March 29, 2012: +Libpng version 1.5.11beta01 - April 12, 2012: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5877,7 +5878,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are +libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 12, 2012, 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 @@ -5976,7 +5977,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 29, 2012 +April 12, 2012 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8449f173f..2b66dbf9a 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 29, 2012" +.TH LIBPNGPF 3 "April 12, 2012" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.10 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.11beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 34f0e5908..40d77ada1 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 29, 2012" +.TH PNG 5 "April 12, 2012" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index cba18ba91..6a6516bcf 100644 --- a/png.c +++ b/png.c @@ -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_10 Your_png_h_is_not_version_1_5_10; +typedef png_libpng_version_1_5_11beta01 Your_png_h_is_not_version_1_5_11beta01; /* 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 @@ -655,13 +655,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.10 - March 29, 2012" PNG_STRING_NEWLINE \ + "libpng version 1.5.11beta01 - April 12, 2012" 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.10 - March 29, 2012\ + return "libpng version 1.5.11beta01 - April 12, 2012\ 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 4e0dee179..71d3e2190 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.10 - March 29, 2012 + * libpng version 1.5.11beta01 - April 12, 2012 * Copyright (c) 1998-2012 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.10 - March 29, 2012: Glenn + * libpng versions 0.97, January 1998, through 1.5.11beta01 - April 12, 2012: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -174,6 +174,7 @@ * 1.5.9 15 10509 15.so.15.9[.0] * 1.5.10beta01-05 15 10510 15.so.15.10[.0] * 1.5.10 15 10510 15.so.15.10[.0] + * 1.5.11beta01 15 10511 15.so.15.11[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -205,7 +206,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.10, March 29, 2012, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.11beta01, April 12, 2012, are * Copyright (c) 2004, 2006-2012 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: @@ -317,13 +318,13 @@ * Y2K compliance in libpng: * ========================= * - * March 29, 2012 + * April 12, 2012 * * 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.5.10 are Y2K compliant. It is my belief that + * upward through 1.5.11beta01 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 @@ -381,9 +382,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.10" +#define PNG_LIBPNG_VER_STRING "1.5.11beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.10 - March 29, 2012\n" + " libpng version 1.5.11beta01 - April 12, 2012\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -391,13 +392,13 @@ /* 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 10 +#define PNG_LIBPNG_VER_RELEASE 11 /* 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 @@ -414,7 +415,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_STABLE +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -422,7 +423,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 10510 /* 1.5.10 */ +#define PNG_LIBPNG_VER 10511 /* 1.5.11 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -544,7 +545,7 @@ extern "C" { /* 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_10; +typedef char* png_libpng_version_1_5_11beta01; /* 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 bbb547f8e..1daf8d5bb 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.10 - March 29, 2012 + * libpng version 1.5.11beta01 - April 12, 2012 * * Copyright (c) 1998-2012 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index e76a57975..0ceb6b85a 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.10 [March 29, 2012] + * Last changed in libpng 1.5.10 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngstruct.h b/pngstruct.h index 43a45cdec..e062738f0 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.9 [March 29, 2012] + * Last changed in libpng 1.5.9 [(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 0295840ba..7367b49d7 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1817,4 +1817,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_10 Your_png_h_is_not_version_1_5_10; +typedef png_libpng_version_1_5_11beta01 Your_png_h_is_not_version_1_5_11beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 938e7dad0..173e9d444 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.10 - March 29, 2012 +libpng version 1.5.11beta01 - April 12, 2012 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 0060f127e..213a322de 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@