(no commit message)

diff --git a/coders/caption.c b/coders/caption.c
index de8ce097561010438e56f8462595264c14977304..555bc0f530992d053b5307474b70349f19bb0e0e 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -137,7 +137,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   /*
     Format caption.
   */
-  option=GetImageArtifact(image,"filename");
+  option=GetImageOption(image_info,"filename");
   if (option == (const char *) NULL)
     property=InterpretImageProperties(image_info,image,image_info->filename,
       exception);
@@ -151,7 +151,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=GetImageArtifact(image,"gravity");
+  gravity=GetImageOption(image_info,"gravity");
   if (gravity != (char *) NULL)
     draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
       MagickFalse,gravity);

diff --git a/coders/cin.c b/coders/cin.c
index 156da836fb9310301ba5c25dc8b32038bd17248c..a842977dc90b47bebe9564bb86575e6f55dfa30c 100644 (file)
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -846,7 +846,7 @@ static inline const char *GetCINProperty(const ImageInfo *image_info,
   const char
     *value;
 
-  value=GetImageArtifact(image,property);
+  value=GetImageOption(image_info,property);
   if (value != (const char *) NULL)
     return(value);
   return(GetImageProperty(image,property,exception));

diff --git a/coders/dcm.c b/coders/dcm.c
index f5871f2bf85436c5464f4e6dfb5a9b62e225f168..9cbe186c1e162110d85d0f421791f311703ded3f 100644 (file)
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3787,7 +3787,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=GetImageArtifact(image,"dcm:display-range");
+        option=GetImageOption(image_info,"dcm:display-range");
         if (option != (const char *) NULL)
           {
             if (LocaleCompare(option,"reset") == 0)

diff --git a/coders/dot.c b/coders/dot.c
index 7d6377d0b921014af100488b24aad0fcf6debf4e..1aabb712614d62d6349d7588427a535a15d89f1b 100644 (file)
--- 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=GetImageArtifact(image,"dot:layout-engine");
+  option=GetImageOption(image_info,"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 71bde9a98d945149b269172a9811cc758fdab741..596fd5932c5c0b0dde29336f3de302df3d791a03 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1388,7 +1388,7 @@ static inline const char *GetDPXProperty(const ImageInfo *image_info,
   const char
     *value;
 
-  value=GetImageArtifact(image,property);
+  value=GetImageOption(image_info,property);
   if (value != (const char *) NULL)
     return(value);
   return(GetImageProperty(image,property,exception));

diff --git a/coders/histogram.c b/coders/histogram.c
index ff9f36d6fcf6c429b35a94b555708daa7969641b..86c908880a8ceb469e1b067d172306d6a15a2b4b 100644 (file)
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -339,7 +339,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
       break;
   }
   histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
-  option=GetImageArtifact(image,"histogram:unique-colors");
+  option=GetImageOption(image_info,"histogram:unique-colors");
   if ((option == (const char *) NULL) || (IsStringTrue(option) != MagickFalse))
     {
       FILE

diff --git a/coders/info.c b/coders/info.c
index 9b72da5078569d25540f3de0877224b8a8d065b6..bd95686e5039c5a700c19060ea4ca29848e9c9cd 100644 (file)
--- a/coders/info.c
+++ b/coders/info.c
@@ -183,7 +183,7 @@ static MagickBooleanType WriteINFOImage(const ImageInfo *image_info,
   scene=0;
   do
   {
-    format=GetImageArtifact(image,"format");
+    format=GetImageOption(image_info,"format");
     if (format == (char *) NULL)
       {
         (void) CopyMagickString(image->filename,image->magick_filename,

diff --git a/coders/jp2.c b/coders/jp2.c
index b9cc028e21249630dbba75aacd688ce00ee9f9d8..7ca177922e99e96c0efbdca273ae99211ab7229a 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -1091,7 +1091,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   key=GetNextImageOption(image_info);
   for ( ; key != (char *) NULL; key=GetNextImageOption(image_info))
   {
-    option=GetImageArtifact(image,key);
+    option=GetImageOption(image_info,key);
     if (option == (const char *) NULL)
       continue;
     if (LocaleNCompare(key,"jp2:",4) == 0)
@@ -1105,7 +1105,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
         (void) ConcatenateString(&options," ");
       }
   }
-  option=GetImageArtifact(image,"jp2:rate");
+  option=GetImageOption(image_info,"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 f1b12c3594cd5915ab2c325b1f010b9b5801d574..b6ce7f22c6ccc8ccc18d7d6b2e43088c9852773b 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1091,7 +1091,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   if (units == 2)
     image->units=PixelsPerCentimeterResolution;
   number_pixels=(MagickSizeType) image->columns*image->rows;
-  option=GetImageArtifact(image,"jpeg:size");
+  option=GetImageOption(image_info,"jpeg:size");
   if (option != (const char *) NULL)
     {
       double
@@ -1147,7 +1147,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   image->compression=JPEGCompression;
   image->interlace=JPEGInterlace;
 #endif
-  option=GetImageArtifact(image,"jpeg:colors");
+  option=GetImageOption(image_info,"jpeg:colors");
   if (option != (const char *) NULL)
     {
       /*
@@ -1156,11 +1156,11 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       jpeg_info.quantize_colors=MagickTrue;
       jpeg_info.desired_number_of_colors=(int) StringToUnsignedLong(option);
     }
-  option=GetImageArtifact(image,"jpeg:block-smoothing");
+  option=GetImageOption(image_info,"jpeg:block-smoothing");
   if (option != (const char *) NULL)
     jpeg_info.do_block_smoothing=IsStringTrue(option);
   jpeg_info.dct_method=JDCT_FLOAT;
-  option=GetImageArtifact(image,"jpeg:dct-method");
+  option=GetImageOption(image_info,"jpeg:dct-method");
   if (option != (const char *) NULL)
     switch (*option)
     {
@@ -1190,7 +1190,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
         break;
       }
     }
-  option=GetImageArtifact(image,"jpeg:fancy-upsampling");
+  option=GetImageOption(image_info,"jpeg:fancy-upsampling");
   if (option != (const char *) NULL)
     jpeg_info.do_fancy_upsampling=IsStringTrue(option);
   (void) jpeg_start_decompress(&jpeg_info);
@@ -1226,7 +1226,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       (void) SetImageColorspace(image,LabColorspace,exception);
       jpeg_info.out_color_space=JCS_YCbCr;
     }
-  option=GetImageArtifact(image,"jpeg:colors");
+  option=GetImageOption(image_info,"jpeg:colors");
   if (option != (const char *) NULL)
     if (AcquireImageColormap(image,StringToUnsignedLong(option),exception)
          == MagickFalse)
@@ -2155,7 +2155,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
         jpeg_info.density_unit=(UINT8) 2;
     }
   jpeg_info.dct_method=JDCT_FLOAT;
-  option=GetImageArtifact(image,"jpeg:dct-method");
+  option=GetImageOption(image_info,"jpeg:dct-method");
   if (option != (const char *) NULL)
     switch (*option)
     {
@@ -2185,7 +2185,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
         break;
       }
     }
-  option=GetImageArtifact(image,"jpeg:optimize-coding");
+  option=GetImageOption(image_info,"jpeg:optimize-coding");
   if (option != (const char *) NULL)
     jpeg_info.optimize_coding=IsStringTrue(option);
   else
@@ -2223,7 +2223,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
       "Interlace: nonprogressive");
 #endif
-  option=GetImageArtifact(image,"jpeg:extent");
+  option=GetImageOption(image_info,"jpeg:extent");
   if (option != (const char *) NULL)
     {
       Image
@@ -2309,7 +2309,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
   jpeg_set_quality(&jpeg_info,quality,MagickTrue);
 #if (JPEG_LIB_VERSION >= 70)
-  option=GetImageArtifact(image,"quality");
+  option=GetImageOption(image_info,"quality");
   if (option != (const char *) NULL)
     {
       GeometryInfo
@@ -2333,7 +2333,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
 #endif
   sampling_factor=(const char *) NULL;
-  value=GetImageArtifact(image,"jpeg:sampling-factor");
+  value=GetImageOption(image_info,"jpeg:sampling-factor");
   if (value == (char *) NULL)
     value=GetImageProperty(image,"jpeg:sampling-factor",exception);
   if (value != (char *) NULL)
@@ -2397,7 +2397,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=GetImageArtifact(image,"jpeg:q-table");
+  option=GetImageOption(image_info,"jpeg:q-table");
   if (option != (const char *) NULL)
     {
       QuantizationTable

diff --git a/coders/mpc.c b/coders/mpc.c
index 9ef3c42a4129b3aef698ef0b04c14f34d4d536e3..7005636ff763c216e39f7407dfebaeec95560842 100644 (file)
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -1340,7 +1340,6 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image,
       (void) WriteBlobByte(image,'\n');
       property=GetNextImageProperty(image);
     }
-    ResetImageArtifactIterator(image);
     (void) WriteBlobString(image,"\f\n:\032");
     if (image->montage != (char *) NULL)
       {

diff --git a/coders/pango.c b/coders/pango.c
index 592c37eb0bce4534a943ea1fdabbc34cddd3eba5..a0ed05994de8e254b3777e73df7b2c805a53717f 100644 (file)
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -177,7 +177,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   /*
     Format caption.
   */
-  option=GetImageArtifact(image,"filename");
+  option=GetImageOption(image_info,"filename");
   if (option == (const char *) NULL)
     property=InterpretImageProperties(image_info,image,image_info->filename,
       exception);
@@ -196,7 +196,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=GetImageArtifact(image,"pango:hinting");
+  option=GetImageOption(image_info,"pango:hinting");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"none") != 0)
@@ -207,7 +207,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=GetImageArtifact(image,"pango:language");
+  option=GetImageOption(image_info,"pango:language");
   if (option != (const char *) NULL)
     pango_context_set_language(context,pango_language_from_string(option));
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
@@ -246,7 +246,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     }
   }
   pango_context_set_base_gravity(context,gravity);
-  option=GetImageArtifact(image,"pango:gravity-hint");
+  option=GetImageOption(image_info,"pango:gravity-hint");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"line") == 0)
@@ -260,10 +260,10 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     Configure layout.
   */
   layout=pango_layout_new(context);
-  option=GetImageArtifact(image,"pango:auto-dir");
+  option=GetImageOption(image_info,"pango:auto-dir");
   if (option != (const char *) NULL)
     pango_layout_set_auto_dir(layout,1);
-  option=GetImageArtifact(image,"pango:ellipsize");
+  option=GetImageOption(image_info,"pango:ellipsize");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"end") == 0)
@@ -275,13 +275,13 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       if (LocaleCompare(option,"start") == 0)
         pango_layout_set_ellipsize(layout,PANGO_ELLIPSIZE_START);
     }
