From 7d7694ae6a57cbe3e90c117b13663a6597fb44ea Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 5 Oct 2016 09:23:08 -0500 Subject: [PATCH] [libpng16] Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h to avoid a signed/unsigned compare in the preprocessor. --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- pngconf.h | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 741a73168..1dbb9ef15 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.26beta05 - October 3, 2016 +Libpng 1.6.26beta05 - October 5, 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. @@ -61,7 +61,9 @@ Version 1.6.26beta04 [October 3, 2016] when PNG_USE_ABS is defined. Fixed offsets in contrib/intel/intel_sse.patch -Version 1.6.26beta05 [October 3, 2016] +Version 1.6.26beta05 [October 5, 2016] + Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h + to avoid a signed/unsigned compare in the preprocessor. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index e08964fa6..e26ce5e0b 100644 --- a/CHANGES +++ b/CHANGES @@ -5739,7 +5739,9 @@ Version 1.6.26beta04 [October 3, 2016] when PNG_USE_ABS is defined. Fixed offsets in contrib/intel/intel_sse.patch -Version 1.6.26beta05 [October 3, 2016] +Version 1.6.26beta05 [October 5, 2016] + Changed integer constant 4294967294 to unsigned 4294967294U in pngconf.h + to avoid a signed/unsigned compare in the preprocessor. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngconf.h b/pngconf.h index 2e2ccd7ba..1e27bc854 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.26beta05, October 3, 2016 + * libpng version 1.6.26beta05, October 5, 2016 * * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -507,9 +507,9 @@ # error "libpng requires a signed 32-bit (or more) type" #endif -#if UINT_MAX > 4294967294 +#if UINT_MAX > 4294967294U typedef unsigned int png_uint_32; -#elif ULONG_MAX > 4294967294 +#elif ULONG_MAX > 4294967294U typedef unsigned long int png_uint_32; #else # error "libpng requires an unsigned 32-bit (or more) type"