From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 5 Apr 2013 01:11:15 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3944
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b206bac411969018dc3a6d395f525f1664af412;p=imagemagick

---

diff --git a/coders/caption.c b/coders/caption.c
index b98b0a239..b77f4b216 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -136,7 +136,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   /*
     Format caption.
   */
-  option=GetImageOption(image_info,"filename");
+  option=GetImageArtifact(image,"filename");
   if (option == (const char *) NULL)
     property=InterpretImageProperties(image_info,image,image_info->filename,
       exception);
@@ -150,7 +150,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   caption=ConstantString(GetImageProperty(image,"caption",exception));
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   (void) CloneString(&draw_info->text,caption);
-  gravity=GetImageOption(image_info,"gravity");
+  gravity=GetImageArtifact(image,"gravity");
   if (gravity != (char *) NULL)
     draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
       MagickFalse,gravity);
diff --git a/coders/cin.c b/coders/cin.c
index 0ffb40660..6de2cbd7f 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -845,7 +845,7 @@ static inline const char *GetCINProperty(const ImageInfo *image_info,
   const char
     *value;
 
-  value=GetImageOption(image_info,property);
+  value=GetImageArtifact(image,property);
   if (value != (const char *) NULL)
     return(value);
   return(GetImageProperty(image,property,exception));
diff --git a/coders/dcm.c b/coders/dcm.c
index fe72f4d25..85b753b66 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3786,7 +3786,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         i=0;
         if ((window_center != 0) && (window_width == 0))
           window_width=(size_t) window_center;
-        option=GetImageOption(image_info,"dcm:display-range");
+        option=GetImageArtifact(image,"dcm:display-range");
         if (option != (const char *) NULL)
           {
             if (LocaleCompare(option,"reset") == 0)
diff --git a/coders/dot.c b/coders/dot.c
index 1aabb7126..7d6377d0b 100644
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -142,7 +142,7 @@ static Image *ReadDOTImage(const ImageInfo *image_info,ExceptionInfo *exception)
 #endif
   if (graph == (graph_t *) NULL)
     return ((Image *) NULL);
-  option=GetImageOption(image_info,"dot:layout-engine");
+  option=GetImageArtifact(image,"dot:layout-engine");
   if (option == (const char *) NULL)
     gvLayout(graphic_context,graph,(char *) "dot");
   else
diff --git a/coders/dpx.c b/coders/dpx.c
index 5965f9d6b..135d2acae 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1387,7 +1387,7 @@ static inline const char *GetDPXProperty(const ImageInfo *image_info,
   const char
     *value;
 
-  value=GetImageOption(image_info,property);
+  value=GetImageArtifact(image,property);
   if (value != (const char *) NULL)
     return(value);
   return(GetImageProperty(image,property,exception));
diff --git a/coders/histogram.c b/coders/histogram.c
index 1964f55f0..ace1c995e 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -338,7 +338,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
       break;
   }
   histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
-  option=GetImageOption(image_info,"histogram:unique-colors");
+  option=GetImageArtifact(image,"histogram:unique-colors");
   if ((option == (const char *) NULL) || (IsStringTrue(option) != MagickFalse))
     {
       FILE
diff --git a/coders/info.c b/coders/info.c
index f4188e3d9..4bd9d1d3e 100644
--- a/coders/info.c
+++ b/coders/info.c
@@ -182,7 +182,7 @@ static MagickBooleanType WriteINFOImage(const ImageInfo *image_info,
   scene=0;
   do
   {
-    format=GetImageOption(image_info,"format");
+    format=GetImageArtifact(image,"format");
     if (format == (char *) NULL)
       {
         (void) CopyMagickString(image->filename,image->magick_filename,
diff --git a/coders/jp2.c b/coders/jp2.c
index 14bbc9b37..2f7757e73 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -1090,7 +1090,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   key=GetNextImageOption(image_info);
   for ( ; key != (char *) NULL; key=GetNextImageOption(image_info))
   {
-    option=GetImageOption(image_info,key);
+    option=GetImageArtifact(image,key);
     if (option == (const char *) NULL)
       continue;
     if (LocaleNCompare(key,"jp2:",4) == 0)
@@ -1104,7 +1104,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
         (void) ConcatenateString(&options," ");
       }
   }
-  option=GetImageOption(image_info,"jp2:rate");
+  option=GetImageArtifact(image,"jp2:rate");
   if ((option == (const char *) NULL) &&
       (image_info->compression != LosslessJPEGCompression) &&
       (image->quality != UndefinedCompressionQuality) &&
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 140df5166..48ff4070d 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1090,7 +1090,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   if (units == 2)
     image->units=PixelsPerCentimeterResolution;
   number_pixels=(MagickSizeType) image->columns*image->rows;
-  option=GetImageOption(image_info,"jpeg:size");
+  option=GetImageArtifact(image,"jpeg:size");
   if (option != (const char *) NULL)
     {
       double
@@ -1146,7 +1146,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   image->compression=JPEGCompression;
   image->interlace=JPEGInterlace;
 #endif
-  option=GetImageOption(image_info,"jpeg:colors");
+  option=GetImageArtifact(image,"jpeg:colors");
   if (option != (const char *) NULL)
     {
       /*
@@ -1155,11 +1155,11 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       jpeg_info.quantize_colors=MagickTrue;
       jpeg_info.desired_number_of_colors=(int) StringToUnsignedLong(option);
     }
-  option=GetImageOption(image_info,"jpeg:block-smoothing");
+  option=GetImageArtifact(image,"jpeg:block-smoothing");
   if (option != (const char *) NULL)
     jpeg_info.do_block_smoothing=IsStringTrue(option);
   jpeg_info.dct_method=JDCT_FLOAT;
-  option=GetImageOption(image_info,"jpeg:dct-method");
+  option=GetImageArtifact(image,"jpeg:dct-method");
   if (option != (const char *) NULL)
     switch (*option)
     {
@@ -1189,7 +1189,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
         break;
       }
     }
-  option=GetImageOption(image_info,"jpeg:fancy-upsampling");
+  option=GetImageArtifact(image,"jpeg:fancy-upsampling");
   if (option != (const char *) NULL)
     jpeg_info.do_fancy_upsampling=IsStringTrue(option);
   (void) jpeg_start_decompress(&jpeg_info);
@@ -1225,7 +1225,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       (void) SetImageColorspace(image,LabColorspace,exception);
       jpeg_info.out_color_space=JCS_YCbCr;
     }
-  option=GetImageOption(image_info,"jpeg:colors");
+  option=GetImageArtifact(image,"jpeg:colors");
   if (option != (const char *) NULL)
     if (AcquireImageColormap(image,StringToUnsignedLong(option),exception)
          == MagickFalse)
@@ -2154,7 +2154,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
         jpeg_info.density_unit=(UINT8) 2;
     }
   jpeg_info.dct_method=JDCT_FLOAT;
-  option=GetImageOption(image_info,"jpeg:dct-method");
+  option=GetImageArtifact(image,"jpeg:dct-method");
   if (option != (const char *) NULL)
     switch (*option)
     {
@@ -2184,7 +2184,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
         break;
       }
     }
-  option=GetImageOption(image_info,"jpeg:optimize-coding");
+  option=GetImageArtifact(image,"jpeg:optimize-coding");
   if (option != (const char *) NULL)
     jpeg_info.optimize_coding=IsStringTrue(option);
   else
@@ -2222,7 +2222,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
       "Interlace: nonprogressive");
 #endif
-  option=GetImageOption(image_info,"jpeg:extent");
+  option=GetImageArtifact(image,"jpeg:extent");
   if (option != (const char *) NULL)
     {
       Image
@@ -2308,7 +2308,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
   jpeg_set_quality(&jpeg_info,quality,MagickTrue);
 #if (JPEG_LIB_VERSION >= 70)
-  option=GetImageOption(image_info,"quality");
+  option=GetImageArtifact(image,"quality");
   if (option != (const char *) NULL)
     {
       GeometryInfo
@@ -2332,7 +2332,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
 #endif
   sampling_factor=(const char *) NULL;
-  value=GetImageOption(image_info,"jpeg:sampling-factor");
+  value=GetImageArtifact(image,"jpeg:sampling-factor");
   if (value == (char *) NULL)
     value=GetImageProperty(image,"jpeg:sampling-factor",exception);
   if (value != (char *) NULL)
@@ -2396,7 +2396,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
       jpeg_info.comp_info[i].h_samp_factor=1;
       jpeg_info.comp_info[i].v_samp_factor=1;
     }
-  option=GetImageOption(image_info,"jpeg:q-table");
+  option=GetImageArtifact(image,"jpeg:q-table");
   if (option != (const char *) NULL)
     {
       QuantizationTable
diff --git a/coders/msl.c b/coders/msl.c
index 279f37a9a..8df46ef9c 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -6109,7 +6109,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                   geometry;
 
                 (void) ResetMagickMemory(&geometry,0,sizeof(geometry));
-                image_option=GetImageOption(msl_info->image_info[n],"page");
+                image_option=GetImageArtifact(msl_info->image[n],"page");
                 if (image_option != (const char *) NULL)
                   flags=ParseAbsoluteGeometry(image_option,&geometry);
                 flags=ParseAbsoluteGeometry(value,&geometry);
diff --git a/coders/pango.c b/coders/pango.c
index e4e1cb237..505590539 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -176,7 +176,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   /*
     Format caption.
   */
-  option=GetImageOption(image_info,"filename");
+  option=GetImageArtifact(image,"filename");
   if (option == (const char *) NULL)
     property=InterpretImageProperties(image_info,image,image_info->filename,
       exception);
@@ -195,7 +195,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(fontmap),
     image->resolution.x == 0.0 ? 90.0 : image->resolution.x);
   font_options=cairo_font_options_create();
-  option=GetImageOption(image_info,"pango:hinting");
+  option=GetImageArtifact(image,"pango:hinting");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"none") != 0)
@@ -206,7 +206,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   context=pango_font_map_create_context(fontmap);
   pango_cairo_context_set_font_options(context,font_options);
   cairo_font_options_destroy(font_options);
-  option=GetImageOption(image_info,"pango:language");
+  option=GetImageArtifact(image,"pango:language");
   if (option != (const char *) NULL)
     pango_context_set_language(context,pango_language_from_string(option));
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
@@ -245,7 +245,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     }
   }
   pango_context_set_base_gravity(context,gravity);
-  option=GetImageOption(image_info,"pango:gravity-hint");
+  option=GetImageArtifact(image,"pango:gravity-hint");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"line") == 0)
@@ -259,10 +259,10 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     Configure layout.
   */
   layout=pango_layout_new(context);
-  option=GetImageOption(image_info,"pango:auto-dir");
+  option=GetImageArtifact(image,"pango:auto-dir");
   if (option != (const char *) NULL)
     pango_layout_set_auto_dir(layout,1);
-  option=GetImageOption(image_info,"pango:ellipsize");
+  option=GetImageArtifact(image,"pango:ellipsize");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"end") == 0)
@@ -274,13 +274,13 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       if (LocaleCompare(option,"start") == 0)
         pango_layout_set_ellipsize(layout,PANGO_ELLIPSIZE_START);
     }