-  option=GetImageArtifact(image,"pango:justify");
+  option=GetImageOption(image_info,"pango:justify");
   if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_justify(layout,1);
-  option=GetImageArtifact(image,"pango:single-paragraph");
+  option=GetImageOption(image_info,"pango:single-paragraph");
   if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_single_paragraph_mode(layout,1);
-  option=GetImageArtifact(image,"pango:wrap");
+  option=GetImageOption(image_info,"pango:wrap");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"char") == 0)
@@ -291,7 +291,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       if (LocaleCompare(option,"word-char") == 0)
         pango_layout_set_wrap(layout,PANGO_WRAP_WORD_CHAR);
     }
-  option=GetImageArtifact(image,"pango:indent");
+  option=GetImageOption(image_info,"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)/
@@ -330,7 +330,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       pango_layout_set_font_description(layout,description);
       pango_font_description_free(description);
     }
-  option=GetImageArtifact(image,"pango:markup");
+  option=GetImageOption(image_info,"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 d4a5f1da4ed5b17328baed2800332bb575c0c9c2..18e39c230dd5d2d8bf999c5c78cf901f5600d897 100644 (file)
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -351,7 +351,7 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageArtifact(image,"authenticate");
+  option=GetImageOption(image_info,"authenticate");
   if (option != (const char *) NULL)
     (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
       " -sPCLPassword=%s",option);
@@ -787,7 +787,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image,
             (void) WriteBlobString(image,buffer);
           }
         }
