diff --git a/ANNOUNCE b/ANNOUNCE index 040fae935..e2ccc2162 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta46 - December 29, 2014 +Libpng 1.7.0beta46 - January 1, 2015 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. @@ -681,7 +681,7 @@ Version 1.7.0beta45 [December 28, 2014] png_read_row to skip the unnecessary row de-interlace stuff. Added testing of png_set_packing() to pngvalid.c -Version 1.7.0beta46 [December 29, 2014] +Version 1.7.0beta46 [January 1, 2015] Regenerated configure scripts in the tar distributions with libtool-2.4.4 Implement previously untested cases of libpng transforms in pngvalid.c Fixed byte order in 2-byte filler, in png_do_read_filler(). diff --git a/CHANGES b/CHANGES index 55b60e475..28b58b79e 100644 --- a/CHANGES +++ b/CHANGES @@ -4970,7 +4970,7 @@ Version 1.7.0beta45 [December 28, 2014] png_read_row to skip the unnecessary row de-interlace stuff. Added testing of png_set_packing() to pngvalid.c -Version 1.7.0beta46 [December 29, 2014] +Version 1.7.0beta46 [January 1, 2015] Regenerated configure scripts in the tar distributions with libtool-2.4.4 Implement previously untested cases of libpng transforms in pngvalid.c Fixed byte order in 2-byte filler, in png_do_read_filler(). diff --git a/LICENSE b/LICENSE index 408f90634..59f4f2721 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.7.0beta46, December 28, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 1, 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 -December 28, 2014 +January 1, 2015 diff --git a/README b/README index 801bc2e99..fa79bc355 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta46 - December 28, 2014 (shared library 17.0) +README for libpng version 1.7.0beta46 - January 1, 2015 (shared library 17.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/arm/arm_init.c b/arm/arm_init.c index d87b6e727..fb3d50d04 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index a2b5011f6..d42c78890 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -5,7 +5,7 @@ * Written by James Yu , October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/configure.ac b/configure.ac index 8babdd7ce..9ce8c721d 100644 --- a/configure.ac +++ b/configure.ac @@ -60,10 +60,10 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -dnl libtool/libtoolize; version 2.4.2 is the tested version, this or any +dnl libtool/libtoolize; version 2.4.4 is the tested version, this or any dnl compatible later version may be used LT_INIT([win32-dll]) -LT_PREREQ([2.4.2]) +LT_PREREQ([2.4.4]) # Some awks crash when confronted with pnglibconf.dfa, do a test run now # to make sure this doesn't happen diff --git a/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c index 376709c34..abae9e33b 100644 --- a/contrib/arm-neon/linux.c +++ b/contrib/arm-neon/linux.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c index c65406be9..d7c1c1e79 100644 --- a/contrib/libtests/pngstest.c +++ b/contrib/libtests/pngstest.c @@ -3,7 +3,7 @@ * * Copyright (c) 2013-2014 John Cunningham Bowler * - * Last changed in libpng 1.6.16 [(PENDING RELEASE)] + * Last changed in libpng 1.6.16 [December 22, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index c0d3bff26..8852f87ba 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1,8 +1,8 @@ /* pngvalid.c - validate libpng by constructing then reading png files. * - * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 2014 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [(PENDING RELEASE)] + * Copyright (c) 2014-2015 Glenn Randers-Pehrson * Written by John Cunningham Bowler * * This code is released under the libpng license. diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index 5b5d1888a..d9f3f2e0d 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -1,6 +1,6 @@ /* pngfix.c * - * Copyright (c) 2014 John Cunningham Bowler + * Copyright (c) 2015 John Cunningham Bowler * * Last changed in libpng 1.6.17 [(PENDING RELEASE)] * diff --git a/example.c b/example.c index 39bd55208..fdc538505 100644 --- a/example.c +++ b/example.c @@ -3,7 +3,7 @@ /* example.c - an example of using libpng * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Maintained 1998-2014 Glenn Randers-Pehrson + * Maintained 1998-2015 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * To the extent possible under law, the authors have waived diff --git a/libpng-manual.txt b/libpng-manual.txt index ff96a6f89..9121e6274 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.7.0beta46 - December 28, 2014 + libpng version 1.7.0beta46 - January 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.7.0beta46 - December 28, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta46 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5320,7 +5320,7 @@ Other rules can be inferred by inspecting the libpng source. XVII. Y2K Compliance in libpng -December 28, 2014 +January 1, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index 3c9a58545..cd2625b90 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "December 28, 2014" +.TH LIBPNG 3 "January 1, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta46 .SH SYNOPSIS @@ -494,7 +494,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.7.0beta46 - December 28, 2014 + libpng version 1.7.0beta46 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -505,7 +505,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.7.0beta46 - December 28, 2014 + libpng versions 0.97, January 1998, through 1.7.0beta46 - January 1, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5814,7 +5814,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XVII. Y2K Compliance in libpng -December 28, 2014 +January 1, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -6084,7 +6084,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.7.0beta46 - December 28, 2014: +Libpng version 1.7.0beta46 - January 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). @@ -6107,7 +6107,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, December 28, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 1, 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 @@ -6206,7 +6206,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 28, 2014 +January 1, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index fa02a6d67..9c7350221 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "December 28, 2014" +.TH LIBPNGPF 3 "January 1, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta46 (private functions) diff --git a/png.5 b/png.5 index 98cb82fc9..c569e9e9b 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 28, 2014" +.TH PNG 5 "January 1, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 5cbfb447a..5919cd6df 100644 --- a/png.c +++ b/png.c @@ -2,7 +2,7 @@ /* png.c - location for general purpose libpng functions * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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.) * @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta46 - December 28, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta46 - January 1, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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.7.0beta46 - December 28, 2014\ + return "libpng version 1.7.0beta46 - January 1, 2015\ Copyright (c) 1998-2014 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 ee52e7751..db1b3bed4 100644 --- a/png.h +++ b/png.h @@ -1,8 +1,8 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta46 - December 28, 2014 - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * libpng version 1.7.0beta46 - January 1, 2015 + * Copyright (c) 1998-2015 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.7.0beta46 - December 28, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta46 - January 1, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, December 28, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta46, January 1, 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: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * December 28, 2014 + * January 1, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -382,7 +382,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta46" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta46 - December 28, 2014\n" + " libpng version 1.7.0beta46 - January 1, 2015\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index e633bc38b..136d40144 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,9 +1,9 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta46 - December 28, 2014 + * libpng version 1.7.0beta46 - January 1, 2015 * - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngerror.c b/pngerror.c index b66fc6aef..0ffb9de4a 100644 --- a/pngerror.c +++ b/pngerror.c @@ -2,7 +2,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngget.c b/pngget.c index baccc5b0c..133d542f6 100644 --- a/pngget.c +++ b/pngget.c @@ -2,7 +2,7 @@ /* pngget.c - retrieval of values from info struct * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngmem.c b/pngmem.c index 65bfaff0d..375386dad 100644 --- a/pngmem.c +++ b/pngmem.c @@ -2,7 +2,7 @@ /* pngmem.c - stub functions for memory allocation * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngpread.c b/pngpread.c index b86dd63cc..e3ca9a4b1 100644 --- a/pngpread.c +++ b/pngpread.c @@ -2,7 +2,7 @@ /* pngpread.c - read a png file in push mode * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngpriv.h b/pngpriv.h index 135cf008b..11b0bfe9c 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -2,7 +2,7 @@ /* pngpriv.h - private declarations for use inside libpng * * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngread.c b/pngread.c index 57ef910ce..27e39d0db 100644 --- a/pngread.c +++ b/pngread.c @@ -2,7 +2,7 @@ /* pngread.c - read a PNG file * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngrtran.c b/pngrtran.c index 262cb3fb1..0ea587b0f 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -2,7 +2,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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.) * @@ -1625,7 +1625,7 @@ png_init_read_transformations(png_structrp png_ptr) png_build_gamma_tables(png_ptr, png_ptr->bit_depth); #ifdef PNG_READ_BACKGROUND_SUPPORTED - if (png_ptr->transformations & PNG_COMPOSE) + if ((png_ptr->transformations & PNG_COMPOSE) != 0) { /* Issue a warning about this combination: because RGB_TO_GRAY is * optimized to do the gamma transform if present yet do_background has diff --git a/pngset.c b/pngset.c index b40b8d242..0af402a17 100644 --- a/pngset.c +++ b/pngset.c @@ -2,7 +2,7 @@ /* pngset.c - storage of image information into info struct * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/pngstruct.h b/pngstruct.h index e4341eede..081813df4 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -1,7 +1,7 @@ /* pngstruct.h - header file for PNG reference library * - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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 b54287e65..964d185cc 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.6.15 [(PENDING RELEASE)] + * Last changed in libpng 1.6.15 [November 20, 2014] * Copyright (c) 1998-2014 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/pngtrans.c b/pngtrans.c index 3eef416ac..56856b480 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.6.15 [(PENDING RELEASE)] + * Last changed in libpng 1.6.15 [November 20, 2014] * Copyright (c) 1998-2014 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.) @@ -478,7 +478,7 @@ png_do_packswap(png_row_infop row_info, png_bytep row) *rp = table[*rp]; } } -#endif /* READ_PACKSWAP or WRITE_PACKSWAP */ +#endif /* PACKSWAP || WRITE_PACKSWAP */ #if defined(PNG_WRITE_FILLER_SUPPORTED) || \ defined(PNG_READ_STRIP_ALPHA_SUPPORTED) @@ -675,7 +675,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row) #endif } } -#endif /* READ_BGR or WRITE_BGR */ +#endif /* READ_BGR || WRITE_BGR */ #if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED) @@ -845,6 +845,5 @@ png_get_current_pass_number(png_const_structrp png_ptr) return 8; /* invalid */ } #endif /* USER_TRANSFORM_INFO */ -#endif /* READ_USER_TRANSFORM || - PNG_WRITE_USER_TRANSFORM_SUPPORTED */ +#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */ #endif /* READ || WRITE */ diff --git a/pngwutil.c b/pngwutil.c index 83c4f8405..f64a4320c 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -2,7 +2,7 @@ /* pngwutil.c - utilities to write a PNG file * * Last changed in libpng 1.7.0 [(PENDING RELEASE)] - * Copyright (c) 1998-2014 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 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/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index a5b7c2f5c..7be3a9549 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta46 - December 28, 2014 +libpng version 1.7.0beta46 - January 1, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 412b2482e..21e34c2f3 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@