Use SetImageOption instead of SetImageArtifact

diff --git a/coders/png.c b/coders/png.c
index 2d4b89ddc6e76bca3e245e8e1e12d1d83f0b2ade..78fc4a1cdc5a77617de862fd28e9e5763f6d308f 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -9307,86 +9307,86 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
   for (i=0; *(value+i) != '\0'; i+=5)
   {
 
-  if (LocaleNCompare(value+i,"all",3) == 0)
-  {
-    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_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;
-    i--;
-  }
-
-  if (LocaleNCompare(value+i,"none",4) == 0)
-  {
-    mng_info->ping_exclude_bKGD=MagickFalse;
-    mng_info->ping_exclude_cHRM=MagickFalse;
-    mng_info->ping_exclude_EXIF=MagickFalse;
-    mng_info->ping_exclude_gAMA=MagickFalse;
-    mng_info->ping_exclude_iCCP=MagickFalse;
-    /* mng_info->ping_exclude_iTXt=MagickFalse; */
-    mng_info->ping_exclude_oFFs=MagickFalse;
-    mng_info->ping_exclude_pHYs=MagickFalse;
-    mng_info->ping_exclude_sRGB=MagickFalse;
-    mng_info->ping_exclude_tEXt=MagickFalse;
-    mng_info->ping_exclude_vpAg=MagickFalse;
-    mng_info->ping_exclude_zCCP=MagickFalse;
-    mng_info->ping_exclude_zTXt=MagickFalse;
-  }
-
-  if (LocaleNCompare(value+i,"bkgd",4) == 0)
-    mng_info->ping_exclude_bKGD=MagickTrue;
-
-  if (LocaleNCompare(value+i,"chrm",4) == 0)
-    mng_info->ping_exclude_cHRM=MagickTrue;
-
-  if (LocaleNCompare(value+i,"exif",4) == 0)
-    mng_info->ping_exclude_EXIF=MagickTrue;
-
-  if (LocaleNCompare(value+i,"gama",4) == 0)
-    mng_info->ping_exclude_gAMA=MagickTrue;
-
-  if (LocaleNCompare(value+i,"iccp",4) == 0)
-    mng_info->ping_exclude_iCCP=MagickTrue;
-
-/*
-  if (LocaleNCompare(value+i,"itxt",4) == 0)
-    mng_info->ping_exclude_iTXt=MagickTrue;
- */
-
-  if (LocaleNCompare(value+i,"gama",4) == 0)
-    mng_info->ping_exclude_gAMA=MagickTrue;
-
-  if (LocaleNCompare(value+i,"offs",4) == 0)
-    mng_info->ping_exclude_oFFs=MagickTrue;
-
-  if (LocaleNCompare(value+i,"phys",4) == 0)
-    mng_info->ping_exclude_pHYs=MagickTrue;
-
-  if (LocaleNCompare(value+i,"sRGB",4) == 0)
-    mng_info->ping_exclude_gAMA=MagickTrue;
-
-  if (LocaleNCompare(value+i,"text",4) == 0)
-    mng_info->ping_exclude_tEXt=MagickTrue;
-
-  if (LocaleNCompare(value+i,"vpag",4) == 0)
-    mng_info->ping_exclude_vpAg=MagickTrue;
-
-  if (LocaleNCompare(value+i,"zccp",4) == 0)
-    mng_info->ping_exclude_zCCP=MagickTrue;
-
-  if (LocaleNCompare(value+i,"ztxt",4) == 0)
-    mng_info->ping_exclude_zTXt=MagickTrue;
+    if (LocaleNCompare(value+i,"all",3) == 0)
+    {
+      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_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;
+      i--;
+    }
   
-  }
+    if (LocaleNCompare(value+i,"none",4) == 0)
+    {
+      mng_info->ping_exclude_bKGD=MagickFalse;
+      mng_info->ping_exclude_cHRM=MagickFalse;
+      mng_info->ping_exclude_EXIF=MagickFalse;
+      mng_info->ping_exclude_gAMA=MagickFalse;
+      mng_info->ping_exclude_iCCP=MagickFalse;
+      /* mng_info->ping_exclude_iTXt=MagickFalse; */
+      mng_info->ping_exclude_oFFs=MagickFalse;
+      mng_info->ping_exclude_pHYs=MagickFalse;
+      mng_info->ping_exclude_sRGB=MagickFalse;
+      mng_info->ping_exclude_tEXt=MagickFalse;
+      mng_info->ping_exclude_vpAg=MagickFalse;
+      mng_info->ping_exclude_zCCP=MagickFalse;
+      mng_info->ping_exclude_zTXt=MagickFalse;
+    }
+  
+    if (LocaleNCompare(value+i,"bkgd",4) == 0)
+      mng_info->ping_exclude_bKGD=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"chrm",4) == 0)
+      mng_info->ping_exclude_cHRM=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"exif",4) == 0)
+      mng_info->ping_exclude_EXIF=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"gama",4) == 0)
+      mng_info->ping_exclude_gAMA=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"iccp",4) == 0)
+      mng_info->ping_exclude_iCCP=MagickTrue;
+  
+  /*
+    if (LocaleNCompare(value+i,"itxt",4) == 0)
+      mng_info->ping_exclude_iTXt=MagickTrue;
+   */
+  
+    if (LocaleNCompare(value+i,"gama",4) == 0)
+      mng_info->ping_exclude_gAMA=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"offs",4) == 0)
+      mng_info->ping_exclude_oFFs=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"phys",4) == 0)
+      mng_info->ping_exclude_pHYs=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"sRGB",4) == 0)
+      mng_info->ping_exclude_gAMA=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"text",4) == 0)
+      mng_info->ping_exclude_tEXt=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"vpag",4) == 0)
+      mng_info->ping_exclude_vpAg=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"zccp",4) == 0)
+      mng_info->ping_exclude_zCCP=MagickTrue;
+  
+    if (LocaleNCompare(value+i,"ztxt",4) == 0)
+      mng_info->ping_exclude_zTXt=MagickTrue;
+    
+    }
   }
 
   value=GetImageOption(image_info,"png:include-chunk");
