diff --git a/ANNOUNCE b/ANNOUNCE index 81642c701..f80f508ea 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,33 +1,33 @@ -Libpng 1.4.14 - November 20, 2014 +Libpng 1.4.15beta01 - January 22, 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.4.14.tar.xz (LZMA-compressed, recommended) - libpng-1.4.14.tar.gz - libpng-1.4.14.tar.bz2 + 1.4.15beta01.tar.xz (LZMA-compressed, recommended) + 1.4.15beta01.tar.gz + 1.4.15beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1414.7z (LZMA-compressed, recommended) - lpng1414.zip + lp1415b01.7z (LZMA-compressed, recommended) + lp1415b01.zip Other information: - libpng-1.4.14-README.txt - libpng-1.4.14-LICENSE.txt - libpng-1.4.14-*.asc (armored detached GPG signatures) + 1.4.15beta01-README.txt + 1.4.15beta01-LICENSE.txt + libpng-1.4.15beta01-*.asc (armored detached GPG signatures) -Changes since the last public release (1.4.13): - Avoid out-of-bounds memory access in png_user_version_check(). - Simplified and future-proofed png_user_version_check(). - Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32. +Changes since the last public release (1.4.14): + +version 1.4.15beta01 [%RDATE%] Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 3599cb173..db5ca4f5d 100644 --- a/CHANGES +++ b/CHANGES @@ -2920,6 +2920,9 @@ version 1.4.14rc02 [November 17, 2014] Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32 version 1.4.14 [November 20, 2014] + No changes. + +version 1.4.15beta01 [%RDATE%] Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 08646c6e9..4da63fd72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 4) -set(PNGLIB_RELEASE 14) +set(PNGLIB_RELEASE 15) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -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.14 +# VERSION 14.${PNGLIB_RELEASE}.1.4.15beta01 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index eaf8ace65..cab10eff3 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.14 - November 20, 2014 +Installing libpng version 1.4.15beta01 - January 22, 2015 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.14" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.15beta01" 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 b4d19e2a2..d82468f24 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.14, November 20, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 22, 2015, are Copyright (c) 2004, 2006-2014 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 -November 20, 2014 +January 22, 2015 diff --git a/Makefile.am b/Makefile.am index 27dd2e30b..51a8f7629 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.14.txt + example.c libpng-1.4.15beta01.txt CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 3ce5274ea..bbd249622 100644 --- a/Makefile.in +++ b/Makefile.in @@ -616,7 +616,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.14.txt + example.c libpng-1.4.15beta01.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/README b/README index 68d6bac9f..7b0c72195 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.14 - November 20, 2014 (shared library 14.0) +README for libpng version 1.4.15beta01 - January 22, 2015 (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. @@ -187,9 +187,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.14) + (gcc, creates libpng14.so.14.1.4.15beta01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.14) + (gcc, creates libpng14.so.14.1.4.15beta01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -211,12 +211,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.14) + (gcc, creates libpng14.so.14.1.4.15beta01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.14) + (gcc, creates libpng14.so.14.1.4.15beta01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.14) + (gcc, creates libpng14.so.14.1.4.15beta01) 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 6c34cb595..7d08ecd79 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.4.14. +# Generated by GNU Autoconf 2.69 for libpng 1.4.15beta01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.14' -PACKAGE_STRING='libpng 1.4.14' +PACKAGE_VERSION='1.4.15beta01' +PACKAGE_STRING='libpng 1.4.15beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1330,7 +1330,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.14 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.15beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1400,7 +1400,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.14:";; + short | recursive ) echo "Configuration of libpng 1.4.15beta01:";; esac cat <<\_ACEOF @@ -1512,7 +1512,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.14 +libpng configure 1.4.15beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1935,7 +1935,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.14, which was +It was created by libpng $as_me 1.4.15beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2798,7 +2798,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.14' + VERSION='1.4.15beta01' cat >>confdefs.h <<_ACEOF @@ -2914,10 +2914,10 @@ fi -PNGLIB_VERSION=1.4.14 +PNGLIB_VERSION=1.4.15beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=14 +PNGLIB_RELEASE=15 @@ -13119,7 +13119,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.14, which was +This file was extended by libpng $as_me 1.4.15beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13185,7 +13185,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.14 +libpng config.status 1.4.15beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7115fcfac..bfb3073f3 100644 --- a/configure.ac +++ b/configure.ac @@ -16,17 +16,17 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.14], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.15beta01], [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.14 +PNGLIB_VERSION=1.4.15beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 -PNGLIB_RELEASE=14 +PNGLIB_RELEASE=15 dnl End of version number stuff diff --git a/libpng-1.4.14.txt b/libpng-1.4.15beta01.txt similarity index 99% rename from libpng-1.4.14.txt rename to libpng-1.4.15beta01.txt index 94c4c7639..b2dfaf95e 100644 --- a/libpng-1.4.14.txt +++ b/libpng-1.4.15beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.14 - November 20, 2014 + libpng version 1.4.15beta01 - January 22, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.14 - November 20, 2014 + libpng versions 0.97, January 1998, through 1.4.15beta01 - January 22, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -906,7 +906,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.14, not all possible expansions are supported. +As of libpng version 1.4.15beta01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3316,13 +3316,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -November 20, 2014 +January 22, 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.4.14 are Y2K compliant. It is my belief that earlier +upward through 1.4.15beta01 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 7594f5d96..1f1f48b3e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 20, 2014" +.TH LIBPNG 3 "January 22, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.14 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.15beta01 .SH SYNOPSIS \fB #include \fP @@ -442,7 +442,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.14 - November 20, 2014 + libpng version 1.4.15beta01 - January 22, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -453,7 +453,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.14 - November 20, 2014 + libpng versions 0.97, January 1998, through 1.4.15beta01 - January 22, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -1348,7 +1348,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.4.14, not all possible expansions are supported. +As of libpng version 1.4.15beta01, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3758,13 +3758,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -November 20, 2014 +January 22, 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.4.14 are Y2K compliant. It is my belief that earlier +upward through 1.4.15beta01 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 @@ -3979,6 +3979,7 @@ the first widely used release: 1.4.14beta01 14 10414 14.so.14.14[.0] 1.4.14rc01-02 14 10414 14.so.14.14[.0] 1.4.14 14 10414 14.so.14.14[.0] + 1.4.15beta01 14 10415 14.so.14.15[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -4034,7 +4035,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.14 - November 20, 2014: +Libpng version 1.4.15beta01 - January 22, 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). @@ -4057,7 +4058,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.4.14, November 20, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 22, 2015, 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 @@ -4156,7 +4157,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 20, 2014 +January 22, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 3994c00c4..f704d85b1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 20, 2014" +.TH LIBPNGPF 3 "January 22, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.14 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.15beta01 (private functions) .SH SYNOPSIS \fB#include diff --git a/png.5 b/png.5 index bd99dc642..c98a346e3 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 20, 2014" +.TH PNG 5 "January 22, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 14507ca09..39c2c7868 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_14 Your_png_h_is_not_version_1_4_14; +typedef version_1_4_15beta01 Your_png_h_is_not_version_1_4_15beta01; /* 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,14 +547,14 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.14 - November 20, 2014" PNG_STRING_NEWLINE \ - "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ + "libpng version 1.4.15 - %RDATE%" 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 ((png_charp) "libpng version 1.4.14 - November 20, 2014\ - Copyright (c) 1998-2010 Glenn Randers-Pehrson\ + return ((png_charp) "libpng version 1.4.15 - %RDATE%\ + Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); #endif diff --git a/png.h b/png.h index 6d1d6babc..0266f1eeb 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.14 - November 20, 2014 + * libpng version 1.4.15beta01 - January 22, 2015 * 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.14 - November 20, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.4.15beta01 - January 22, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -176,6 +176,7 @@ * 1.4.14beta01 14 10414 14.so.14.14[.0] * 1.4.14rc01-02 14 10414 14.so.14.14[.0] * 1.4.14 14 10414 14.so.14.14[.0] + * 1.4.15beta01 14 10415 14.so.14.15[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -207,7 +208,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.4.14, November 20, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.4.15beta01, January 22, 2015, are * Copyright (c) 2004, 2006-2013 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: @@ -319,13 +320,13 @@ * Y2K compliance in libpng: * ========================= * - * November 20, 2014 + * January 22, 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.4.14 are Y2K compliant. It is my belief that earlier + * upward through 1.4.15beta01 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 @@ -381,9 +382,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.14" +#define PNG_LIBPNG_VER_STRING "1.4.15beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.14 - November 20, 2014\n" + " libpng version 1.4.15beta01 - January 22, 2015\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -391,12 +392,12 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 4 -#define PNG_LIBPNG_VER_RELEASE 14 +#define PNG_LIBPNG_VER_RELEASE 15 /* 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 @@ -413,7 +414,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. @@ -421,7 +422,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 10414 /* 1.4.14 */ +#define PNG_LIBPNG_VER 10415 /* 1.4.15 */ #ifndef PNG_VERSION_INFO_ONLY /* Include the compression library's header */ @@ -1507,7 +1508,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_14; +typedef png_structp version_1_4_15beta01; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index d4057a6a0..3b3eebf61 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.14 - November 20, 2014 + * libpng version 1.4.15beta01 - January 22, 2015 * 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/pngpriv.h b/pngpriv.h index a94f04a99..b2890350d 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.14 - November 20, 2014 + * libpng version 1.4.15beta01 - January 22, 2015 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 42b5b0d9a..0b2abd36a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1702,4 +1702,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_14 your_png_h_is_not_version_1_4_14; +typedef version_1_4_15beta01 your_png_h_is_not_version_1_4_15beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 43a396db9..f8a81f1a7 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.14 - November 20, 2014 +libpng version 1.4.15beta01 - January 22, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index acbd81e76..b742c7b26 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@