From b257d4a6a1c3a4352dbfb73abb230e4d20465968 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 12 Nov 2015 22:15:21 -0600 Subject: [PATCH] [libpng15] Bump version to 1.5.25beta01 --- ANNOUNCE | 58 +++++++++-------------------------- CHANGES | 4 ++- CMakeLists.txt | 4 +-- LICENSE | 4 +-- README | 2 +- configure | 24 +++++++-------- configure.ac | 6 ++-- libpng-manual.txt | 8 ++--- libpng.3 | 18 +++++------ libpngpf.3 | 4 +-- png.5 | 2 +- png.c | 6 ++-- png.h | 25 +++++++-------- pngconf.h | 2 +- pngset.c | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 10 +++--- scripts/def.c | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.cegcc | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.msys | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.h.prebuilt | 4 +-- scripts/symbols.def | 2 +- 30 files changed, 91 insertions(+), 118 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 9fcd326c2..e70203145 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,63 +1,33 @@ -Libpng 1.5.24 - November 12, 2015 +Libpng 1.5.25beta01 - November 13, 2015 -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.24.tar.xz (LZMA-compressed, recommended) - libpng-1.5.24.tar.gz - libpng-1.5.24.tar.bz2 + 1.5.25beta01.tar.xz (LZMA-compressed, recommended) + 1.5.25beta01.tar.gz + 1.5.25beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1524.7z (LZMA-compressed, recommended) - lpng1524.zip + lp1525b01.7z (LZMA-compressed, recommended) + lp1525b01.zip Other information: - libpng-1.5.24-README.txt - libpng-1.5.24-LICENSE.txt - libpng-1.5.24-*.asc (armored detached GPG signatures) + 1.5.25beta01-README.txt + 1.5.25beta01-LICENSE.txt + libpng-1.5.25beta01-*.asc (armored detached GPG signatures) -Changes since the last public release (1.5.23): - Avoid potentially dereferencing NULL info_ptr in png_info_init_3(). - Eliminated unused PNG_COST_SHIFT, PNG_WEIGHT_SHIFT, PNG_COST_FACTOR, and - PNG_WEIGHT_FACTOR macros. - Fixed potential leak of png_pixels in contrib/pngminus/pnm2png.c - Fixed uninitialized variable in contrib/gregbook/rpng2-x.c - Fixed some bad links in the man page. - Safely convert num_bytes to a png_byte in png_set_sig_bytes() (Robert - Seacord). - Fixed the recently reported 1's complement security issue by replacing - the value that is illegal in the PNG spec, in both signed and unsigned - values, with 0. Illegal unsigned values (anything greater than or equal - to 0x80000000) can still pass through, but since these are not illegal - in ANSI-C (unlike 0x80000000 in the signed case) the checking that - occurs later can catch them (John Bowler). - Fixed png_save_int_32 when int is not 2's complement (John Bowler). - Fixed byte order in png_do_read_filler() with 16-bit input (previously - fixed in libpng-1.6.17 and 1.7.0beta46). Previously the high and - low bytes of the filler, from png_set_filler() or from - png_set_add_alpha(), were read in the wrong order. - Merged pngvalid.c with version 1.6.19. - Added sPLT support to pngtest.c - Prevent writing over-length PLTE chunk (Cosmin Truta). - Libpng incorrectly calculated the output rowbytes when the application - decreased either the number of channels or the bit depth (or both) in - a user transform. This was safe; libpng overallocated buffer space - (potentially by quite a lot; up to 4 times the amount required) but, - from 1.5.4 on, resulted in a png_error (John Bowler). - Silently truncate over-length PLTE chunk while reading. - Fixed some inconsequential cut-and-paste typos in png_set_cHRM_XYZ_fixed(). - Clarified COPYRIGHT information to state explicitly that versions - are derived from previous versions. - Removed much of the long list of previous versions from png.h and - libpng.3. +Changes since the last public release (1.5.24): + +version 1.5.25beta01 [(PENDING RELEASE)] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index c5dd3557e..6cee34ad7 100644 --- a/CHANGES +++ b/CHANGES @@ -4419,11 +4419,13 @@ Version 1.5.24rc03 [omitted] Version 1.5.24rc04 [November 5, 2015] Fixed new bug with CRC error after reading an over-length palette - (bug report by Cosmin Truta). + (bug report by Cosmin Truta) (CVE-2015-8126). version 1.5.24 [November 12, 2015] Cleaned up coding style in png_handle_PLTE(). +version 1.5.25beta01 [(PENDING RELEASE)] + 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 788466224..4c6e3bb8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 24) +set(PNGLIB_RELEASE 25) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -224,7 +224,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.24 +# VERSION 15.${PNGLIB_RELEASE}.1.5.25beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 23c75967e..ff7c83d0f 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.24, November 12, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.25beta01, November 13, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -108,4 +108,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 12, 2015 +November 13, 2015 diff --git a/README b/README index dfc3f8917..9d9a2f596 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.24 - November 12, 2015 (shared library 15.0) +README for libpng version 1.5.25beta01 - November 13, 2015 (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 6b2267174..0dafcc717 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.69 for libpng 1.5.24. +# Generated by GNU Autoconf 2.69 for libpng 1.5.25beta01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.24' -PACKAGE_STRING='libpng 1.5.24' +PACKAGE_VERSION='1.5.25beta01' +PACKAGE_STRING='libpng 1.5.25beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1354,7 +1354,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.24 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.25beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.24:";; + short | recursive ) echo "Configuration of libpng 1.5.25beta01:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.24 +libpng configure 1.5.25beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2002,7 +2002,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.24, which was +It was created by libpng $as_me 1.5.25beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.24' + VERSION='1.5.25beta01' cat >>confdefs.h <<_ACEOF @@ -2982,10 +2982,10 @@ fi -PNGLIB_VERSION=1.5.24 +PNGLIB_VERSION=1.5.25beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=24 +PNGLIB_RELEASE=25 @@ -14124,7 +14124,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.24, which was +This file was extended by libpng $as_me 1.5.25beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14190,7 +14190,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.24 +libpng config.status 1.5.25beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c2d4b5311..6759b6582 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.24], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.25beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.24 +PNGLIB_VERSION=1.5.25beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=24 +PNGLIB_RELEASE=25 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 9b5596bf4..269c4a2ae 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.24 - November 12, 2015 + libpng version 1.5.25beta01 - November 13, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.24 - November 12, 2015 + libpng versions 0.97, January 1998, through 1.5.25beta01 - November 13, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4245,7 +4245,7 @@ a set of "safe" limits is applied in pngpriv.h. These can be overridden by application calls to png_set_user_limits(), png_set_user_chunk_cache_max(), and/or png_set_user_malloc_max() that increase or decrease the limits. Also, in libpng-1.5.10 the default width and height limits were increased -from 1,000,000 to 0x7ffffff (i.e., made unlimited). Therefore, the +from 1,000,000 to 0x7fffffff (i.e., made unlimited). Therefore, the limits are now default safe png_user_width_max 0x7fffffff 1,000,000 @@ -4510,7 +4510,7 @@ 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.24 are Y2K compliant. It is my belief that earlier +upward through 1.5.25beta01 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 diff --git a/libpng.3 b/libpng.3 index af132dcb9..3cc8a5285 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 12, 2015" +.TH LIBPNG 3 "November 13, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.24 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta01 .SH SYNOPSIS \fB #include \fP @@ -496,7 +496,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.24 - November 12, 2015 + libpng version 1.5.25beta01 - November 13, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -507,7 +507,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.24 - November 12, 2015 + libpng versions 0.97, January 1998, through 1.5.25beta01 - November 13, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4741,7 +4741,7 @@ a set of "safe" limits is applied in pngpriv.h. These can be overridden by application calls to png_set_user_limits(), png_set_user_chunk_cache_max(), and/or png_set_user_malloc_max() that increase or decrease the limits. Also, in libpng-1.5.10 the default width and height limits were increased -from 1,000,000 to 0x7ffffff (i.e., made unlimited). Therefore, the +from 1,000,000 to 0x7fffffff (i.e., made unlimited). Therefore, the limits are now default safe png_user_width_max 0x7fffffff 1,000,000 @@ -5006,7 +5006,7 @@ 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.24 are Y2K compliant. It is my belief that earlier +upward through 1.5.25beta01 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 @@ -5161,7 +5161,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.24 - November 12, 2015: +Libpng version 1.5.25beta01 - November 13, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5186,7 +5186,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.5.24, November 12, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.5.25beta01, November 13, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -5284,7 +5284,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 12, 2015 +November 13, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e94ccf17f..2419b3535 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 12, 2015" +.TH LIBPNGPF 3 "November 13, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.24 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.25beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 1e515b7f5..bdb2c7338 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 12, 2015" +.TH PNG 5 "November 13, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index fc7e7dfa3..486d37fea 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_24 Your_png_h_is_not_version_1_5_24; +typedef png_libpng_version_1_5_25beta01 Your_png_h_is_not_version_1_5_25beta01; /* 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.24 - November 12, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.25beta01 - November 13, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.24 - November 12, 2015\ + return "libpng version 1.5.25beta01 - November 13, 2015\ Copyright (c) 1998-2015 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 49999e65c..9fe405ae5 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.24, November 12, 2015 + * libpng version 1.5.25beta01, November 13, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,8 @@ * 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.24, November 12, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.5.25beta01, November 13, 2015: + * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -24,7 +25,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.5.24, November 12, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.5.25beta01, November 13, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -210,13 +211,13 @@ * Y2K compliance in libpng: * ========================= * - * November 12, 2015 + * November 13, 2015 * * 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.24 are Y2K compliant. It is my belief that + * upward through 1.5.25beta01 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 @@ -277,9 +278,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.24" +#define PNG_LIBPNG_VER_STRING "1.5.25beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.24 - November 12, 2015\n" + " libpng version 1.5.25beta01 - November 13, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -287,13 +288,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 24 +#define PNG_LIBPNG_VER_RELEASE 25 /* 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 @@ -310,7 +311,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. @@ -318,7 +319,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 10524 /* 1.5.24 */ +#define PNG_LIBPNG_VER 10525 /* 1.5.25 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -440,7 +441,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_24; +typedef char* png_libpng_version_1_5_25beta01; /* 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 9d79204a0..d43bb0673 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.24, November 12, 2015 + * libpng version 1.5.25beta01, November 13, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngset.c b/pngset.c index 0bed7e9eb..9c5dc9f33 100644 --- a/pngset.c +++ b/pngset.c @@ -1289,7 +1289,7 @@ png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max, { /* Images with dimensions larger than these limits will be * rejected by png_set_IHDR(). To accept any PNG datastream - * regardless of dimensions, set both limits to 0x7ffffffL. + * regardless of dimensions, set both limits to 0x7fffffffL. */ if (png_ptr == NULL) return; diff --git a/pngtest.c b/pngtest.c index 1243c0911..86a6a1ebc 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2056,4 +2056,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_24 Your_png_h_is_not_version_1_5_24; +typedef png_libpng_version_1_5_25beta01 Your_png_h_is_not_version_1_5_25beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b303a249e..442325284 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.24 - November 12, 2015 +libpng version 1.5.25beta01 - November 13, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c53b3cd54..268a8424d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@