From 29716349784b2495b30c742590dd0be1631ca2b3 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Fri, 29 Mar 2013 07:04:54 -0500 Subject: [PATCH] [libpng15] Bump version to 1.5.16beta01 --- ANNOUNCE | 84 +++++------------------------------ CHANGES | 3 ++ CMakeLists.txt | 4 +- LICENSE | 4 +- README | 2 +- configure | 24 +++++----- configure.ac | 6 +-- libpng-manual.txt | 8 ++-- libpng.3 | 21 ++++----- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 6 +-- png.h | 27 +++++------ pngconf.h | 2 +- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++--- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.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 +- 28 files changed, 91 insertions(+), 146 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 7be935fb1..c01b6b959 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,92 +1,32 @@ -Libpng 1.5.15 - March 28, 2013 +Libpng 1.5.16beta01 - March 29, 2013 -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.15.tar.xz (LZMA-compressed, recommended) - libpng-1.5.15.tar.gz - libpng-1.5.15.tar.bz2 + 1.5.16beta01.tar.xz (LZMA-compressed, recommended) + 1.5.16beta01.tar.gz + 1.5.16beta01.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lpng1515.7z (LZMA-compressed, recommended) - lpng1515.zip + lp1516b01.7z (LZMA-compressed, recommended) + lp1516b01.zip Other information: - libpng-1.5.15-README.txt - libpng-1.5.15-LICENSE.txt + 1.5.16beta01-README.txt + 1.5.16beta01-LICENSE.txt -Changes since the last public release (1.5.14): +Changes since the last public release (1.5.15): - Enabled renaming of the extern (but not DLL exported) ARM filter functions. - Also enabled inclusion of pngpriv.h in non-C files by preventing C/C++ - specific definitions if PNG_VERSION_INFO_ONLY is defined. - Added png_get_palette_max() function. - Made a probably general fix for the preprocessing used to generate source - files. This change might make the check for a special C preprocessor - unnecessary, and it also eliminates the requirement for sed in the - configure build process. - Fix typo in Makefile.am, fix scripts/pnglibconf.mak and makefile.std - Rebuilt Makefile.in, configure, etc., with autoconf-2.69 and automake-1.13 - Fix 'setting' handling in options.awk and fixed palette_max API - Remove SUN OS cc -E workround - no longer required - Turn serial tests back on (recently turned off by autotools upgrade). - Enclosed the new png_get_palette_max in #ifdef PNG_GET_PALETTE_MAX_SUPPORTED - block, and revised pnglibconf.h and pnglibconf.h.prebuilt accordingly. - Use approved/supported Android method to check for NEON, use Linux/POSIX - 1003.1 API to check /proc/self/auxv avoiding buffer allocation and other - library calls. - Fixed a race condition in the creation of the build 'scripts' directory - while building with a parallel make. - Use parentheses more consistently in "#if defined(MACRO)" tests. - Fixed PNG_ALIGN(ED)_MEMORY and add ability to turn off ARM_NEON - runtime checks - Updated the INSTALL document. - Revised INSTALL to recommend using CPPFLAGS instead of INCLUDES. - Revised scripts/makefile.freebsd to respect ZLIBLIB and ZLIBINC. - Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble - with CRLF line endings. - Avoid a possible memory leak in contrib/gregbook/readpng.c - Made the _SUPPORTED macro definitions consistent. The change made in - libpng15 to #define *_SUPPORTED 1, to match the use of -D*_SUPPORTED - (which means -D*_SUPPORTED=1) and avoid compiler warnings from GCC was made - inconsistently and causes problems as a result, also some additions in - pnglibconf.h.prebuilt were inconsistent (omitting the 1). This changes 1.5 - back to the scheme used both before (1.4) and after (1.6). This might cause - some build scripts to issue warnings, and might, in the extreme, cause some - applications to fail (but they would fail anyway against 1.6). It seems - safer to go for consistency, given the change in 1.6, not correctness here, - particularly as 'make check' currently warns anyway on the symbols.dfn check - because of the inconsistencies. - Corrected Android builds and corrected libpng.vers with symbol - prefixing This adds an API to set optimization options externally, - providing an alternative and general solution for the non-portable - run-time tests used by the ARM Neon code. It also makes those tests - compile and link on Android. - The order of settings vs options in pnglibconf.h is reversed to allow - settings to depend on options and options can now set (or override) the - defaults for settings. - Fixed CMakelists.txt to allow building a single variant of the library - (Claudio Bley): - Introduced a PNG_LIB_TARGETS variable that lists all activated library - targets. It is an error if this variable ends up empty, ie. you have - to build at least one library variant. - Made the *_COPY targets only depend on library targets actually being build. - Use PNG_LIB_TARGETS to unify a code path. - Changed the CREATE_SYMLINK macro to expect the full path to a file as the - first argument. When symlinking the filename component of that path is - determined and used as the link target. - Use copy_if_different in the CREATE_SYMLINK macro. - Eliminated two warnings from the Intel C compiler. The warnings are - technically valid, although a reasonable treatment of division would - show it to be incorrect. +Version 1.5.16beta01 [March 29, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 61950381d..b2c2ec3d8 100644 --- a/CHANGES +++ b/CHANGES @@ -4068,6 +4068,9 @@ Version 1.5.15rc01 [March 21, 2013] No changes. Version 1.5.15 [March 28, 2013] + No changes. + +Version 1.5.16beta01 [March 29, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index bc9b9c68e..68ed8e5bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ enable_testing() set(PNGLIB_MAJOR 1) set(PNGLIB_MINOR 5) -set(PNGLIB_RELEASE 15) +set(PNGLIB_RELEASE 16) set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) @@ -236,7 +236,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.15 +# VERSION 15.${PNGLIB_RELEASE}.1.5.16beta01 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index cf6e68296..c555cc60e 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.15, March 28, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.16beta01, March 29, 2013, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 28, 2013 +March 29, 2013 diff --git a/README b/README index 5c2040dbe..95a708f15 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.15 - March 28, 2013 (shared library 15.0) +README for libpng version 1.5.16beta01 - March 29, 2013 (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 5bdd922fa..ee6f45e8b 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.15. +# Generated by GNU Autoconf 2.69 for libpng 1.5.16beta01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.15' -PACKAGE_STRING='libpng 1.5.15' +PACKAGE_VERSION='1.5.16beta01' +PACKAGE_STRING='libpng 1.5.16beta01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1343,7 +1343,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.15 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.16beta01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1413,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.15:";; + short | recursive ) echo "Configuration of libpng 1.5.16beta01:";; esac cat <<\_ACEOF @@ -1535,7 +1535,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.15 +libpng configure 1.5.16beta01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1958,7 +1958,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.15, which was +It was created by libpng $as_me 1.5.16beta01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2821,7 +2821,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.15' + VERSION='1.5.16beta01' cat >>confdefs.h <<_ACEOF @@ -2891,10 +2891,10 @@ fi -PNGLIB_VERSION=1.5.15 +PNGLIB_VERSION=1.5.16beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=15 +PNGLIB_RELEASE=16 @@ -13407,7 +13407,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.15, which was +This file was extended by libpng $as_me 1.5.16beta01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13473,7 +13473,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.15 +libpng config.status 1.5.16beta01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 532c2f761..aa06f77be 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.15], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.16beta01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([serial-tests]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.15 +PNGLIB_VERSION=1.5.16beta01 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 -PNGLIB_RELEASE=15 +PNGLIB_RELEASE=16 dnl End of version number stuff diff --git a/libpng-manual.txt b/libpng-manual.txt index 3fcc04c0b..6e5b25381 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.15 - March 28, 2013 + libpng version 1.5.16beta01 - March 29, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 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.15 - March 28, 2013 + libpng versions 0.97, January 1998, through 1.5.16beta01 - March 29, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -4625,13 +4625,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -March 28, 2013 +March 29, 2013 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.15 are Y2K compliant. It is my belief that earlier +upward through 1.5.16beta01 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 that diff --git a/libpng.3 b/libpng.3 index 27644e171..9f9469ffb 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 28, 2013" +.TH LIBPNG 3 "March 29, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16beta01 .SH SYNOPSIS \fB #include \fP @@ -492,7 +492,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.15 - March 28, 2013 + libpng version 1.5.16beta01 - March 29, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.15 - March 28, 2013 + libpng versions 0.97, January 1998, through 1.5.16beta01 - March 29, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5118,13 +5118,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -March 28, 2013 +March 29, 2013 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.15 are Y2K compliant. It is my belief that earlier +upward through 1.5.16beta01 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 that @@ -5347,9 +5347,10 @@ the first widely used release: 1.5.14beta01-08 15 10514 15.so.15.14[.0] 1.5.14rc01-03 15 10514 15.so.15.14[.0] 1.5.14 15 10514 15.so.15.14[.0] - 1.5.15beta01-10 15 10515 15.so.15.15[.0] + 1.5.15beta01-09 15 10515 15.so.15.15[.0] 1.5.15rc01 15 10515 15.so.15.15[.0] 1.5.15 15 10515 15.so.15.15[.0] + 1.5.16beta01 15 10516 15.so.15.16[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5406,7 +5407,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.15 - March 28, 2013: +Libpng version 1.5.16beta01 - March 29, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5429,7 +5430,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.15, March 28, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.16beta01, March 29, 2013, 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 @@ -5528,7 +5529,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 28, 2013 +March 29, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 4c2897962..d7df01645 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 28, 2013" +.TH LIBPNGPF 3 "March 29, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16beta01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 1d25bf56a..86515a434 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 28, 2013" +.TH PNG 5 "March 29, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 7934623d2..5bb37eeb2 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_15 Your_png_h_is_not_version_1_5_15; +typedef png_libpng_version_1_5_16beta01 Your_png_h_is_not_version_1_5_16beta01; /* 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 @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.15 - March 28, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.5.16beta01 - March 29, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.15 - March 28, 2013\ + return "libpng version 1.5.16beta01 - March 29, 2013\ Copyright (c) 1998-2013 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 0134c318a..c24708357 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.15 - March 28, 2013 + * libpng version 1.5.16beta01 - March 29, 2013 * Copyright (c) 1998-2013 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.15 - March 28, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.5.16beta01 - March 29, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -184,9 +184,10 @@ * 1.5.14beta01-08 15 10514 15.so.15.14[.0] * 1.5.14rc01-03 15 10514 15.so.15.14[.0] * 1.5.14 15 10514 15.so.15.14[.0] - * 1.5.15beta01-10 15 10515 15.so.15.15[.0] + * 1.5.15beta01-09 15 10515 15.so.15.15[.0] * 1.5.15rc01 15 10515 15.so.15.15[.0] * 1.5.15 15 10515 15.so.15.15[.0] + * 1.5.16beta01 15 10516 15.so.15.16[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -218,7 +219,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.15, March 28, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.16beta01, March 29, 2013, 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: @@ -330,13 +331,13 @@ * Y2K compliance in libpng: * ========================= * - * March 28, 2013 + * March 29, 2013 * * 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.15 are Y2K compliant. It is my belief that + * upward through 1.5.16beta01 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 @@ -395,9 +396,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.15" +#define PNG_LIBPNG_VER_STRING "1.5.16beta01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.15 - March 28, 2013\n" + " libpng version 1.5.16beta01 - March 29, 2013\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -405,13 +406,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 15 +#define PNG_LIBPNG_VER_RELEASE 16 /* 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 @@ -428,7 +429,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. @@ -436,7 +437,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 10515 /* 1.5.15 */ +#define PNG_LIBPNG_VER 10516 /* 1.5.16 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -558,7 +559,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_15; +typedef char* png_libpng_version_1_5_16beta01; /* 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 bef9d8036..456d81cde 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.15 - March 28, 2013 + * libpng version 1.5.16beta01 - March 29, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 150d6f964..44eaa284a 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1949,4 +1949,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_15 Your_png_h_is_not_version_1_5_15; +typedef png_libpng_version_1_5_16beta01 Your_png_h_is_not_version_1_5_16beta01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 02907d4ff..226124d09 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.15 - March 28, 2013 +libpng version 1.5.16beta01 - March 29, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 643ea4b04..e0774287a 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@