-  option=GetImageOption(image_info,"pango:justify");
+  option=GetImageArtifact(image,"pango:justify");
   if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_justify(layout,1);
-  option=GetImageOption(image_info,"pango:single-paragraph");
+  option=GetImageArtifact(image,"pango:single-paragraph");
   if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_single_paragraph_mode(layout,1);
-  option=GetImageOption(image_info,"pango:wrap");
+  option=GetImageArtifact(image,"pango:wrap");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"char") == 0)
@@ -290,7 +290,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       if (LocaleCompare(option,"word-char") == 0)
         pango_layout_set_wrap(layout,PANGO_WRAP_WORD_CHAR);
     }
-  option=GetImageOption(image_info,"pango:indent");
+  option=GetImageArtifact(image,"pango:indent");
   if (option != (const char *) NULL)
     pango_layout_set_indent(layout,(int) ((StringToLong(option)*
       (image->resolution.x == 0.0 ? 90.0 : image->resolution.x)*PANGO_SCALE+36)/
@@ -329,7 +329,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       pango_layout_set_font_description(layout,description);
       pango_font_description_free(description);
     }
-  option=GetImageOption(image_info,"pango:markup");
+  option=GetImageArtifact(image,"pango:markup");
   if ((option != (const char *) NULL) && (IsStringTrue(option) == MagickFalse))
     pango_layout_set_text(layout,caption,-1);
   else
diff --git a/coders/pcl.c b/coders/pcl.c
index cb1fc47c1..e83d1eba0 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -350,7 +350,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageOption(read_info,"authenticate");
+  option=GetImageArtifact(image,"authenticate");
   if (option != (const char *) NULL)
     (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
       " -sPCLPassword=%s",option);
@@ -786,7 +786,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image,
             (void) WriteBlobString(image,buffer);
           }
         }