-    option=GetImageArtifact(image,"pcl:fit-to-page");
+    option=GetImageOption(image_info,"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 fed276b16a78b5b4ff7ab58ad468a361f55564a5..ff3acb90229420bb765e86a0a3d6239dd88ed88f 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -431,8 +431,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(GetImageArtifact(image,"pdf:use-cropbox"));
-  trimbox=IsStringTrue(GetImageArtifact(image,"pdf:use-trimbox"));
+  cropbox=IsStringTrue(GetImageOption(image_info,"pdf:use-cropbox"));
+  trimbox=IsStringTrue(GetImageOption(image_info,"pdf:use-trimbox"));
   count=0;
   spotcolor=0;
   (void) ResetMagickMemory(&bounding_box,0,sizeof(bounding_box));
@@ -631,7 +631,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageArtifact(image,"authenticate");
+  option=GetImageOption(image_info,"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 96b59f6a54eb57594d100cac592354aaae19174e..e67d8fcb11ede8c01dba689c8cc5ab158d7e098d 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -11424,7 +11424,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=GetImageArtifact(image,"png:format");
+  value=GetImageOption(image_info,"png:format");
 
   if (value != (char *) NULL)
     {
@@ -11573,7 +11573,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       (void) SyncImage(image,exception);
     }
 
-  value=GetImageArtifact(image,"png:bit-depth");
+  value=GetImageOption(image_info,"png:bit-depth");
 
   if (value != (char *) NULL)
     {
@@ -11603,7 +11603,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
           "  png:bit-depth=%d was defined.\n",mng_info->write_png_depth);
     }
 
-  value=GetImageArtifact(image,"png:color-type");
+  value=GetImageOption(image_info,"png:color-type");
 
   if (value != (char *) NULL)
     {
@@ -11693,7 +11693,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
 
   mng_info->ping_preserve_colormap=MagickFalse;
 
-  value=GetImageArtifact(image,"png:preserve-colormap");
+  value=GetImageOption(image_info,"png:preserve-colormap");
   if (value == NULL)
      value=GetImageArtifact(image,"png:preserve-colormap");
   if (value != NULL)
@@ -11702,7 +11702,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
   /* Thes compression-level, compression-strategy, and compression-filter
    * defines take precedence over values from the -quality option.
    */
-  value=GetImageArtifact(image,"png:compression-level");
+  value=GetImageOption(image_info,"png:compression-level");
   if (value == NULL)
      value=GetImageArtifact(image,"png:compression-level");
   if (value != NULL)
@@ -11747,7 +11747,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
              "=%s",value);
     }
 
