diff --git a/CMakeLists.txt b/CMakeLists.txt index aed4be469..eb32cba0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.23beta01 +# VERSION 15.${PNGLIB_RELEASE}.1.5.23beta02 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 1c92b1412..17f71c7dd 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.23beta01, May 21, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.23beta02, June 1, 2015, are Copyright (c) 2004, 2006-2015 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 -May 21, 2015 +June 1, 2015 diff --git a/README b/README index 6d3a0d085..e88957347 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.23beta01 - May 21, 2015 (shared library 15.0) +README for libpng version 1.5.23beta02 - June 1, 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 53e5e9076..77438bb72 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.23beta01. +# Generated by GNU Autoconf 2.69 for libpng 1.5.23beta02. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.5.23beta01' -PACKAGE_STRING='libpng 1.5.23beta01' +PACKAGE_VERSION='1.5.23beta02' +PACKAGE_STRING='libpng 1.5.23beta02' 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.23beta01 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.23beta02 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.23beta01:";; + short | recursive ) echo "Configuration of libpng 1.5.23beta02:";; 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.23beta01 +libpng configure 1.5.23beta02 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.23beta01, which was +It was created by libpng $as_me 1.5.23beta02, 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.23beta01' + VERSION='1.5.23beta02' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.23beta01 +PNGLIB_VERSION=1.5.23beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=23 @@ -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.23beta01, which was +This file was extended by libpng $as_me 1.5.23beta02, 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.23beta01 +libpng config.status 1.5.23beta02 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index aa9e12f59..d0abdb87d 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.23beta01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.23beta02], [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.23beta01 +PNGLIB_VERSION=1.5.23beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=23 diff --git a/libpng-manual.txt b/libpng-manual.txt index 584b4922f..21c6d6dab 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.23beta01 - May 21, 2015 + libpng version 1.5.23beta02 - June 1, 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.23beta01 - May 21, 2015 + libpng versions 0.97, January 1998, through 1.5.23beta02 - June 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4535,13 +4535,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -May 21, 2015 +June 1, 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.23beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.23beta02 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 723cffa42..a9f805f63 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "May 21, 2015" +.TH LIBPNG 3 "June 1, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta02 .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.23beta01 - May 21, 2015 + libpng version 1.5.23beta02 - June 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 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.23beta01 - May 21, 2015 + libpng versions 0.97, January 1998, through 1.5.23beta02 - June 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5027,13 +5027,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -May 21, 2015 +June 1, 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.23beta01 are Y2K compliant. It is my belief that earlier +upward through 1.5.23beta02 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 @@ -5337,7 +5337,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.23beta01 - May 21, 2015: +Libpng version 1.5.23beta02 - June 1, 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). @@ -5360,7 +5360,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.23beta01, May 21, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.23beta02, June 1, 2015, are Copyright (c) 2004,2006-2015 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 @@ -5459,7 +5459,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 21, 2015 +June 1, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 35e3dddcc..2e6ccdbf2 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "May 21, 2015" +.TH LIBPNGPF 3 "June 1, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.23beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index df3153a9a..8ae0ca2a7 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "May 21, 2015" +.TH PNG 5 "June 1, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.h b/png.h index ec1fe59c3..ec7c31ef3 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.23beta01, May 21, 2015 + * libpng version 1.5.23beta02, June 1, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,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.23beta01, May 21, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.5.23beta02, June 1, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -209,7 +209,7 @@ * 1.5.22beta01-04 15 10522 15.so.15.22[.0] * 1.5.22rc01-04 15 10522 15.so.15.22[.0] * 1.5.22 15 10522 15.so.15.22[.0] - * 1.5.23beta01 15 10523 15.so.15.23[.0] + * 1.5.23beta01-02 15 10523 15.so.15.23[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -241,7 +241,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.23beta01, May 21, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.23beta02, June 1, 2015, are * Copyright (c) 2004, 2006-2015 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: @@ -353,13 +353,13 @@ * Y2K compliance in libpng: * ========================= * - * May 21, 2015 + * June 1, 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.23beta01 are Y2K compliant. It is my belief that + * upward through 1.5.23beta02 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 @@ -420,9 +420,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.23beta01" +#define PNG_LIBPNG_VER_STRING "1.5.23beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.23beta01 - May 21, 2015\n" + " libpng version 1.5.23beta02 - June 1, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -436,7 +436,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 @@ -583,7 +583,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_23beta01; +typedef char* png_libpng_version_1_5_23beta02; /* 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 @@ -1672,35 +1672,7 @@ PNG_EXPORT(67, void, png_set_filter, #define PNG_FILTER_VALUE_PAETH 4 #define PNG_FILTER_VALUE_LAST 5 -#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* EXPERIMENTAL */ -/* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_ - * defines, either the default (minimum-sum-of-absolute-differences), or - * the experimental method (weighted-minimum-sum-of-absolute-differences). - * - * Weights are factors >= 1.0, indicating how important it is to keep the - * filter type consistent between rows. Larger numbers mean the current - * filter is that many times as likely to be the same as the "num_weights" - * previous filters. This is cumulative for each previous row with a weight. - * There needs to be "num_weights" values in "filter_weights", or it can be - * NULL if the weights aren't being specified. Weights have no influence on - * the selection of the first row filter. Well chosen weights can (in theory) - * improve the compression for a given image. - * - * Costs are factors >= 1.0 indicating the relative decoding costs of a - * filter type. Higher costs indicate more decoding expense, and are - * therefore less likely to be selected over a filter with lower computational - * costs. There needs to be a value in "filter_costs" for each valid filter - * type (given by PNG_FILTER_VALUE_LAST), or it can be NULL if you aren't - * setting the costs. Costs try to improve the speed of decompression without - * unduly increasing the compressed image size. - * - * A negative weight or cost indicates the default value is to be used, and - * values in the range [0.0, 1.0) indicate the value is to remain unchanged. - * The default values for both weights and costs are currently 1.0, but may - * change if good general weighting/cost heuristics can be found. If both - * the weights and costs are set to 1.0, this degenerates the WEIGHTED method - * to the UNWEIGHTED method, but with added encoding time/computation. - */ +#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* DEPRECATED */ PNG_FP_EXPORT(68, void, png_set_filter_heuristics, (png_structp png_ptr, int heuristic_method, int num_weights, png_const_doublep filter_weights, png_const_doublep filter_costs)) diff --git a/pngconf.h b/pngconf.h index 26d4040f3..1451ae41f 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.23beta01, May 21, 2015 + * libpng version 1.5.23beta02, June 1, 2015 * * 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 d6b5a3f10..9e33e7652 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2025,4 +2025,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_23beta01 Your_png_h_is_not_version_1_5_23beta01; +typedef png_libpng_version_1_5_23beta02 Your_png_h_is_not_version_1_5_23beta02; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 530cb3078..a8b44f93f 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.23beta01 - May 21, 2015 +libpng version 1.5.23beta02 - June 1, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 8b0dc4875..cc0267c76 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@