Avoid writing ancillary chunks while generating the JNG alpha channel.

diff --git a/ChangeLog b/ChangeLog
index ace481ff18bd0a97cf1812f57d5ec842f9ab0eae..1dd7936daba3dbdafb7fa78c14dc2284b2d092ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
   * Revised the -strip option so it behaves as though
     "-define PNG:exclude-chunk=all -define PNG:include-chunk=gama"
     had appeared on the commandline.
+  * Avoid writing PNG ancillary chunks in the MNG/JNG while generating the
+    alpha channel for a JNG image.
 
 2010-12-21  6.6.6-7 Anthony Thyssen <A.Thyssen@griffith...>
   * Removed the forced interpolation setting in AcquireResampleFilterThreadSet

diff --git a/coders/png.c b/coders/png.c
index db54688124a69523561e277341ba2bd45663eb76..2d4b89ddc6e76bca3e245e8e1e12d1d83f0b2ade 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -10931,7 +10931,25 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image)
        if (logging != MagickFalse)
          (void) LogMagickEvent(CoderEvent,GetMagickModule(),
            "  Writing PNG object.");
+
        mng_info->need_blob = MagickFalse;
+
+       /* We don't want any ancillary chunks written */
+       mng_info->ping_exclude_bKGD=MagickTrue;
+       mng_info->ping_exclude_cHRM=MagickTrue;
+       mng_info->ping_exclude_EXIF=MagickTrue;
+       mng_info->ping_exclude_gAMA=MagickTrue;
+       mng_info->ping_exclude_cHRM=MagickTrue;
+       mng_info->ping_exclude_iCCP=MagickTrue;
+       /* mng_info->ping_exclude_iTXt=MagickTrue; */
+       mng_info->ping_exclude_oFFs=MagickTrue;
+       mng_info->ping_exclude_pHYs=MagickTrue;
+       mng_info->ping_exclude_sRGB=MagickTrue;
+       mng_info->ping_exclude_tEXt=MagickTrue;
+       mng_info->ping_exclude_vpAg=MagickTrue;
+       mng_info->ping_exclude_zCCP=MagickTrue;
+       mng_info->ping_exclude_zTXt=MagickTrue;
+
        status=WriteOnePNGImage(mng_info,image_info,image);
      }