@@ -9400,53 +9400,88 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
         value);
 
   for (i=0; *(value+i) != '\0'; i+=5)
-  {
-
-  if (LocaleNCompare(value+i,"bkgd",4) == 0)
-    mng_info->ping_exclude_bKGD=MagickFalse;
-
-  if (LocaleNCompare(value+i,"chrm",4) == 0)
-    mng_info->ping_exclude_cHRM=MagickFalse;
-
-  if (LocaleNCompare(value+i,"exif",4) == 0)
-    mng_info->ping_exclude_EXIF=MagickFalse;
-
-  if (LocaleNCompare(value+i,"gama",4) == 0)
-    mng_info->ping_exclude_gAMA=MagickFalse;
-
-  if (LocaleNCompare(value+i,"iccp",4) == 0)
-    mng_info->ping_exclude_iCCP=MagickFalse;
-
-/*
-  if (LocaleNCompare(value+i,"itxt",4) == 0)
-    mng_info->ping_exclude_iTXt=MagickFalse;
- */
-
-  if (LocaleNCompare(value+i,"gama",4) == 0)
-    mng_info->ping_exclude_gAMA=MagickFalse;
-
-  if (LocaleNCompare(value+i,"offs",4) == 0)
-    mng_info->ping_exclude_oFFs=MagickFalse;
-
-  if (LocaleNCompare(value+i,"phys",4) == 0)
-    mng_info->ping_exclude_pHYs=MagickFalse;
-
-  if (LocaleNCompare(value+i,"sRGB",4) == 0)
-    mng_info->ping_exclude_gAMA=MagickFalse;
-
-  if (LocaleNCompare(value+i,"text",4) == 0)
-    mng_info->ping_exclude_tEXt=MagickFalse;
-
-  if (LocaleNCompare(value+i,"vpag",4) == 0)
-    mng_info->ping_exclude_vpAg=MagickFalse;
-
-  if (LocaleNCompare(value+i,"zccp",4) == 0)
-    mng_info->ping_exclude_zCCP=MagickFalse;
-
-  if (LocaleNCompare(value+i,"ztxt",4) == 0)
-    mng_info->ping_exclude_zTXt=MagickFalse;
-
-  }
+    {
+  
+    if (LocaleNCompare(value+i,"all",3) == 0)
+    {
+      mng_info->ping_exclude_bKGD=MagickFalse;
+      mng_info->ping_exclude_cHRM=MagickFalse;
+      mng_info->ping_exclude_EXIF=MagickFalse;
+      mng_info->ping_exclude_gAMA=MagickFalse;
+      mng_info->ping_exclude_iCCP=MagickFalse;
+      /* mng_info->ping_exclude_iTXt=MagickFalse; */
+      mng_info->ping_exclude_oFFs=MagickFalse;
+      mng_info->ping_exclude_pHYs=MagickFalse;
+      mng_info->ping_exclude_sRGB=MagickFalse;
+      mng_info->ping_exclude_tEXt=MagickFalse;
+      mng_info->ping_exclude_vpAg=MagickFalse;
+      mng_info->ping_exclude_zCCP=MagickFalse;
+      mng_info->ping_exclude_zTXt=MagickFalse;
+      i--;
+    }
+  
+    if (LocaleNCompare(value+i,"none",4) == 0)
+    {
+      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_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;
+    }
+  
+    if (LocaleNCompare(value+i,"bkgd",4) == 0)
+      mng_info->ping_exclude_bKGD=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"chrm",4) == 0)
+      mng_info->ping_exclude_cHRM=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"exif",4) == 0)
+      mng_info->ping_exclude_EXIF=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"gama",4) == 0)
+      mng_info->ping_exclude_gAMA=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"iccp",4) == 0)
+      mng_info->ping_exclude_iCCP=MagickFalse;
+  
+  /*
+    if (LocaleNCompare(value+i,"itxt",4) == 0)
+      mng_info->ping_exclude_iTXt=MagickFalse;
+   */
+  
+    if (LocaleNCompare(value+i,"gama",4) == 0)
+      mng_info->ping_exclude_gAMA=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"offs",4) == 0)
+      mng_info->ping_exclude_oFFs=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"phys",4) == 0)
+      mng_info->ping_exclude_pHYs=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"sRGB",4) == 0)
+      mng_info->ping_exclude_gAMA=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"text",4) == 0)
+      mng_info->ping_exclude_tEXt=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"vpag",4) == 0)
+      mng_info->ping_exclude_vpAg=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"zccp",4) == 0)
+      mng_info->ping_exclude_zCCP=MagickFalse;
+  
+    if (LocaleNCompare(value+i,"ztxt",4) == 0)
+      mng_info->ping_exclude_zTXt=MagickFalse;
+  
+    }
   }
 
   if (logging != MagickFalse)

diff --git a/magick/image.c b/magick/image.c
index 669f63c79d06c759b1ca0693eab268096d1347b4..9aebb1c9e1c1a197a5631f33100968e71602caf9 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -3817,8 +3817,10 @@ MagickExport MagickBooleanType StripImage(Image *image)
   (void) DeleteImageProperty(image,"comment");
   (void) DeleteImageProperty(image,"date:create");
   (void) DeleteImageProperty(image,"date:modify");
-  (void) SetImageArtifact(image,"png:exclude-chunk","all");
-  (void) SetImageArtifact(image,"png:include-chunk","gama");
+#if 0 /* temporarily removed to wand/mogrify.c, where we have access
+         to image_info */
+  (void) SetImageArtifact(image,"png:include-chunk","none,gama");
+#endif
   return(MagickTrue);
 }
 \f

diff --git a/wand/mogrify.c b/wand/mogrify.c
index f6a4e8367510f6e3e92e619328edc5dd8fba11a7..3baf91720b957dede9fdc38cafa731e7dba273d3 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -3162,6 +3162,14 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             */
             (void) SyncImageSettings(mogrify_info,*image);
             (void) StripImage(*image);
+
+#if 1 /* This was emporarily moved from image.c, where we don't have access
+         to image_info
+       */
+
+  (void) SetImageProperty(image_info,"png:include-chunk","none,gama");
+
+#endif
             InheritException(exception,&(*image)->exception);
             break;
           }