From a20c8fe839f466073b171f5a6fd16fdf9a8bd0ed Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 14 Aug 2014 11:55:11 +0000 Subject: [PATCH] --- coders/png.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/coders/png.c b/coders/png.c index 29a5c0e33..7a6485107 100644 --- a/coders/png.c +++ b/coders/png.c @@ -12088,21 +12088,35 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, if (IsOptionMember("none",value) != MagickFalse) { - mng_info->ping_exclude_bKGD=!excluding; - mng_info->ping_exclude_cHRM=!excluding; - mng_info->ping_exclude_date=!excluding; - mng_info->ping_exclude_EXIF=!excluding; - mng_info->ping_exclude_gAMA=!excluding; - mng_info->ping_exclude_iCCP=!excluding; + mng_info->ping_exclude_bKGD=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_cHRM=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_date=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_EXIF=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_gAMA=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_iCCP=excluding != MagickFalse ? MagickFalse : + MagickTrue; /* mng_info->ping_exclude_iTXt=!excluding; */ - mng_info->ping_exclude_oFFs=!excluding; - mng_info->ping_exclude_pHYs=!excluding; - mng_info->ping_exclude_sRGB=!excluding; - mng_info->ping_exclude_tEXt=!excluding; - mng_info->ping_exclude_tRNS=!excluding; - mng_info->ping_exclude_vpAg=!excluding; - mng_info->ping_exclude_zCCP=!excluding; - mng_info->ping_exclude_zTXt=!excluding; + mng_info->ping_exclude_oFFs=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_pHYs=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_sRGB=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_tEXt=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_tRNS=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_vpAg=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_zCCP=excluding != MagickFalse ? MagickFalse : + MagickTrue; + mng_info->ping_exclude_zTXt=excluding != MagickFalse ? MagickFalse : + MagickTrue; } if (IsOptionMember("bkgd",value) != MagickFalse) -- 2.50.1