diff --git a/ANNOUNCE b/ANNOUNCE index 3d36cccf0..645c7681a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.25beta03 - August 18, 2016 +Libpng 1.6.25rc04 - August 29, 2016 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. @@ -8,20 +8,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.25beta03.tar.xz (LZMA-compressed, recommended) - 1.6.25beta03.tar.gz + 1.6.25rc04.tar.xz (LZMA-compressed, recommended) + 1.6.25rc04.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1625b03.7z (LZMA-compressed, recommended) - lp1625b03.zip + lp1625r04.7z (LZMA-compressed, recommended) + lp1625r04.zip Other information: - 1.6.25beta03-README.txt - 1.6.25beta03-LICENSE.txt - libpng-1.6.25beta03-*.asc (armored detached GPG signatures) + 1.6.25rc04-README.txt + 1.6.25rc04-LICENSE.txt + libpng-1.6.25rc04-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.24): @@ -34,7 +34,16 @@ Version 1.6.25beta02 [August 18, 2016] Don't install pngcp; it conflicts with pngcp in the pngtools package. Minor editing of INSTALL, (whitespace, added copyright line) -Version 1.6.25beta03 [August 18, 2016] +Version 1.6.25rc01 [August 24, 2016] + No changes. + +Version 1.6.25rc02 [August 29, 2016] + Added MIPS support (Mandar Sahastrabuddhe ). + +Version 1.6.25rc03 [August 29, 2016] + Rebased contrib/intel/intel_sse.patch after the MIPS implementation. + +Version 1.6.25rc04 [August 29, 2016] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 65fe37f2e..e07a4b598 100644 --- a/CHANGES +++ b/CHANGES @@ -5684,7 +5684,16 @@ Version 1.6.25beta02 [August 18, 2016] Don't install pngcp; it conflicts with pngcp in the pngtools package. Minor editing of INSTALL, (whitespace, added copyright line) -Version 1.6.25beta03 [August 18, 2016] +Version 1.6.25rc01 [August 24, 2016] + No changes. + +Version 1.6.25rc02 [August 29, 2016] + Added MIPS support (Mandar Sahastrabuddhe ). + +Version 1.6.25rc03 [August 29, 2016] + Rebased contrib/intel/intel_sse.patch after the MIPS implementation. + +Version 1.6.25rc04 [August 29, 2016] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 011921213..9b33868ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,7 +696,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(png PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.25beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.25rc04 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index d280666ee..38a290e4a 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.6.25beta03, August 18, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.25rc04, August 29, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -127,4 +127,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 18, 2016 +August 29, 2016 diff --git a/Makefile.am b/Makefile.am index a66ed4c57..e339c647e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am, the source file for Makefile.in (and hence Makefile), is # # Copyright (c) 2004-2016 Glenn Randers-Pehrson -# Last changed in libpng 1.6.25beta03 [August 29, 2016] +# Last changed in libpng 1.6.25 [(PENDING RELEASE)] # # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer diff --git a/README b/README index 0e6c83b4f..d4312da13 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.25beta03 - August 18, 2016 (shared library 16.0) +README for libpng version 1.6.25rc04 - August 29, 2016 (shared library 16.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.ac b/configure.ac index a0b5b249f..2933487bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac # Copyright (c) 2004-2016 Glenn Randers-Pehrson -# Last changed in libpng 1.6.25beta03 [August 29, 2016] +# Last changed in libpng 1.6.25 [(PENDING RELEASE)] # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.25beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.25rc04],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.25beta03 +PNGLIB_VERSION=1.6.25rc04 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=25 diff --git a/contrib/intel/intel_sse.patch b/contrib/intel/intel_sse.patch index cddd9bf26..cffaa7164 100644 --- a/contrib/intel/intel_sse.patch +++ b/contrib/intel/intel_sse.patch @@ -1,13 +1,13 @@ diff --git a/configure.ac b/configure.ac ---- a/configure.ac 2016-05-25 18:59:10.000000000 -0400 -+++ b/configure.ac 2016-05-25 19:48:10.631751170 -0400 -@@ -341,16 +341,50 @@ AC_ARG_ENABLE([arm-neon], +--- a/configure.ac 2016-08-29 11:46:27.000000000 -0400 ++++ b/configure.ac 2016-08-29 16:57:03.866355018 -0400 +@@ -386,16 +386,51 @@ AC_ARG_ENABLE([mips-msa], + # future host CPU does not match 'mips*') - AM_CONDITIONAL([PNG_ARM_NEON], - [test "$enable_arm_neon" != 'no' && + AM_CONDITIONAL([PNG_MIPS_MSA], + [test "$enable_mips_msa" != 'no' && case "$host_cpu" in - arm*|aarch64*) :;; - *) test "$enable_arm_neon" != '';; + mipsel*|mips64el*) :;; esac]) +# INTEL @@ -44,6 +44,7 @@ diff --git a/configure.ac b/configure.ac + i?86|x86_64) :;; + *) test "$enable_intel_sse" != '';; + esac]) ++ AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]]) # Config files, substituting as above @@ -53,21 +54,22 @@ diff --git a/configure.ac b/configure.ac AC_OUTPUT diff --git a/Makefile.am b/Makefile.am ---- a/Makefile.am 2016-05-17 18:15:12.000000000 -0400 -+++ b/Makefile.am 2016-05-25 19:48:10.631751170 -0400 -@@ -92,16 +92,20 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SO - pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\ - png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa - - if PNG_ARM_NEON - libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\ +--- a/Makefile.am 2016-08-29 11:46:27.000000000 -0400 ++++ b/Makefile.am 2016-08-29 16:57:45.955528215 -0400 +@@ -97,16 +97,21 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SO arm/filter_neon.S arm/filter_neon_intrinsics.c endif + if PNG_MIPS_MSA + libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/mips_init.c\ + mips/filter_msa_intrinsics.c + endif + +if PNG_INTEL_SSE +libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += contrib/intel/intel_init.c\ + contrib/intel/filter_sse2_intrinsics.c +endif ++ nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \ @@ -77,16 +79,16 @@ diff --git a/Makefile.am b/Makefile.am # Versioned symbols and restricted exports if HAVE_SOLARIS_LD diff --git a/pngpriv.h b/pngpriv.h ---- a/pngpriv.h 2016-08-01 18:13:38.770128810 -0500 -+++ b/pngpriv.h 2016-08-01 18:50:19.130179017 -0500 -@@ -177,16 +177,52 @@ - # endif /* !PNG_ARM_NEON_IMPLEMENTATION */ - - # ifndef PNG_ARM_NEON_IMPLEMENTATION - /* Use the intrinsics code by default. */ - # define PNG_ARM_NEON_IMPLEMENTATION 1 +--- a/pngpriv.h 2016-08-29 11:46:26.000000000 -0400 ++++ b/pngpriv.h 2016-08-29 16:55:13.023259857 -0400 +@@ -185,16 +185,52 @@ + #ifndef PNG_MIPS_MSA_OPT + # if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED) + # define PNG_MIPS_MSA_OPT 2 + # else + # define PNG_MIPS_MSA_OPT 0 # endif - #endif /* PNG_ARM_NEON_OPT > 0 */ + #endif +#ifndef PNG_INTEL_SSE_OPT +# ifdef PNG_INTEL_SSE @@ -124,24 +126,23 @@ diff --git a/pngpriv.h b/pngpriv.h +# endif +#endif + - /* Is this a build of a DLL where compilation of the object modules requires - * different preprocessor settings to those required for a simple library? If - * so PNG_BUILD_DLL must be set. - * - * If libpng is used inside a DLL but that DLL does not export the libpng APIs - * PNG_BUILD_DLL must not be set. To avoid the code below kicking in build a - * static library of libpng then link the DLL against that. - */ -@@ -1185,16 +1221,31 @@ PNG_INTERNAL_FUNCTION(void,png_read_filt - row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); - PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop - row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); - PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop - row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); - PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop + #if PNG_MIPS_MSA_OPT > 0 + # define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa + # ifndef PNG_MIPS_MSA_IMPLEMENTATION + # if defined(__mips_msa) + # if defined(__clang__) + # elif defined(__GNUC__) + # if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) + # define PNG_MIPS_MSA_IMPLEMENTATION 2 +@@ -1220,16 +1256,31 @@ PNG_INTERNAL_FUNCTION(void,png_read_filt row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); #endif -+ + + #if PNG_MIPS_MSA_OPT > 0 + PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info, + png_bytep row, png_const_bytep prev_row),PNG_EMPTY); + #endif + +#if PNG_INTEL_SSE_IMPLEMENTATION > 0 +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); @@ -156,7 +157,7 @@ diff --git a/pngpriv.h b/pngpriv.h +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop + row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY); +#endif - ++ /* Choose the best filter to use and filter the row data */ PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr, png_row_infop row_info),PNG_EMPTY); @@ -164,15 +165,17 @@ diff --git a/pngpriv.h b/pngpriv.h #ifdef PNG_SEQUENTIAL_READ_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr, png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY); -@@ -1916,16 +1967,20 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_O - /* List *all* the possible optimizations here - this branch is required if - * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in - * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing. - */ - # if PNG_ARM_NEON_OPT > 0 + /* Read 'avail_out' bytes of data from the IDAT stream. If the output buffer +@@ -1955,16 +2006,21 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_O PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon, (png_structp png_ptr, unsigned int bpp), PNG_EMPTY); - # endif + #endif + + #if PNG_MIPS_MSA_OPT > 0 + PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa, + (png_structp png_ptr, unsigned int bpp), PNG_EMPTY); + #endif ++ +# if PNG_INTEL_SSE_IMPLEMENTATION > 0 +PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2, + (png_structp png_ptr, unsigned int bpp), PNG_EMPTY); diff --git a/libpng-manual.txt b/libpng-manual.txt index 8ba9ee302..bed4cd6d1 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.6.25beta03 - August 18, 2016 + libpng version 1.6.25rc04 - August 29, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 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.6.25beta03 - August 18, 2016 + libpng versions 0.97, January 1998, through 1.6.25rc04 - August 29, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5350,7 +5350,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.6.25beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.25rc04 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 6996b0be8..fc61bf405 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 18, 2016" +.TH LIBPNG 3 "August 29, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25rc04 .SH SYNOPSIS \fB #include \fP @@ -510,7 +510,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.6.25beta03 - August 18, 2016 + libpng version 1.6.25rc04 - August 29, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.25beta03 - August 18, 2016 + libpng versions 0.97, January 1998, through 1.6.25rc04 - August 29, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -5860,7 +5860,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.6.25beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.25rc04 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 @@ -6018,7 +6018,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.25beta03 - August 18, 2016: +Libpng version 1.6.25rc04 - August 29, 2016: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6043,7 +6043,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.25beta03, August 18, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.25rc04, August 29, 2016 are Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -6168,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 18, 2016 +August 29, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 46df35624..b388f97e4 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 18, 2016" +.TH LIBPNGPF 3 "August 29, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25rc04 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/mips/filter_msa_intrinsics.c b/mips/filter_msa_intrinsics.c index 2943700ad..ad25e7d14 100644 --- a/mips/filter_msa_intrinsics.c +++ b/mips/filter_msa_intrinsics.c @@ -3,7 +3,7 @@ * * Copyright (c) 2016 Glenn Randers-Pehrson * Written by Mandar Sahastrabuddhe, August 2016. - * Last changed in libpng 1.6.25beta03 [August 29, 2016] + * Last changed in libpng 1.6.25 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/mips/mips_init.c b/mips/mips_init.c index fd32eea35..caf521e7c 100644 --- a/mips/mips_init.c +++ b/mips/mips_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2016 Glenn Randers-Pehrson * Written by Mandar Sahastrabuddhe, 2016. - * Last changed in libpng 1.6.25beta03 [August 29, 2016] + * Last changed in libpng 1.6.25 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/png.5 b/png.5 index a6fa02621..1acf5b76c 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "August 18, 2016" +.TH PNG 5 "August 29, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index dcee56cd9..681371cbf 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_6_25beta03 Your_png_h_is_not_version_1_6_25beta03; +typedef png_libpng_version_1_6_25rc04 Your_png_h_is_not_version_1_6_25rc04; /* 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 @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.25beta03 - August 18, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.25rc04 - August 29, 2016" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2016 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.6.25beta03 - August 18, 2016\ + return "libpng version 1.6.25rc04 - August 29, 2016\ Copyright (c) 1998-2002,2004,2006-2016 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 e576a46e0..417a3d3be 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.25beta03, August 29, 2016 + * libpng version 1.6.25rc04, August 29, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 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.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.25beta03, August 18, 2016: + * libpng versions 0.97, January 1998, through 1.6.25rc04, August 29, 2016: * Glenn Randers-Pehrson. * See also "Contributing Authors", below. */ @@ -29,7 +29,7 @@ * files that are distributed with libpng have other copyright owners and * are released under other open source licenses. * - * libpng versions 1.0.7, July 1, 2000 through 1.6.25beta03, August 29, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.25rc04, August 29, 2016 are * Copyright (c) 2000-2002, 2004, 2006-2016 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 @@ -246,13 +246,13 @@ * Y2K compliance in libpng: * ========================= * - * August 18, 2016 + * August 29, 2016 * * 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.6.25beta03 are Y2K compliant. It is my belief that + * upward through 1.6.25rc04 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 @@ -314,8 +314,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.25beta03" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25beta03 - August 18, 2016\n" +#define PNG_LIBPNG_VER_STRING "1.6.25rc04" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25rc04 - August 29, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -329,7 +329,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 03 +#define PNG_LIBPNG_VER_BUILD 04 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -346,7 +346,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_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -464,7 +464,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_6_25beta03; +typedef char* png_libpng_version_1_6_25rc04; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -3225,12 +3225,12 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory, #ifdef PNG_ARM_NEON_API_SUPPORTED # define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */ #endif -#ifdef PNG_MIPS_MSA_API_SUPPORTED -# define PNG_MIPS_MSA 0 /* HARDWARE: MIPS Msa SIMD instructions supported */ -#endif #define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */ #define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */ -#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */ +#ifdef PNG_MIPS_MSA_API_SUPPORTED +# define PNG_MIPS_MSA 6 /* HARDWARE: MIPS Msa SIMD instructions supported */ +#endif +#define PNG_OPTION_NEXT 8 /* Next option - numbers must be even */ /* Return values: NOTE: there are four values and 'off' is *not* zero */ #define PNG_OPTION_UNSET 0 /* Unset - defaults to off */ diff --git a/pngconf.h b/pngconf.h index 717b8c70c..9679889df 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.25beta03, August 18, 2016 + * libpng version 1.6.25rc04, August 29, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index c7853153f..3dbae66c3 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * Last changed in libpng 1.6.25beta [August 29, 2016] + * Last changed in libpng 1.6.25 [(PENDING RELEASE)] * Copyright (c) 1998-2002,2004,2006-2016 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.) diff --git a/pngtest.c b/pngtest.c index f5ea1bd7e..9dd67dc3f 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2088,4 +2088,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_25beta03 Your_png_h_is_not_version_1_6_25beta03; +typedef png_libpng_version_1_6_25rc04 Your_png_h_is_not_version_1_6_25rc04; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 3d9a0da22..613836ba1 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.25beta03 - August 18, 2016 +libpng version 1.6.25rc04 - August 29, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 273386b0f..16c3a5cbf 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@