diff --git a/ANNOUNCE b/ANNOUNCE index e4544ff36..e33dda6db 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.24beta03 - June 23, 2016 +Libpng 1.6.24beta02 - June 23, 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.24beta03.tar.xz (LZMA-compressed, recommended) - 1.6.24beta03.tar.gz + 1.6.24beta02.tar.xz (LZMA-compressed, recommended) + 1.6.24beta02.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1624b03.7z (LZMA-compressed, recommended) - lp1624b03.zip + lp1624b02.7z (LZMA-compressed, recommended) + lp1624b02.zip Other information: - 1.6.24beta03-README.txt - 1.6.24beta03-LICENSE.txt - libpng-1.6.24beta03-*.asc (armored detached GPG signatures) + 1.6.24beta02-README.txt + 1.6.24beta02-LICENSE.txt + libpng-1.6.24beta02-*.asc (armored detached GPG signatures) Changes since the last public release (1.6.23): @@ -47,8 +47,6 @@ Version 1.6.24beta02 [June 23, 2016] first problem is also fixed) (John Bowler). Use a more efficient absolute value calculation on SSE2 (Matthieu Darbois). -Version 1.6.24beta03 [June 23, 2016] - 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/CHANGES b/CHANGES index d3980d3ca..918ff0eed 100644 --- a/CHANGES +++ b/CHANGES @@ -5638,8 +5638,6 @@ Version 1.6.24beta02 [June 23, 2016] structure padding is fixable, but it would be a signficant change (moving structure members around). -Version 1.6.24beta03 [June 23, 2016] - 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 1f33c8bbb..d3648e77b 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.24beta03 +# VERSION 16.${PNGLIB_RELEASE}.1.6.24beta02 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 107c3f27d..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.24beta03, June 23, 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 diff --git a/README b/README index f374b519a..31d0f692e 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.24beta03 - June 23, 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/configure.ac b/configure.ac index 4f14546ab..35b4249cb 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.24beta03],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.24beta02],[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.24beta03 +PNGLIB_VERSION=1.6.24beta02 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=24 diff --git a/contrib/libtests/pngstest.c b/contrib/libtests/pngstest.c index dffd7c12a..250f05513 100644 --- a/contrib/libtests/pngstest.c +++ b/contrib/libtests/pngstest.c @@ -26,15 +26,6 @@ # include #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: - */ -#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H) -# define SKIP 77 -#else -# define SKIP 0 -#endif - /* Define the following to use this test against your installed libpng, rather * than the one being built here: */ @@ -44,6 +35,15 @@ # 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: + */ +#if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H) +# define SKIP 77 +#else +# define SKIP 0 +#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 7a42d1350..14be8ad98 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 = -1; + uInt avail = (uInt)-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 00cea6db4..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.24beta03 - June 23, 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.24beta03 - June 23, 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 @@ -5345,7 +5345,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.24beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.24beta02 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 30113a5aa..f56faf1a0 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "June 23, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta02 .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.24beta03 - June 23, 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.24beta03 - June 23, 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 @@ -5855,7 +5855,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.24beta03 are Y2K compliant. It is my belief that earlier +upward through 1.6.24beta02 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 @@ -6013,7 +6013,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.24beta03 - June 23, 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.24beta03, June 23, 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 diff --git a/libpngpf.3 b/libpngpf.3 index f0eca15e0..65317d3ed 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "June 23, 2016" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta03 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.24beta02 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index 08e87ad88..d1a94dd3d 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_24beta03 Your_png_h_is_not_version_1_6_24beta03; +typedef png_libpng_version_1_6_24beta02 Your_png_h_is_not_version_1_6_24beta02; /* 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.24beta03 - June 23, 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.24beta03 - June 23, 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 814f900d3..542b639e5 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.24beta03, June 23, 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.24beta03, June 23, 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.24beta03, June 23, 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 @@ -251,7 +251,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.24beta03 are Y2K compliant. It is my belief that + * upward through 1.6.24beta02 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 @@ -313,9 +313,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.24beta03" +#define PNG_LIBPNG_VER_STRING "1.6.24beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.24beta03 - June 23, 2016\n" + " libpng version 1.6.24beta02 - June 23, 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 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -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_24beta03; +typedef char* png_libpng_version_1_6_24beta02; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 1c470f06d..a39222353 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.24beta03, June 23, 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/pngtest.c b/pngtest.c index 67e3c2962..339664a6b 100644 --- a/pngtest.c +++ b/pngtest.c @@ -2079,4 +2079,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_24beta03 Your_png_h_is_not_version_1_6_24beta03; +typedef png_libpng_version_1_6_24beta02 Your_png_h_is_not_version_1_6_24beta02; diff --git a/pngwutil.c b/pngwutil.c index c1751fe5a..ddac9bfba 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 &= -filter_to_do; + filter_to_do &= 0U-filter_to_do; } else if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE) diff --git a/projects/vstudio/README.txt b/projects/vstudio/README.txt index 5f08db78e..c3a02148c 100644 --- a/projects/vstudio/README.txt +++ b/projects/vstudio/README.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.24beta03 - June 23, 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 de7fc3c41..9bfb718a4 100644 --- a/projects/vstudio/libpng/libpng.vcxproj +++ b/projects/vstudio/libpng/libpng.vcxproj @@ -84,7 +84,7 @@ Use - Level4 + $(WarningLevel) false ProgramDatabase EnableFastChecks @@ -97,9 +97,9 @@ true CompileAsC true - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) Disabled MultiThreadedDebugDLL @@ -114,7 +114,7 @@ Use - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -128,9 +128,9 @@ true CompileAsC true - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) MultiThreadedDebug @@ -140,7 +140,7 @@ - Level4 + $(WarningLevel) Use ProgramDatabase true @@ -153,9 +153,9 @@ CompileAsC true false - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) Full @@ -170,7 +170,7 @@ - Level4 + $(WarningLevel) Use ProgramDatabase MultiThreaded @@ -184,9 +184,9 @@ CompileAsC true false - 4996;4127 + $(DisableSpecificWarnings) $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true + $(TreatWarningAsError) Full true diff --git a/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/projects/vstudio/pnglibconf/pnglibconf.vcxproj index e2a232cb6..efcc440ba 100644 --- a/projects/vstudio/pnglibconf/pnglibconf.vcxproj +++ b/projects/vstudio/pnglibconf/pnglibconf.vcxproj @@ -30,7 +30,7 @@ - Level3 + $(WarningLevel) MaxSpeed true true diff --git a/projects/vstudio/pngstest/pngstest.vcxproj b/projects/vstudio/pngstest/pngstest.vcxproj index 0d2980dd8..21810e32a 100644 --- a/projects/vstudio/pngstest/pngstest.vcxproj +++ b/projects/vstudio/pngstest/pngstest.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/pngtest/pngtest.vcxproj b/projects/vstudio/pngtest/pngtest.vcxproj index bf9266f75..f1df07d5c 100644 --- a/projects/vstudio/pngtest/pngtest.vcxproj +++ b/projects/vstudio/pngtest/pngtest.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/pngunknown/pngunknown.vcxproj b/projects/vstudio/pngunknown/pngunknown.vcxproj index a30cc7a21..409d6621d 100644 --- a/projects/vstudio/pngunknown/pngunknown.vcxproj +++ b/projects/vstudio/pngunknown/pngunknown.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/pngvalid/pngvalid.vcxproj b/projects/vstudio/pngvalid/pngvalid.vcxproj index 07cf24119..c117d2910 100644 --- a/projects/vstudio/pngvalid/pngvalid.vcxproj +++ b/projects/vstudio/pngvalid/pngvalid.vcxproj @@ -76,16 +76,16 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled EnableFastChecks WIN32;_DEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -109,7 +109,7 @@ NotUsing - Level4 + $(WarningLevel) false ProgramDatabase Disabled @@ -117,9 +117,9 @@ MultiThreadedDebug WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true true false @@ -141,7 +141,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -149,9 +149,9 @@ true WIN32;NDEBUG;_CONSOLE;PNG_USE_DLL;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true @@ -176,7 +176,7 @@ - Level4 + $(WarningLevel) NotUsing ProgramDatabase Full @@ -185,9 +185,9 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(ZLibSrcDir);..\..\..\scripts;%(AdditionalIncludeDirectories) - 4996;4127 + $(DisableSpecificWarnings) false - true + $(TreatWarningAsError) true false true diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 6b96d8164..44e9bfb96 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 6e5b94a61..0df16db34 100644 --- a/projects/vstudio/zlib/zlib.vcxproj +++ b/projects/vstudio/zlib/zlib.vcxproj @@ -88,11 +88,13 @@ WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) MultiThreadedDebug - TurnOffAllWarnings + $(WarningLevel) ProgramDatabase Disabled true true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) MachineX86 @@ -103,11 +105,13 @@ WIN32;_DEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) - TurnOffAllWarnings + $(WarningLevel) ProgramDatabase Disabled true true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) MultiThreadedDebugDLL @@ -118,7 +122,7 @@ - Level3 + $(WarningLevel) ProgramDatabase Full true @@ -126,7 +130,8 @@ false true true - true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) MultiThreaded WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) @@ -141,7 +146,7 @@ - Level3 + $(WarningLevel) ProgramDatabase Full true @@ -149,7 +154,8 @@ false true true - true + $(DisableSpecificWarnings);4127;4131;4242;4244 + $(TreatWarningAsError) WIN32;NDEBUG;_WINDOWS;Z_SOLO;%(PreprocessorDefinitions) diff --git a/scripts/README.txt b/scripts/README.txt index 6038db896..4ebfd9be4 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.6.24beta03 - June 23, 2016 +Makefiles for libpng version 1.6.24beta02 - June 23, 2016 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng16.so.16.1.6.24beta03) + (gcc, creates libpng16.so.16.1.6.24beta02) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -33,12 +33,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 libpng16.so.16.1.6.24beta03) + creates libpng16.so.16.1.6.24beta02) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng16.so.16.1.6.24beta03) + creates libpng16.so.16.1.6.24beta02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng16.so.16.1.6.24beta03) + creates libpng16.so.16.1.6.24beta02) 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/def.c b/scripts/def.c index 90df3a997..708b65ab9 100644 --- a/scripts/def.c +++ b/scripts/def.c @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library"" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "" PNG_DFN "EXPORTS" -PNG_DFN ";Version 1.6.24beta03" +PNG_DFN ";Version 1.6.24beta02" #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 263c59915..c66cd200b 100644 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.6.24beta03 +version=1.6.24beta02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 560200fed..55ff2bcb0 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16 Name: libpng Description: Loads and saves PNG files -Version: 1.6.24beta03 +Version: 1.6.24beta02 Libs: -L${libdir} -lpng16 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index f29b9994e..61084480e 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16 LIB= png16 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.6.24beta03 +SHLIB_MINOR= 1.6.24beta02 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 df593ebc4..b9778e844 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.24beta03 +SHLIB_MINOR= 1.6.24beta02 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 c3a74b19e..54d437694 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 16 -SHLIB_MINOR= 1.6.24beta03 +SHLIB_MINOR= 1.6.24beta02 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 cb94fd386..ce63c5097 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,8 +1,8 @@ -/* libpng 1.6.24beta03 STANDARD API DEFINITION */ +/* libpng 1.6.24beta02 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.24beta03 - June 23, 2016 */ +/* Libpng version 1.6.24beta02 - June 23, 2016 */ /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index c9cfdad5b..408de729f 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.6.24beta03 +;Version 1.6.24beta02 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng