diff --git a/LICENSE b/LICENSE index 11338b9d2..ce5fe998a 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.24beta02, June 11, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta02, June 23, 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 -June 11, 2016 +June 23, 2016 diff --git a/README b/README index 040aff263..31d0f692e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.24beta02 - June 11, 2016 (shared library 16.0) +README for libpng version 1.6.24beta02 - June 23, 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/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c index 250f05513..dffd7c12a 100644 --- a/contrib/libtests/pngstest.c +++ b/contrib/libtests/pngstest.c @@ -26,15 +26,6 @@ # include #endif -/* Define the following to use this test against your installed libpng, rather - * than the one being built here: - */ -#ifdef PNG_FREESTANDING_TESTS -# include -#else -# include "../../png.h" -#endif - /* 1.6.1 added support for the configure test harness, which uses 77 to indicate * a skipped test, in earlier versions we need to succeed on a skipped test, so: */ @@ -44,6 +35,15 @@ # define SKIP 0 #endif +/* Define the following to use this test against your installed libpng, rather + * than the one being built here: + */ +#ifdef PNG_FREESTANDING_TESTS +# include +#else +# include "../../png.h" +#endif + #ifdef PNG_SIMPLIFIED_READ_SUPPORTED /* Else nothing can be done */ #include "../tools/sRGB.h" diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c index 14be8ad98..7a42d1350 100644 --- a/contrib/libtests/pngvalid.c +++ b/contrib/libtests/pngvalid.c @@ -1589,7 +1589,7 @@ store_read_chunk(png_store *ps, png_bytep pb, const png_size_t max, { if (chunkpos < chunklen-4U) { - uInt avail = (uInt)-1; + uInt avail = -1; if (avail > (IDAT_len-4U) - IDAT_pos) avail = (uInt)/*SAFE*/((IDAT_len-4U) - IDAT_pos); diff --git a/libpng-manual.txt b/libpng-manual.txt index 691f2e20d..1d33f6b60 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.24beta02 - June 11, 2016 + libpng version 1.6.24beta02 - June 23, 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.24beta02 - June 11, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta02 - June 23, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -559,7 +559,7 @@ non-interlaced case the row that was just handled is simply one less than the passed in row number, and pass will always be 0. For the interlaced case the same applies unless the row value is 0, in which case the row just handled was the last one from one of the preceding passes. Because interlacing may skip a -pass you cannot be sure that the preceding pass is just 'pass-1', if you really +pass you cannot be sure that the preceding pass is just 'pass-1'; if you really need to know what the last pass is record (row,pass) from the callback and use the last recorded value each time. diff --git a/libpng.3 b/libpng.3 index 822696049..f56faf1a0 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "June 11, 2016" +.TH LIBPNG 3 "June 23, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta02 .SH SYNOPSIS @@ -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.24beta02 - June 11, 2016 + libpng version 1.6.24beta02 - June 23, 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.24beta02 - June 11, 2016 + libpng versions 0.97, January 1998, through 1.6.24beta02 - June 23, 2016 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2016 Glenn Randers-Pehrson @@ -1069,7 +1069,7 @@ non-interlaced case the row that was just handled is simply one less than the passed in row number, and pass will always be 0. For the interlaced case the same applies unless the row value is 0, in which case the row just handled was the last one from one of the preceding passes. Because interlacing may skip a -pass you cannot be sure that the preceding pass is just 'pass\-1', if you really +pass you cannot be sure that the preceding pass is just 'pass\-1'; if you really need to know what the last pass is record (row,pass) from the callback and use the last recorded value each time. @@ -6013,7 +6013,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.24beta02 - June 11, 2016: +Libpng version 1.6.24beta02 - June 23, 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). @@ -6038,7 +6038,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000 through 1.6.24beta02, June 11, 2016 are +libpng versions 1.0.7, July 1, 2000 through 1.6.24beta02, June 23, 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 @@ -6163,7 +6163,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). Glenn Randers-Pehrson glennrp at users.sourceforge.net -June 11, 2016 +June 23, 2016 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 668fb9b58..65317d3ed 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "June 11, 2016" +.TH LIBPNGPF 3 "June 23, 2016" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta02 (private functions) diff --git a/png.5 b/png.5 index 4cb767eb4..4ba51a196 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "June 11, 2016" +.TH PNG 5 "June 23, 2016" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 2c4c22b0a..d1a94dd3d 100644 --- a/png.c +++ b/png.c @@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.24beta02 - June 11, 2016" PNG_STRING_NEWLINE \ + "libpng version 1.6.24beta02 - June 23, 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.24beta02 - June 11, 2016\ + return "libpng version 1.6.24beta02 - June 23, 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 d3fad8923..542b639e5 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.24beta02, June 11, 2016 + * libpng version 1.6.24beta02, June 23, 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.24beta02, June 11, 2016: + * libpng versions 0.97, January 1998, through 1.6.24beta02, June 23, 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.24beta02, June 11, 2016 are + * libpng versions 1.0.7, July 1, 2000 through 1.6.24beta02, June 23, 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 @@ -245,7 +245,7 @@ * Y2K compliance in libpng: * ========================= * - * June 11, 2016 + * June 23, 2016 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -315,7 +315,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.24beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.24beta02 - June 11, 2016\n" + " libpng version 1.6.24beta02 - June 23, 2016\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 diff --git a/pngconf.h b/pngconf.h index 8c62b846d..a39222353 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.24beta02, June 11, 2016 + * libpng version 1.6.24beta02, June 23, 2016 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngstruct.h b/pngstruct.h index c1f35edef..a2a549adc 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -1,8 +1,8 @@ /* pngstruct.h - header file for PNG reference library * - * Last changed in libpng 1.6.18 [July 23, 2015] - * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson + * Last changed in libpng 1.6.24 [(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.) * @@ -249,7 +249,7 @@ struct png_struct_def png_byte filter; /* file filter type (always 0) */ png_byte interlaced; /* PNG_INTERLACE_NONE, PNG_INTERLACE_ADAM7 */ png_byte pass; /* current interlace pass (0 - 6) */ - png_byte do_filter; /* row filter flags (see PNG_FILTER_ below ) */ + png_byte do_filter; /* row filter flags (see PNG_FILTER_ in png.h ) */ png_byte color_type; /* color type of file */ png_byte bit_depth; /* bit depth of file */ png_byte usr_bit_depth; /* bit depth of users row: write only */ diff --git a/pngwutil.c b/pngwutil.c index 665464be1..c1751fe5a 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -2448,7 +2448,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) /* Overflow can occur in the calculation, just select the lowest set * filter. */ - filter_to_do &= 0U-filter_to_do; + filter_to_do &= -filter_to_do; } else if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE) @@ -2477,7 +2477,9 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) /* It's the only filter so no testing is needed */ { /* Passing PNG_SIZE_MAX here and below prevents the 'setup' function - * breaking out of the loop when lmins is exceeded. + * breaking out of the loop when lmins is exceeded. Optimizing + * compilers should notice that we don't use the returned sum, and + * therefore 'setup' should refrain from calculating and returning "sum". */ (void) png_setup_sub_row(png_ptr, bpp, row_bytes, PNG_SIZE_MAX); best_row = png_ptr->try_row; diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index dff7edbc3..c3a02148c 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.24beta02 - June 11, 2016 +libpng version 1.6.24beta02 - June 23, 2016 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson diff --git a/projects/vstudio/libpng/libpng.vcxproj b/projects/vstudio/libpng/libpng.vcxproj index 9bfb718a4..de7fc3c41 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -84,7 +84,7 @@ Use - $(WarningLevel) + Level4 false ProgramDatabase EnableFastChecks @@ -97,9 +97,9 @@ true CompileAsC true - $(DisableSpecificWarnings) + 4996;4127 $(ZLibSrcDir);%(AdditionalIncludeDirectories) - $(TreatWarningAsError) + true Disabled MultiThreadedDebugDLL @@ -114,7 +114,7 @@ Use - $(WarningLevel) + Level4 false ProgramDatabase Disabled @@ -128,9 +128,9 @@ true CompileAsC true - $(DisableSpecificWarnings) + 4996;4127 $(ZLibSrcDir);%(AdditionalIncludeDirectories) - $(TreatWarningAsError) + true MultiThreadedDebug @@ -140,7 +140,7 @@ - $(WarningLevel) + Level4 Use ProgramDatabase true @@ -153,9 +153,9 @@ CompileAsC true false - $(DisableSpecificWarnings) + 4996;4127 $(ZLibSrcDir);%(AdditionalIncludeDirectories) - $(TreatWarningAsError) + true Full @@ -170,7 +170,7 @@ - $(WarningLevel) + Level4 Use ProgramDatabase MultiThreaded @@ -184,9 +184,9 @@ CompileAsC true false - $(DisableSpecificWarnings) + 4996;4127 $(ZLibSrcDir);%(AdditionalIncludeDirectories) - $(TreatWarningAsError) + true Full true diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj index efcc440ba..e2a232cb6 100644 --- a/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -30,7 +30,7 @@ - $(WarningLevel) + Level3 MaxSpeed true true diff --git a/projects/vstudio/pngstest/pngstest.vcxproj b/projects/vstudio/pngstest/pngstest.vcxproj index 21810e32a..0d2980dd8 100644 --- a/projects/vstudio/pngstest/pngstest.vcxproj +++ b/projects/vstudio/pngstest/pngstest.vcxproj @@ -76,16 +76,16 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true true false @@ -109,7 +109,7 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true true false @@ -141,7 +141,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true false true @@ -176,7 +176,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true false true diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index f1df07d5c..bf9266f75 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -76,16 +76,16 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996 false - $(TreatWarningAsError) + true true true false @@ -109,7 +109,7 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996 false - $(TreatWarningAsError) + true true true false @@ -141,7 +141,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996 false - $(TreatWarningAsError) + true true false true @@ -176,7 +176,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996 false - $(TreatWarningAsError) + true true false true diff --git a/projects/vstudio/pngunknown/pngunknown.vcxproj b/projects/vstudio/pngunknown/pngunknown.vcxproj index 409d6621d..a30cc7a21 100644 --- a/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -76,16 +76,16 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true true false @@ -109,7 +109,7 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true true false @@ -141,7 +141,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true false true @@ -176,7 +176,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true false true diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index c117d2910..07cf24119 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -76,16 +76,16 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true true false @@ -109,7 +109,7 @@ NotUsing - $(WarningLevel) + Level4 false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true true false @@ -141,7 +141,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true false true @@ -176,7 +176,7 @@ - $(WarningLevel) + Level4 NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - $(DisableSpecificWarnings) + 4996;4127 false - $(TreatWarningAsError) + true true false true diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index d7a0325b9..a0684aec0 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ true - - - EnableAllWarnings - true - 4255;4668;4710;4711;4746;4820;4996 diff --git a/projects/vstudio/zlib/zlib.vcxproj b/projects/vstudio/zlib/zlib.vcxproj index 0df16db34..6e5b94a61 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -88,13 +88,11 @@ WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) MultiThreadedDebug - $(WarningLevel) + TurnOffAllWarnings ProgramDatabase Disabled true true - $(DisableSpecificWarnings);4127;4131;4242;4244 - $(TreatWarningAsError) MachineX86 @@ -105,13 +103,11 @@ WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) - $(WarningLevel) + TurnOffAllWarnings ProgramDatabase Disabled true true - $(DisableSpecificWarnings);4127;4131;4242;4244 - $(TreatWarningAsError) MultiThreadedDebugDLL @@ -122,7 +118,7 @@ - $(WarningLevel) + Level3 ProgramDatabase Full true @@ -130,8 +126,7 @@ false true true - $(DisableSpecificWarnings);4127;4131;4242;4244 - $(TreatWarningAsError) + true MultiThreaded WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) @@ -146,7 +141,7 @@ - $(WarningLevel) + Level3 ProgramDatabase Full true @@ -154,8 +149,7 @@ false true true - $(DisableSpecificWarnings);4127;4131;4242;4244 - $(TreatWarningAsError) + true WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) diff --git a/scripts/README.txt b/scripts/README.txt index e63e2833c..4ebfd9be4 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,5 +1,5 @@ -Makefiles for libpng version 1.6.24beta02 - June 11, 2016 +Makefiles for libpng version 1.6.24beta02 - June 23, 2016 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 4fd5ce0a4..ce63c5097 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -2,7 +2,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.24beta02 - June 11, 2016 */ +/* Libpng version 1.6.24beta02 - June 23, 2016 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */