Changeset 3343 for ImageMagick/trunk/coders/png.c

Timestamp:

12/23/10 19:30:00 (2 years ago)

Author:

glennrp

Message:

Get both Property and Artifact directives in coders/png.c

File:

• ImageMagick/trunk/coders/png.c (modified) (5 diffs)

ImageMagick/trunk/coders/png.c

@@ -43 +43 @@
 */
 #include "magick/studio.h"
+#include "magick/artifact.h"
 #include "magick/attribute.h"
 #include "magick/blob.h"
@@ -9146 +9147 @@
     i;
 
+  int
+    source;
+
   unsigned int
     logging;
@@ -9295 +9299 @@
   mng_info->ping_exclude_zTXt=MagickFalse;
 
-  value=GetImageOption(image_info,"png:exclude-chunk");
+  for (source=0; source<1; source++)
+  {
+    if (source==0)
+       value=GetImageArtifact(image,"png:exclude-chunk");
+    else
+       value=GetImageOption(image_info,"png:exclude-chunk");
 
   if (value != NULL)
@@ -9389 +9398 @@
     }
   }
-
-  value=GetImageOption(image_info,"png:include-chunk");
+  }
+
+  for (source=0; source<1; source++)
+  {
+    if (source==0)
+       value=GetImageArtifact(image,"png:include-chunk");
+    else
+       value=GetImageOption(image_info,"png:include-chunk");
 
   if (value != NULL)
@@ -9483 +9498 @@
   
     }
+  }
   }