-    option=GetImageOption(image_info,"pcl:fit-to-page");
+    option=GetImageArtifact(image,"pcl:fit-to-page");
     if (IfMagickTrue(IsStringTrue(option)))
       (void) WriteBlobString(image,"\033*r3A");
     else
diff --git a/coders/pdf.c b/coders/pdf.c
index 61535ba72..defec3413 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -430,8 +430,8 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     Determine page geometry from the PDF media box.
   */
   cmyk=image_info->colorspace == CMYKColorspace ? MagickTrue : MagickFalse;
-  cropbox=IsStringTrue(GetImageOption(image_info,"pdf:use-cropbox"));
-  trimbox=IsStringTrue(GetImageOption(image_info,"pdf:use-trimbox"));
+  cropbox=IsStringTrue(GetImageArtifact(image,"pdf:use-cropbox"));
+  trimbox=IsStringTrue(GetImageArtifact(image,"pdf:use-trimbox"));
   count=0;
   spotcolor=0;
   (void) ResetMagickMemory(&bounding_box,0,sizeof(bounding_box));
@@ -630,7 +630,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageOption(read_info,"authenticate");
+  option=GetImageArtifact(image,"authenticate");
   if (option != (const char *) NULL)
     (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
       " -sPCLPassword=%s",option);
diff --git a/coders/png.c b/coders/png.c
index 0fe8bbbbd..26f282d54 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -11414,7 +11414,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
   mng_info->write_png48=LocaleCompare(image_info->magick,"PNG48") == 0;
   mng_info->write_png64=LocaleCompare(image_info->magick,"PNG64") == 0;
 
-  value=GetImageOption(image_info,"png:format");
+  value=GetImageArtifact(image,"png:format");
 
   if (value != (char *) NULL)
     {
@@ -11563,7 +11563,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       (void) SyncImage(image,exception);
     }
 
-  value=GetImageOption(image_info,"png:bit-depth");
+  value=GetImageArtifact(image,"png:bit-depth");
 
   if (value != (char *) NULL)
     {
@@ -11593,7 +11593,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
           "  png:bit-depth=%d was defined.\n",mng_info->write_png_depth);
     }
 
-  value=GetImageOption(image_info,"png:color-type");
+  value=GetImageArtifact(image,"png:color-type");
 
   if (value != (char *) NULL)
     {
@@ -11685,7 +11685,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
 
   value=GetImageArtifact(image,"png:preserve-colormap");
   if (value == NULL)
-     value=GetImageOption(image_info,"png:preserve-colormap");
+     value=GetImageArtifact(image,"png:preserve-colormap");
   if (value != NULL)
      mng_info->ping_preserve_colormap=MagickTrue;
 
@@ -11694,7 +11694,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
    */
   value=GetImageArtifact(image,"png:compression-level");
   if (value == NULL)
-     value=GetImageOption(image_info,"png:compression-level");
+     value=GetImageArtifact(image,"png:compression-level");
   if (value != NULL)
   {
       /* We have to add 1 to everything because 0 is a valid input,
@@ -11739,7 +11739,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
 
   value=GetImageArtifact(image,"png:compression-strategy");
   if (value == NULL)
-     value=GetImageOption(image_info,"png:compression-strategy");
+     value=GetImageArtifact(image,"png:compression-strategy");
   if (value != NULL)
   {
 
@@ -11775,7 +11775,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
 
   value=GetImageArtifact(image,"png:compression-filter");
   if (value == NULL)
-     value=GetImageOption(image_info,"png:compression-filter");
+     value=GetImageArtifact(image,"png:compression-filter");
   if (value != NULL)
   {
 
@@ -11824,10 +11824,10 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       }
     else
       {
-       value=GetImageOption(image_info,"png:exclude-chunk");
+       value=GetImageArtifact(image,"png:exclude-chunk");
 
        if (value == NULL)
-         value=GetImageOption(image_info,"png:exclude-chunks");
+         value=GetImageArtifact(image,"png:exclude-chunks");
       }
 
     if (value != NULL)
@@ -11957,10 +11957,10 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       }
     else
       {
-       value=GetImageOption(image_info,"png:include-chunk");
+       value=GetImageArtifact(image,"png:include-chunk");
 
        if (value == NULL)
-         value=GetImageOption(image_info,"png:include-chunks");
+         value=GetImageArtifact(image,"png:include-chunks");
       }
 
     if (value != NULL)
@@ -13198,7 +13198,7 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image,
        }
      (void) WriteBlob(image,32,chunk);
      (void) WriteBlobMSBULong(image,crc32(0,chunk,32));
-     option=GetImageOption(image_info,"mng:need-cacheoff");
+     option=GetImageArtifact(image,"mng:need-cacheoff");
      if (option != (const char *) NULL)
        {
          size_t
diff --git a/coders/ps.c b/coders/ps.c
index b2032778b..f5ef4b381 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -777,7 +777,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageOption(image_info,"eps:use-cropbox");
+  option=GetImageArtifact(image,"eps:use-cropbox");
   if ((*image_info->magick == 'E') && ((option == (const char *) NULL) || 
       (IsStringTrue(option) != MagickFalse)))
     (void) ConcatenateMagickString(options,"-dEPSCrop ",MaxTextExtent);
diff --git a/coders/ps3.c b/coders/ps3.c
index d6066595c..16c59b32b 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -1229,7 +1229,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image,
     /*
       Render with imagemask operator?
     */
-    option=GetImageOption(image_info,"ps3:imagemask");
+    option=GetImageArtifact(image,"ps3:imagemask");
     (void) WriteBlobString(image,((option != (const char *) NULL) &&
       (IsImageMonochrome(image,exception) != MagickFalse)) ?
       "true\n" : "false\n");
diff --git a/coders/tiff.c b/coders/tiff.c
index 190ffa5f2..d179fabea 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1074,7 +1074,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       SetImageColorspace(image,LabColorspace,exception);
     TIFFGetProfiles(tiff,image,exception);
     TIFFGetProperties(tiff,image,exception);
-    option=GetImageOption(image_info,"tiff:exif-properties");
+    option=GetImageArtifact(image,"tiff:exif-properties");
     if (IfMagickTrue(IsStringNotFalse(option))) /* enabled by default */
       TIFFGetEXIFProperties(tiff,image,exception);
     (void) TIFFGetFieldDefaulted(tiff,TIFFTAG_SAMPLESPERPIXEL,
@@ -1210,7 +1210,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA)
           SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha);
       }
-    option=GetImageOption(image_info,"tiff:alpha");
+    option=GetImageArtifact(image,"tiff:alpha");
     if (option != (const char *) NULL)
       associated_alpha=LocaleCompare(option,"associated") == 0 ? MagickTrue :
         MagickFalse;
@@ -2357,7 +2357,7 @@ static MagickBooleanType GetTIFFInfo(const ImageInfo *image_info,TIFF *tiff,
 
   assert(tiff_info != (TIFFInfo *) NULL);
   (void) ResetMagickMemory(tiff_info,0,sizeof(*tiff_info));
-  option=GetImageOption(image_info,"tiff:tile-geometry");
+  option=GetImageArtifact(image,"tiff:tile-geometry");
   if (option == (const char *) NULL)
     return(MagickTrue);
   flags=ParseAbsoluteGeometry(option,&tiff_info->tile_geometry);
diff --git a/coders/webp.c b/coders/webp.c
index deb3e25d3..6478cbe9f 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -472,14 +472,14 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
   else
     if (image->quality >= 100)
       configure.lossless=1;
-  value=GetImageOption(image_info,"webp:lossless");
+  value=GetImageArtifact(image,"webp:lossless");
   if (value != (char *) NULL)
     configure.lossless=ParseCommandOption(MagickBooleanOptions,MagickFalse,
       value);
-  value=GetImageOption(image_info,"webp:method");
+  value=GetImageArtifact(image,"webp:method");
   if (value != (char *) NULL)
     configure.method=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:image-hint");
+  value=GetImageArtifact(image,"webp:image-hint");
   if (value != (char *) NULL)
     {
       if (LocaleCompare(value,"graph") == 0)
@@ -489,53 +489,53 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
       if (LocaleCompare(value,"picture") == 0)
         configure.image_hint=WEBP_HINT_PICTURE;
     }
-  value=GetImageOption(image_info,"webp:target-size");
+  value=GetImageArtifact(image,"webp:target-size");
   if (value != (char *) NULL)
     configure.target_size=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:target-psnr");
+  value=GetImageArtifact(image,"webp:target-psnr");
   if (value != (char *) NULL)
     configure.target_PSNR=(float) StringToDouble(value,(char **) NULL);
-  value=GetImageOption(image_info,"webp:segments");
+  value=GetImageArtifact(image,"webp:segments");
   if (value != (char *) NULL)
     configure.segments=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:sns-strength");
+  value=GetImageArtifact(image,"webp:sns-strength");
   if (value != (char *) NULL)
     configure.sns_strength=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:filter-strength");
+  value=GetImageArtifact(image,"webp:filter-strength");
   if (value != (char *) NULL)
     configure.filter_strength=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:filter-sharpness");
+  value=GetImageArtifact(image,"webp:filter-sharpness");
   if (value != (char *) NULL)
     configure.filter_sharpness=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:filter-type");
+  value=GetImageArtifact(image,"webp:filter-type");
   if (value != (char *) NULL)
     configure.filter_type=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:auto-filter");
+  value=GetImageArtifact(image,"webp:auto-filter");
   if (value != (char *) NULL)
     configure.autofilter=ParseCommandOption(MagickBooleanOptions,MagickFalse,
       value);
-  value=GetImageOption(image_info,"webp:alpha-compression");
+  value=GetImageArtifact(image,"webp:alpha-compression");
   if (value != (char *) NULL)
     configure.alpha_compression=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:alpha-filtering");
+  value=GetImageArtifact(image,"webp:alpha-filtering");
   if (value != (char *) NULL)
     configure.alpha_filtering=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:alpha-quality");
+  value=GetImageArtifact(image,"webp:alpha-quality");
   if (value != (char *) NULL)
     configure.alpha_quality=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:pass");
+  value=GetImageArtifact(image,"webp:pass");
   if (value != (char *) NULL)
     configure.pass=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:show-compressed");
+  value=GetImageArtifact(image,"webp:show-compressed");
   if (value != (char *) NULL)
     configure.show_compressed=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:preprocessing");
+  value=GetImageArtifact(image,"webp:preprocessing");
   if (value != (char *) NULL)
     configure.preprocessing=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:partitions");
+  value=GetImageArtifact(image,"webp:partitions");
   if (value != (char *) NULL)
     configure.partitions=StringToInteger(value);
-  value=GetImageOption(image_info,"webp:partition-limit");
+  value=GetImageArtifact(image,"webp:partition-limit");
   if (value != (char *) NULL)
     configure.partition_limit=StringToInteger(value);
   if (WebPValidateConfig(&configure) == 0)
diff --git a/coders/x.c b/coders/x.c
index f57c7e57f..fc6121c32 100644
--- a/coders/x.c
+++ b/coders/x.c
@@ -101,8 +101,8 @@ static Image *ReadXImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
   (void) exception;
   XGetImportInfo(&ximage_info);
-  ximage_info.screen=IsStringTrue(GetImageOption(image_info,"x:screen"));
-  ximage_info.silent=IsStringTrue(GetImageOption(image_info,"x:silent"));
+  ximage_info.screen=IsStringTrue(GetImageArtifact(image,"x:screen"));
+  ximage_info.silent=IsStringTrue(GetImageArtifact(image,"x:silent"));
   return(XImportImage(image_info,&ximage_info,exception));
 }
 #endif
diff --git a/coders/xps.c b/coders/xps.c
index 7b57dea90..97054b620 100644
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -303,7 +303,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageOption(read_info,"authenticate");
+  option=GetImageArtifact(image,"authenticate");
   if (option != (const char *) NULL)
     (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
       " -sPCLPassword=%s",option);