-  value=GetImageArtifact(image,"png:compression-strategy");
+  value=GetImageOption(image_info,"png:compression-strategy");
   if (value == NULL)
      value=GetImageArtifact(image,"png:compression-strategy");
   if (value != NULL)
@@ -11783,7 +11783,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
              "=%s",value);
     }
 
-  value=GetImageArtifact(image,"png:compression-filter");
+  value=GetImageOption(image_info,"png:compression-filter");
   if (value == NULL)
      value=GetImageArtifact(image,"png:compression-filter");
   if (value != NULL)
@@ -11827,14 +11827,14 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
   {
     if (source==0)
       {
-       value=GetImageArtifact(image,"png:exclude-chunk");
+       value=GetImageOption(image_info,"png:exclude-chunk");
 
        if (value == NULL)
          value=GetImageArtifact(image,"png:exclude-chunks");
       }
     else
       {
-       value=GetImageArtifact(image,"png:exclude-chunk");
+       value=GetImageOption(image_info,"png:exclude-chunk");
 
        if (value == NULL)
          value=GetImageArtifact(image,"png:exclude-chunks");
@@ -11960,14 +11960,14 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
   {
     if (source==0)
       {
-       value=GetImageArtifact(image,"png:include-chunk");
+       value=GetImageOption(image_info,"png:include-chunk");
 
        if (value == NULL)
          value=GetImageArtifact(image,"png:include-chunks");
       }
     else
       {
-       value=GetImageArtifact(image,"png:include-chunk");
+       value=GetImageOption(image_info,"png:include-chunk");
 
        if (value == NULL)
          value=GetImageArtifact(image,"png:include-chunks");
@@ -13208,7 +13208,7 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image,
        }
      (void) WriteBlob(image,32,chunk);
      (void) WriteBlobMSBULong(image,crc32(0,chunk,32));
-     option=GetImageArtifact(image,"mng:need-cacheoff");
+     option=GetImageOption(image_info,"mng:need-cacheoff");
      if (option != (const char *) NULL)
        {
          size_t

diff --git a/coders/ps.c b/coders/ps.c
index f91ce7b3af6acd7b4c5fbd3a8b099bc9185ff398..afb59e1fb667881e71a81a0d9d730581586621ad 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -778,7 +778,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageArtifact(image,"eps:use-cropbox");
+  option=GetImageOption(image_info,"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 30be999c3b723f0d2f3fb8c71de0ee906deb5334..ef7a7918f2e43cd71f38659f7d1c868e0d53ca17 100644 (file)
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -1230,7 +1230,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image,
     /*
       Render with imagemask operator?
     */
-    option=GetImageArtifact(image,"ps3:imagemask");
+    option=GetImageOption(image_info,"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 1fa2e3c9f0956b57823995224352a6f6dc078789..8baec08880c43769460c311d3235f41f4db37818 100644 (file)
--- 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=GetImageArtifact(image,"tiff:exif-properties");
+    option=GetImageOption(image_info,"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=GetImageArtifact(image,"tiff:alpha");
+    option=GetImageOption(image_info,"tiff:alpha");
     if (option != (const char *) NULL)
       associated_alpha=LocaleCompare(option,"associated") == 0 ? MagickTrue :
         MagickFalse;
@@ -2342,8 +2342,8 @@ static MagickBooleanType EncodeLabImage(Image *image,ExceptionInfo *exception)
   return(status);
 }
 
-static MagickBooleanType GetTIFFInfo(const Image *image,TIFF *tiff,
-  TIFFInfo *tiff_info)
+static MagickBooleanType GetTIFFInfo(const ImageInfo *image_info,
+  const Image *image,TIFF *tiff,TIFFInfo *tiff_info)
 {
   const char
     *option;
@@ -2357,7 +2357,7 @@ static MagickBooleanType GetTIFFInfo(const Image *image,TIFF *tiff,
 
   assert(tiff_info != (TIFFInfo *) NULL);
   (void) ResetMagickMemory(tiff_info,0,sizeof(*tiff_info));
-  option=GetImageArtifact(image,"tiff:tile-geometry");
+  option=GetImageOption(image_info,"tiff:tile-geometry");
   if (option == (const char *) NULL)
     return(MagickTrue);
   flags=ParseAbsoluteGeometry(option,&tiff_info->tile_geometry);
@@ -2710,7 +2710,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
   error_handler=TIFFSetErrorHandler((TIFFErrorHandler) TIFFErrors);
   warning_handler=TIFFSetWarningHandler((TIFFErrorHandler) TIFFWarnings);
   endian_type=UndefinedEndian;
-  option=GetImageArtifact(image,"tiff:endian");
+  option=GetImageOption(image_info,"tiff:endian");
   if (option != (const char *) NULL)
     {
       if (LocaleNCompare(option,"msb",3) == 0)
@@ -2995,7 +2995,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
          compress_tag=COMPRESSION_NONE;
          endian=FILLORDER_MSB2LSB;
        }
-    option=GetImageArtifact(image,"tiff:fill-order");
+    option=GetImageOption(image_info,"tiff:fill-order");
     if (option != (const char *) NULL)
       {
         if (LocaleNCompare(option,"msb",3) == 0)
@@ -3018,7 +3018,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         */
         extra_samples=1;
         sample_info[0]=EXTRASAMPLE_UNASSALPHA;
-        option=GetImageArtifact(image,"tiff:alpha");
+        option=GetImageOption(image_info,"tiff:alpha");
         if ((option != (const char *) NULL) &&
             (LocaleCompare(option,"associated") == 0))
           sample_info[0]=EXTRASAMPLE_ASSOCALPHA;
@@ -3063,7 +3063,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
     if (TIFFScanlineSize(tiff) != 0)
       rows_per_strip=(uint32) MagickMax((size_t) TIFFDefaultStripSize(tiff,0),
         1);
-    option=GetImageArtifact(image,"tiff:rows-per-strip");
+    option=GetImageOption(image_info,"tiff:rows-per-strip");
     if (option != (const char *) NULL)
       rows_per_strip=(size_t) strtol(option,(char **) NULL,10);
     switch (compress_tag)
@@ -3172,7 +3172,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
       default:
         break;
     }
-    option=GetImageArtifact(image,"tiff:rows-per-strip");
+    option=GetImageOption(image_info,"tiff:rows-per-strip");
     if (option == (const char *) NULL)
       (void) TIFFSetField(tiff,TIFFTAG_ROWSPERSTRIP,rows_per_strip);
     if ((image->resolution.x != 0.0) && (image->resolution.y != 0.0))
@@ -3250,7 +3250,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
     /*
       Write image scanlines.
     */
-    if (GetTIFFInfo(image,tiff,&tiff_info) == MagickFalse)
+    if (GetTIFFInfo(image_info,image,tiff,&tiff_info) == MagickFalse)
       ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
     quantum_info->endian=LSBEndian;
     pixels=GetQuantumPixels(quantum_info);

diff --git a/coders/webp.c b/coders/webp.c
index 55b9b759839fafb8dbbed52c25fd200c06af45b7..835b09178dbfe7a501a9ef31a71084e87bafe17f 100644 (file)
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -473,14 +473,14 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
   else
     if (image->quality >= 100)
       configure.lossless=1;
-  value=GetImageArtifact(image,"webp:lossless");
+  value=GetImageOption(image_info,"webp:lossless");
   if (value != (char *) NULL)
     configure.lossless=ParseCommandOption(MagickBooleanOptions,MagickFalse,
       value);
-  value=GetImageArtifact(image,"webp:method");
+  value=GetImageOption(image_info,"webp:method");
   if (value != (char *) NULL)
     configure.method=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:image-hint");
+  value=GetImageOption(image_info,"webp:image-hint");
   if (value != (char *) NULL)
     {
       if (LocaleCompare(value,"graph") == 0)
@@ -490,53 +490,53 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info,
       if (LocaleCompare(value,"picture") == 0)
         configure.image_hint=WEBP_HINT_PICTURE;
     }
-  value=GetImageArtifact(image,"webp:target-size");
+  value=GetImageOption(image_info,"webp:target-size");
   if (value != (char *) NULL)
     configure.target_size=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:target-psnr");
+  value=GetImageOption(image_info,"webp:target-psnr");
   if (value != (char *) NULL)
     configure.target_PSNR=(float) StringToDouble(value,(char **) NULL);
-  value=GetImageArtifact(image,"webp:segments");
+  value=GetImageOption(image_info,"webp:segments");
   if (value != (char *) NULL)
     configure.segments=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:sns-strength");
+  value=GetImageOption(image_info,"webp:sns-strength");
   if (value != (char *) NULL)
     configure.sns_strength=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:filter-strength");
+  value=GetImageOption(image_info,"webp:filter-strength");
   if (value != (char *) NULL)
     configure.filter_strength=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:filter-sharpness");
+  value=GetImageOption(image_info,"webp:filter-sharpness");
   if (value != (char *) NULL)
     configure.filter_sharpness=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:filter-type");
+  value=GetImageOption(image_info,"webp:filter-type");
   if (value != (char *) NULL)
     configure.filter_type=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:auto-filter");
+  value=GetImageOption(image_info,"webp:auto-filter");
   if (value != (char *) NULL)
     configure.autofilter=ParseCommandOption(MagickBooleanOptions,MagickFalse,
       value);
-  value=GetImageArtifact(image,"webp:alpha-compression");
+  value=GetImageOption(image_info,"webp:alpha-compression");
   if (value != (char *) NULL)
     configure.alpha_compression=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:alpha-filtering");
+  value=GetImageOption(image_info,"webp:alpha-filtering");
   if (value != (char *) NULL)
     configure.alpha_filtering=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:alpha-quality");
+  value=GetImageOption(image_info,"webp:alpha-quality");
   if (value != (char *) NULL)
     configure.alpha_quality=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:pass");
+  value=GetImageOption(image_info,"webp:pass");
   if (value != (char *) NULL)
     configure.pass=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:show-compressed");
+  value=GetImageOption(image_info,"webp:show-compressed");
   if (value != (char *) NULL)
     configure.show_compressed=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:preprocessing");
+  value=GetImageOption(image_info,"webp:preprocessing");
   if (value != (char *) NULL)
     configure.preprocessing=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:partitions");
+  value=GetImageOption(image_info,"webp:partitions");
   if (value != (char *) NULL)
     configure.partitions=StringToInteger(value);
-  value=GetImageArtifact(image,"webp:partition-limit");
+  value=GetImageOption(image_info,"webp:partition-limit");
   if (value != (char *) NULL)
     configure.partition_limit=StringToInteger(value);
   if (WebPValidateConfig(&configure) == 0)

diff --git a/coders/xps.c b/coders/xps.c
index 40a755bab9685e7d49879bd31f5d61b3cbebdb3c..71978f8428f1692cfb4175297fe9314043aa4709 100644 (file)
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -304,7 +304,7 @@ static Image *ReadXPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (read_info->scenes != (char *) NULL)
         *read_info->scenes='\0';
     }
-  option=GetImageArtifact(image,"authenticate");
+  option=GetImageOption(image_info,"authenticate");
   if (option != (const char *) NULL)
     (void) FormatLocaleString(options+strlen(options),MaxTextExtent,
       " -sPCLPassword=%s",option);