[libpng16] Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived)

compiler issues slightly different warnings from those issued by the
current vesions of GCC. This eliminates those warnings by
adding/removing casts and small code rewrites.
This commit is contained in:
John Bowler
2012-01-25 07:47:44 -06:00
committed by Glenn Randers-Pehrson
parent 9c7f99c9cb
commit 8fb6c6a9b3
9 changed files with 125 additions and 104 deletions

View File

@@ -1530,7 +1530,10 @@ compare_two_images(Image *a, Image *b, int via_linear)
png_byte bstart = 0;
/* Set to the actual number of channels in 'a' */
channels = (formata & PNG_FORMAT_FLAG_COLOR) ? 3 : 1;
if (formata & PNG_FORMAT_FLAG_COLOR)
channels = 3U;
else
channels = 1U;
if (formata & PNG_FORMAT_FLAG_ALPHA)
{
@@ -2282,7 +2285,7 @@ testimage(Image *image, png_uint_32 opts, format_list *pf)
}
int
main(int argc, const char **argv)
main(int argc, char **argv)
{
png_uint_32 opts = 0;
format_list formats;