diff options
-rw-r--r-- | ANNOUNCE | 18 | ||||
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | configure | 68 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | libpng-manual.txt | 8 | ||||
-rw-r--r-- | libpng.3 | 20 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 20 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/pnglibconf.h.prebuilt | 4 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
26 files changed, 107 insertions, 94 deletions
@@ -1,5 +1,5 @@ -Libpng 1.5.16beta01 - April 25, 2013 +Libpng 1.5.16beta02 - April 26, 2013 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. @@ -9,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.5.16beta01.tar.xz (LZMA-compressed, recommended) - 1.5.16beta01.tar.gz - 1.5.16beta01.tar.bz2 + 1.5.16beta02.tar.xz (LZMA-compressed, recommended) + 1.5.16beta02.tar.gz + 1.5.16beta02.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1516b01.7z (LZMA-compressed, recommended) - lp1516b01.zip + lp1516b02.7z (LZMA-compressed, recommended) + lp1516b02.zip Other information: - 1.5.16beta01-README.txt - 1.5.16beta01-LICENSE.txt + 1.5.16beta02-README.txt + 1.5.16beta02-LICENSE.txt Changes since the last public release (1.5.15): @@ -35,6 +35,8 @@ Version 1.5.16beta01 [April 25, 2013] was switched 'off' as opposed to being explicitly disabled. Avoid a compiler warning about unused png_ptr in translate_gamma_flags() +Version 1.5.16beta02 [April 26, 2013] + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -4079,6 +4079,8 @@ Version 1.5.16beta01 [April 25, 2013] was switched 'off' as opposed to being explicitly disabled. Avoid a compiler warning about unused png_ptr in translate_gamma_flags() +Version 1.5.16beta02 [April 26, 2013] + 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 68ed8e5bd..729f8cbf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.16beta01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.16beta02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) @@ -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.16beta01, March 29, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.16beta02, April 26, 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 29, 2013 +April 26, 2013 diff --git a/Makefile.in b/Makefile.in index bea892a75..e5a9b8e7e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,7 +288,6 @@ distcleancheck_listfiles = find . -type f -print pkgincludedir = $(includedir)/$(PNGLIB_BASENAME) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ -AM_CCASFLAGS = @AM_CCASFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ @@ -1,4 +1,4 @@ -README for libpng version 1.5.16beta01 - March 29, 2013 (shared library 15.0) +README for libpng version 1.5.16beta02 - April 26, 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. @@ -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.16beta01. +# Generated by GNU Autoconf 2.69 for libpng 1.5.16beta02. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.16beta01' -PACKAGE_STRING='libpng 1.5.16beta01' +PACKAGE_VERSION='1.5.16beta02' +PACKAGE_STRING='libpng 1.5.16beta02' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -637,7 +637,6 @@ am__EXEEXT_TRUE LTLIBOBJS PNG_ARM_NEON_FALSE PNG_ARM_NEON_TRUE -AM_CCASFLAGS binconfigs pkgconfigdir PNGLIB_RELEASE @@ -1343,7 +1342,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.16beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.16beta02 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1412,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.16beta01:";; + short | recursive ) echo "Configuration of libpng 1.5.16beta02:";; esac cat <<\_ACEOF @@ -1435,13 +1434,12 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-arm-neon Enable ARM NEON optimizations: =off, check, api, on: - off: disable the optimizations; check: use internal - checking code (deprecated and poorly supported); - api: disable by default, enable by a call to - png_set_option; on: turn on unconditionally. The - default is 'on' if __ARM_NEON__ is defined, - otherwise 'off'. + --enable-arm-neon Enable ARM NEON optimizations: =no/off, check, api, + yes/on: no/off: disable the optimizations; check: + use internal checking code (deprecated and poorly + supported); api: disable by default, enable by a + call to png_set_option; yes/on: turn on + unconditionally. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1535,7 +1533,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.16beta01 +libpng configure 1.5.16beta02 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1958,7 +1956,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.16beta01, which was +It was created by libpng $as_me 1.5.16beta02, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2821,7 +2819,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.16beta01' + VERSION='1.5.16beta02' cat >>confdefs.h <<_ACEOF @@ -2891,7 +2889,7 @@ fi -PNGLIB_VERSION=1.5.16beta01 +PNGLIB_VERSION=1.5.16beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=16 @@ -12809,19 +12807,24 @@ fi -# Because GCC by default assembles code with an executable stack, even though it -# compiles C code with a non-executable stack, it is necessary to do a fixup -# here (this may by GCC specific) -AM_CCASFLAGS=-Wa,--noexecstack - +# HOST SPECIFIC OPTIONS +# ===================== +# +# ARM +# === +# +# ARM NEON (SIMD) support. # Check whether --enable-arm-neon was given. if test "${enable_arm_neon+set}" = set; then : enableval=$enable_arm_neon; case "$enableval" in - off) + no|off) + # disable the default enabling on __ARM_NEON__ systems: $as_echo "#define PNG_NO_ARM_NEON /**/" >>confdefs.h -;; + + # Prevent inclusion of the assembler files below: + enable_arm_neon=no;; check) $as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h @@ -12830,16 +12833,23 @@ $as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h $as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h ;; - on) + yes|on) $as_echo "#define PNG_ARM_NEON_SUPPORTED /**/" >>confdefs.h ;; *) - as_fn_error $? "arm-neon: option value required (off/check/api/on)" "$LINENO" 5;; + as_fn_error $? "--enable-arm-neon=${enable_arm_neon}: invalid value" "$LINENO" 5 esac fi - if test "${enable_arm_neon:-no}" != "no"; then + +# If enable/disable was not specified default to using the optimizations if the +# host CPU is ARM and the comppiler is targeting a NEON host. The latter test +# is done in scripts/pnglibconf.dfa by checking for __ARM_NEON__. The +# AM_CONDITIONAL below controls whether the ARM NEON source files are built. + + if test "$enable_arm_neon" != 'no' && + test "$host_cpu" = 'arm' -o "$enable_arm_neon" != ''; then PNG_ARM_NEON_TRUE= PNG_ARM_NEON_FALSE='#' else @@ -13407,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.16beta01, which was +This file was extended by libpng $as_me 1.5.16beta02, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13473,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.16beta01 +libpng config.status 1.5.16beta02 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4956d5c59..1b91d99d5 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.16beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.16beta02], [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.16beta01 +PNGLIB_VERSION=1.5.16beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=16 @@ -201,7 +201,7 @@ AC_ARG_ENABLE([arm-neon], esac]) # If enable/disable was not specified default to using the optimizations if the -# host CPU is ARM and the comppiler is targeting a NEON host. The latter test +# host CPU is ARM and the compiler is targeting a NEON host. The latter test # is done in scripts/pnglibconf.dfa by checking for __ARM_NEON__. The # AM_CONDITIONAL below controls whether the ARM NEON source files are built. @@ -209,7 +209,7 @@ AM_CONDITIONAL([PNG_ARM_NEON], [test "$enable_arm_neon" != 'no' && test "$host_cpu" = 'arm' -o "$enable_arm_neon" != '']) - AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]]) +AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]]) # Config files, substituting as above AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in]) diff --git a/libpng-manual.txt b/libpng-manual.txt index 9213db9a2..11c1dc7e0 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.16beta01 - April 11, 2013 + libpng version 1.5.16beta02 - April 26, 2013 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.16beta01 - April 11, 2013 + libpng versions 0.97, January 1998, through 1.5.16beta02 - April 26, 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 -April 11, 2013 +April 26, 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.16beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.16beta02 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 11, 2013" +.TH LIBPNG 3 "April 26, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16beta02 .SH SYNOPSIS \fB #include <png.h>\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.16beta01 - April 11, 2013 + libpng version 1.5.16beta02 - April 26, 2013 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.16beta01 - April 11, 2013 + libpng versions 0.97, January 1998, through 1.5.16beta02 - April 26, 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 -April 11, 2013 +April 26, 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.16beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.16beta02 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 @@ -5350,7 +5350,7 @@ the first widely used release: 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] + 1.5.16beta01-02 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 @@ -5407,7 +5407,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.16beta01 - April 11, 2013: +Libpng version 1.5.16beta02 - April 26, 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). @@ -5430,7 +5430,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.16beta01, April 11, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.16beta02, April 26, 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 @@ -5529,7 +5529,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 11, 2013 +April 26, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index d7df01645..ba70f7b8c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 29, 2013" +.TH LIBPNGPF 3 "April 26, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.16beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -1,4 +1,4 @@ -.TH PNG 5 "March 29, 2013" +.TH PNG 5 "April 26, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_16beta01 Your_png_h_is_not_version_1_5_16beta01; +typedef png_libpng_version_1_5_16beta02 Your_png_h_is_not_version_1_5_16beta02; /* 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.16beta01 - March 29, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.5.16beta02 - April 26, 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.16beta01 - March 29, 2013\ + return "libpng version 1.5.16beta02 - April 26, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.16beta01 - March 29, 2013 + * libpng version 1.5.16beta02 - April 26, 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.16beta01 - March 29, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.5.16beta02 - April 26, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -187,7 +187,7 @@ * 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] + * 1.5.16beta01-02 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 @@ -219,7 +219,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.16beta01, March 29, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.16beta02, April 26, 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: @@ -331,13 +331,13 @@ * Y2K compliance in libpng: * ========================= * - * March 29, 2013 + * April 26, 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.16beta01 are Y2K compliant. It is my belief that + * upward through 1.5.16beta02 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 @@ -396,9 +396,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.16beta01" +#define PNG_LIBPNG_VER_STRING "1.5.16beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.16beta01 - March 29, 2013\n" + " libpng version 1.5.16beta02 - April 26, 2013\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -412,7 +412,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -559,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_16beta01; +typedef char* png_libpng_version_1_5_16beta02; /* 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 @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.16beta01 - March 29, 2013 + * libpng version 1.5.16beta02 - April 26, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -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_16beta01 Your_png_h_is_not_version_1_5_16beta01; +typedef png_libpng_version_1_5_16beta02 Your_png_h_is_not_version_1_5_16beta02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 226124d09..720702031 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.16beta01 - March 29, 2013 +libpng version 1.5.16beta02 - April 26, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e0774287a..60c58c48c 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.16beta01 - March 29, 2013 + * libpng version 1.5.16beta02 - April 26, 2013 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 84ed84f35..903ef5325 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.5.16beta01 - March 29, 2013 +Makefiles for libpng version 1.5.16beta02 - April 26, 2013 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.5.16beta01) + (gcc, creates libpng15.so.15.1.5.16beta02) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -21,7 +21,7 @@ pnglibconf.h.prebuilt => Stores configuration settings 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.16beta01) + (gcc, creates libpng15.so.15.1.5.16beta02) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -36,12 +36,12 @@ pnglibconf.h.prebuilt => Stores configuration settings 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.16beta01) + creates libpng15.so.15.1.5.16beta02) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.5.16beta01) + creates libpng15.so.15.1.5.16beta02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.5.16beta01) + creates libpng15.so.15.1.5.16beta02) 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 074530a4b..c7a0d90e7 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.5.16beta01 +version=1.5.16beta02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index ad8a58ee5..df8ab1c84 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng15 Name: libpng Description: Loads and saves PNG files -Version: 1.5.16beta01 +Version: 1.5.16beta02 Libs: -L${libdir} -lpng15 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 87f8c02d0..467889b64 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15 LIB= png15 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.5.16beta01 +SHLIB_MINOR= 1.5.16beta02 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 99b9b9b11..ec67b7f03 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.16beta01 +SHLIB_MINOR= 1.5.16beta02 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 8115099ea..c77410f58 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.16beta01 +SHLIB_MINOR= 1.5.16beta02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 56380d1c8..b53db6cda 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,7 +1,7 @@ -/* 1.5.16beta01 STANDARD API DEFINITION */ +/* 1.5.16beta02 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.16beta01 - March 29, 2013 */ +/* libpng version 1.5.16beta02 - April 26, 2013 */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index 5bed8578d..2953c1293 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.5.16beta01 +;Version 1.5.16beta02 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |