(no commit message)

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 13251e9aa5735548297d9c3f07f8b2f630474375..98f32241d652f3659e2073ef27eec04951e8f783 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -1094,7 +1094,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
     {
       if (LocaleCompare(attribute,"adjoin") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickBooleanOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickBooleanOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1108,7 +1108,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"alpha") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickAlphaOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickAlphaOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1122,7 +1122,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"antialias") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickBooleanOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickBooleanOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1270,7 +1270,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"colorspace") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickColorspaceOptions,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickColorspaceOptions,
             MagickFalse,SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1292,7 +1292,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"compression") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickCompressOptions,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickCompressOptions,
             MagickFalse,SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1373,7 +1373,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"dispose") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickDisposeOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickDisposeOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1389,7 +1389,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         {
           if (info)
             {
-              sp=SvPOK(sval) ? ParseMagickOption(MagickBooleanOptions,
+              sp=SvPOK(sval) ? ParseCommandOption(MagickBooleanOptions,
                 MagickFalse,SvPV(sval,na)) : SvIV(sval);
               if (sp < 0)
                 {
@@ -1419,7 +1419,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
     {
       if (LocaleCompare(attribute,"endian") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickEndianOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickEndianOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1526,7 +1526,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"gravity") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickGravityOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickGravityOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1609,7 +1609,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"interlace") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickInterlaceOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1694,7 +1694,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"matte") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickBooleanOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickBooleanOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1719,7 +1719,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"monochrome") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickBooleanOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickBooleanOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1750,7 +1750,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"orientation") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickOrientationOptions,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickOrientationOptions,
             MagickFalse,SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1863,7 +1863,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"preview") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickPreviewOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickPreviewOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -1916,7 +1916,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"render") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickIntentOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickIntentOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -2098,7 +2098,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"type") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickTypeOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickTypeOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -2123,7 +2123,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
     {
       if (LocaleCompare(attribute,"units") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickResolutionOptions,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickResolutionOptions,
             MagickFalse,SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -2177,7 +2177,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
     {
       if (LocaleCompare(attribute,"verbose") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickBooleanOptions,MagickFalse,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickBooleanOptions,MagickFalse,
             SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -2197,7 +2197,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
         }
       if (LocaleCompare(attribute,"virtual-pixel") == 0)
         {
-          sp=SvPOK(sval) ? ParseMagickOption(MagickVirtualPixelOptions,
+          sp=SvPOK(sval) ? ParseCommandOption(MagickVirtualPixelOptions,
             MagickFalse,SvPV(sval,na)) : SvIV(sval);
           if (sp < 0)
             {
@@ -2561,7 +2561,7 @@ Append(ref,...)
         {
           if (LocaleCompare(attribute,"stack") == 0)
             {
-              stack=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              stack=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (stack < 0)
                 {
@@ -3232,7 +3232,7 @@ Compare(ref,...)
         {
           if (LocaleCompare(attribute,"metric") == 0)
             {
-              option=ParseMagickOption(MagickMetricOptions,MagickFalse,
+              option=ParseCommandOption(MagickMetricOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (option < 0)
                 {
@@ -3368,7 +3368,7 @@ CompareLayers(ref)
         {
           if (LocaleCompare(attribute,"method") == 0)
             {
-              option=ParseMagickOption(MagickLayerOptions,MagickFalse,
+              option=ParseCommandOption(MagickLayerOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (option < 0)
                 {
@@ -3656,7 +3656,7 @@ EvaluateImages(ref)
         ssize_t
           in;
 
-        in=ParseMagickOption(MagickEvaluateOptions,MagickFalse,(char *)
+        in=ParseCommandOption(MagickEvaluateOptions,MagickFalse,(char *)
           SvPV(ST(1),na));
         if (in < 0)
           {
@@ -3680,7 +3680,7 @@ EvaluateImages(ref)
                 ssize_t
                   in;
 
-                in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+                in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                   MagickEvaluateOptions,MagickFalse,SvPV(ST(i),na));
                 if (in < 0)
                   {
@@ -4440,7 +4440,7 @@ Get(ref,...)
               if (image == (Image *) NULL)
                 break;
               s=newSViv(image->storage_class);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickClassOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickClassOptions,
                 image->storage_class));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -4492,7 +4492,7 @@ Get(ref,...)
                 if (info->image_info->compression == UndefinedCompression)
                   j=image->compression;
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickCompressOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickCompressOptions,
                 j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -4502,7 +4502,7 @@ Get(ref,...)
             {
               j=image ? image->colorspace : RGBColorspace;
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickColorspaceOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickColorspaceOptions,
                 j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -4608,7 +4608,7 @@ Get(ref,...)
 
               s=newSViv(image->dispose);
               (void) sv_setpv(s,
-                MagickOptionToMnemonic(MagickDisposeOptions,image->dispose));
+                CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
               continue;
@@ -4652,7 +4652,7 @@ Get(ref,...)
               j=info ? info->image_info->endian : image ? image->endian :
                 UndefinedEndian;
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickEndianOptions,j));
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickEndianOptions,j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
               continue;
@@ -4691,7 +4691,7 @@ Get(ref,...)
           if (LocaleCompare(attribute,"filter") == 0)
             {
               s=image ? newSViv(image->filter) : newSViv(0);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickFilterOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickFilterOptions,
                 image->filter));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -4755,7 +4755,7 @@ Get(ref,...)
           if (LocaleCompare(attribute,"gravity") == 0)
             {
               s=image ? newSViv(image->gravity) : newSViv(0);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickGravityOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickGravityOptions,
                 image->gravity));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -4913,7 +4913,7 @@ Get(ref,...)
               j=info ? info->image_info->interlace : image ? image->interlace :
                 UndefinedInterlace;
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickInterlaceOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickInterlaceOptions,
                 j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -5067,7 +5067,7 @@ Get(ref,...)
               j=info ? info->image_info->orientation : image ?
                 image->orientation : UndefinedOrientation;
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickOrientationOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickOrientationOptions,
                 j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -5159,7 +5159,7 @@ Get(ref,...)
           if (LocaleCompare(attribute,"preview") == 0)
             {
               s=newSViv(info->image_info->preview_type);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickPreviewOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickPreviewOptions,
                 info->image_info->preview_type));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -5198,7 +5198,7 @@ Get(ref,...)
           if (LocaleCompare(attribute,"rendering-intent") == 0)
             {
               s=newSViv(image->rendering_intent);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickIntentOptions,
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickIntentOptions,
                 image->rendering_intent));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -5346,7 +5346,7 @@ Get(ref,...)
                 break;
               j=(ssize_t) GetImageType(image,&image->exception);
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(MagickTypeOptions,j));
+              (void) sv_setpv(s,CommandOptionToMnemonic(MagickTypeOptions,j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
               continue;
@@ -5415,7 +5415,7 @@ Get(ref,...)
                 break;
               j=(ssize_t) GetImageVirtualPixelMethod(image);
               s=newSViv(j);
-              (void) sv_setpv(s,MagickOptionToMnemonic(
+              (void) sv_setpv(s,CommandOptionToMnemonic(
                 MagickVirtualPixelOptions,j));
               SvIOK_on(s);
               PUSHs(s ? sv_2mortal(s) : &sv_undef);
@@ -6213,7 +6213,7 @@ GetPixel(ref,...)
         {
           if (LocaleCompare(attribute,"normalize") == 0)
             {
-              option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (option < 0)
                 {
@@ -6423,7 +6423,7 @@ GetPixels(ref,...)
         {
           if (LocaleCompare(attribute,"normalize") == 0)
             {
-              option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (option < 0)
                 {
@@ -6746,7 +6746,7 @@ Layers(ref,...)
         {
           if (LocaleCompare(attribute,"compose") == 0)
             {
-              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                 MagickComposeOptions,MagickFalse,SvPV(ST(i),na));
               if (sp < 0)
                 {
@@ -6766,7 +6766,7 @@ Layers(ref,...)
         {
           if (LocaleCompare(attribute,"dither") == 0)
             {
-              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                 MagickBooleanOptions,MagickFalse,SvPV(ST(i),na));
               if (sp < 0)
                 {
@@ -6786,7 +6786,7 @@ Layers(ref,...)
         {
           if (LocaleCompare(attribute,"method") == 0)
             {
-              option=ParseMagickOption(MagickLayerOptions,MagickFalse,
+              option=ParseCommandOption(MagickLayerOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (option < 0)
                 {
@@ -7528,7 +7528,7 @@ Mogrify(ref,...)
               al->integer_reference=(-1);
               break;
             }
-          al->integer_reference=ParseMagickOption((MagickOption) pp->type,
+          al->integer_reference=ParseCommandOption((CommandOption) pp->type,
             MagickFalse,SvPV(sv,na));
           if (pp->type == MagickChannelOptions)
             al->integer_reference=ParseChannelOption(SvPV(sv,na));
@@ -8494,7 +8494,7 @@ Mogrify(ref,...)
                 (void) CloneString(&draw_info->primitive,
                   argument_list[0].string_reference);
               else
-                (void) CloneString(&draw_info->primitive,MagickOptionToMnemonic(
+                (void) CloneString(&draw_info->primitive,CommandOptionToMnemonic(
                   MagickPrimitiveOptions,argument_list[0].integer_reference));
             }
           if (attribute_flag[1] != 0)
@@ -8517,7 +8517,7 @@ Mogrify(ref,...)
             {
               (void) ConcatenateString(&draw_info->primitive," ");
               (void) ConcatenateString(&draw_info->primitive,
-                MagickOptionToMnemonic(MagickMethodOptions,
+                CommandOptionToMnemonic(MagickMethodOptions,
                 argument_list[2].integer_reference));
             }
           if (attribute_flag[3] != 0)
@@ -10863,7 +10863,7 @@ Montage(ref,...)
         {
           if (LocaleCompare(attribute,"compose") == 0)
             {
-              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                 MagickComposeOptions,MagickFalse,SvPV(ST(i),na));
               if (sp < 0)
                 {
@@ -10939,7 +10939,7 @@ Montage(ref,...)
              ssize_t
                in;
 
-             in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+             in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                MagickGravityOptions,MagickFalse,SvPV(ST(i),na));
              if (in < 0)
                {
@@ -10988,7 +10988,7 @@ Montage(ref,...)
                 in;
 
               in=!SvPOK(ST(i)) ? SvIV(ST(i)) :
-                ParseMagickOption(MagickModeOptions,MagickFalse,SvPV(ST(i),na));
+                ParseCommandOption(MagickModeOptions,MagickFalse,SvPV(ST(i),na));
               switch (in)
               {
                 default:
@@ -11041,7 +11041,7 @@ Montage(ref,...)
         {
           if (LocaleCompare(attribute,"shadow") == 0)
             {
-              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+              sp=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                 MagickBooleanOptions,MagickFalse,SvPV(ST(i),na));
               if (sp < 0)
                 {
@@ -11650,7 +11650,7 @@ Preview(ref,...)
     preview_type=GammaPreview;
     if (items > 1)
       preview_type=(PreviewType)
-        ParseMagickOption(MagickPreviewOptions,MagickFalse,SvPV(ST(1),na));
+        ParseCommandOption(MagickPreviewOptions,MagickFalse,SvPV(ST(1),na));
     for ( ; image; image=image->next)
     {
       preview_image=PreviewImage(image,preview_type,exception);
@@ -11911,12 +11911,12 @@ QueryFont(ref,...)
       if (type_info->style == UndefinedStyle)
         PUSHs(&sv_undef);
       else
-        PUSHs(sv_2mortal(newSVpv(MagickOptionToMnemonic(MagickStyleOptions,
+        PUSHs(sv_2mortal(newSVpv(CommandOptionToMnemonic(MagickStyleOptions,
           type_info->style),0)));
       if (type_info->stretch == UndefinedStretch)
         PUSHs(&sv_undef);
       else
-        PUSHs(sv_2mortal(newSVpv(MagickOptionToMnemonic(MagickStretchOptions,
+        PUSHs(sv_2mortal(newSVpv(CommandOptionToMnemonic(MagickStretchOptions,
           type_info->stretch),0)));
       (void) FormatMagickString(message,MaxTextExtent,"%.20g",(double)
         type_info->weight);
@@ -12051,7 +12051,7 @@ QueryFontMetrics(ref,...)
         {
           if (LocaleCompare(attribute,"antialias") == 0)
             {
-              type=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              type=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (type < 0)
                 {
@@ -12076,7 +12076,7 @@ QueryFontMetrics(ref,...)
             }
           if (LocaleCompare(attribute,"direction") == 0)
             {
-              draw_info->direction=(DirectionType) ParseMagickOption(
+              draw_info->direction=(DirectionType) ParseCommandOption(
                 MagickDirectionOptions,MagickFalse,SvPV(ST(i),na));
               break;
             }
@@ -12130,7 +12130,7 @@ QueryFontMetrics(ref,...)
             }
           if (LocaleCompare(attribute,"gravity") == 0)
             {
-              draw_info->gravity=(GravityType) ParseMagickOption(
+              draw_info->gravity=(GravityType) ParseCommandOption(
                 MagickGravityOptions,MagickFalse,SvPV(ST(i),na));
               break;
             }
@@ -12235,7 +12235,7 @@ QueryFontMetrics(ref,...)
             }
           if (LocaleCompare(attribute,"style") == 0)
             {
-              type=ParseMagickOption(MagickStyleOptions,MagickFalse,
+              type=ParseCommandOption(MagickStyleOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (type < 0)
                 {
@@ -12462,7 +12462,7 @@ QueryMultilineFontMetrics(ref,...)
         {
           if (LocaleCompare(attribute,"antialias") == 0)
             {
-              type=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              type=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (type < 0)
                 {
@@ -12535,7 +12535,7 @@ QueryMultilineFontMetrics(ref,...)
             }
           if (LocaleCompare(attribute,"gravity") == 0)
             {
-              draw_info->gravity=(GravityType) ParseMagickOption(
+              draw_info->gravity=(GravityType) ParseCommandOption(
                 MagickGravityOptions,MagickFalse,SvPV(ST(i),na));
               break;
             }
@@ -12608,7 +12608,7 @@ QueryMultilineFontMetrics(ref,...)
             }
           if (LocaleCompare(attribute,"style") == 0)
             {
-              type=ParseMagickOption(MagickStyleOptions,MagickFalse,
+              type=ParseCommandOption(MagickStyleOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (type < 0)
                 {
@@ -12867,9 +12867,9 @@ QueryOption(ref,...)
     EXTEND(sp,8*items);
     for (i=1; i < items; i++)
     {
-      option=ParseMagickOption(MagickListOptions,MagickFalse,(char *)
+      option=ParseCommandOption(MagickListOptions,MagickFalse,(char *)
         SvPV(ST(i),na));
-      options=GetMagickOptions((MagickOption) option);
+      options=GetCommandOptions((CommandOption) option);
       if (options == (char **) NULL)
         PUSHs(&sv_undef);
       else
@@ -13368,7 +13368,7 @@ SetPixel(ref,...)
         {
           if (LocaleCompare(attribute,"normalize") == 0)
             {
-              option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (option < 0)
                 {
@@ -13574,7 +13574,7 @@ Smush(ref,...)
         {
           if (LocaleCompare(attribute,"stack") == 0)
             {
-              stack=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+              stack=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                 SvPV(ST(i),na));
               if (stack < 0)
                 {
@@ -13933,7 +13933,7 @@ Transform(ref,...)
              ssize_t
                in;
 
-             in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseMagickOption(
+             in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption(
                MagickGravityOptions,MagickFalse,SvPV(ST(i),na));
              if (in < 0)
                {

diff --git a/coders/caption.c b/coders/caption.c
index 1d1c2018816d8f295d884c1c9828fb856143f046..6a8e230d86fb5d22479a8f368bf05b73f3c7c536 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -140,7 +140,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   draw_info->text=ConstantString(caption);
   gravity=GetImageOption(image_info,"gravity");
   if (gravity != (char *) NULL)
-    draw_info->gravity=(GravityType) ParseMagickOption(MagickGravityOptions,
+    draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
       MagickFalse,gravity);
   if ((*caption != '\0') && (image->rows != 0) &&
       (image_info->pointsize == 0.0))

diff --git a/coders/debug.c b/coders/debug.c
index ebbbb6a487372ab393ca4aa2dfb48b76d730d7e1..434d1c99863d2cb328b5b191e1cecd5836784996 100644 (file)
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -205,7 +205,7 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info,
   scene=0;
   do
   {
-    (void) CopyMagickString(colorspace,MagickOptionToMnemonic(
+    (void) CopyMagickString(colorspace,CommandOptionToMnemonic(
       MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent);
     LocaleLower(colorspace);
     image->depth=GetImageQuantumDepth(image,MagickTrue);

diff --git a/coders/miff.c b/coders/miff.c
index 72b5bba9cbf41d4bbe37a110ce93e757ad8850f0..2ecd2d10d7d3587963e93c96564637f7b6666554 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -650,7 +650,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       storage_class;
 
-                    storage_class=ParseMagickOption(MagickClassOptions,
+                    storage_class=ParseCommandOption(MagickClassOptions,
                       MagickFalse,options);
                     if (storage_class < 0)
                       break;
@@ -667,7 +667,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       colorspace;
 
-                    colorspace=ParseMagickOption(MagickColorspaceOptions,
+                    colorspace=ParseCommandOption(MagickColorspaceOptions,
                       MagickFalse,options);
                     if (colorspace < 0)
                       break;
@@ -679,7 +679,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       compression;
 
-                    compression=ParseMagickOption(MagickCompressOptions,
+                    compression=ParseCommandOption(MagickCompressOptions,
                       MagickFalse,options);
                     if (compression < 0)
                       break;
@@ -712,7 +712,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       dispose;
 
-                    dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,
+                    dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,
                       options);
                     if (dispose < 0)
                       break;
@@ -730,7 +730,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       endian;
 
-                    endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+                    endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
                       options);
                     if (endian < 0)
                       break;
@@ -753,7 +753,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       gravity;
 
-                    gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+                    gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
                       options);
                     if (gravity < 0)
                       break;
@@ -797,7 +797,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       matte;
 
-                    matte=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                    matte=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                       options);
                     if (matte < 0)
                       break;
@@ -826,7 +826,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       matte;
 
-                    matte=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                    matte=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                       options);
                     if (matte < 0)
                       break;
@@ -838,7 +838,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       orientation;
 
-                    orientation=ParseMagickOption(MagickOrientationOptions,
+                    orientation=ParseCommandOption(MagickOrientationOptions,
                       MagickFalse,options);
                     if (orientation < 0)
                       break;
@@ -893,7 +893,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       format;
 
-                    format=ParseMagickOption(MagickQuantumFormatOptions,
+                    format=ParseCommandOption(MagickQuantumFormatOptions,
                       MagickFalse,options);
                     if (format < 0)
                       break;
@@ -921,7 +921,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       rendering_intent;
 
-                    rendering_intent=ParseMagickOption(MagickIntentOptions,
+                    rendering_intent=ParseCommandOption(MagickIntentOptions,
                       MagickFalse,options);
                     if (rendering_intent < 0)
                       break;
@@ -979,7 +979,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       type;
 
-                    type=ParseMagickOption(MagickTypeOptions,MagickFalse,
+                    type=ParseCommandOption(MagickTypeOptions,MagickFalse,
                       options);
                     if (type < 0)
                       break;
@@ -997,7 +997,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
                     ssize_t
                       units;
 
-                    units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+                    units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
                       options);
                     if (units < 0)
                       break;
@@ -1947,9 +1947,9 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     */
     (void) WriteBlobString(image,"id=ImageMagick  version=1.0\n");
     (void) FormatMagickString(buffer,MaxTextExtent,
-      "class=%s  colors=%.20g  matte=%s\n",MagickOptionToMnemonic(
+      "class=%s  colors=%.20g  matte=%s\n",CommandOptionToMnemonic(
       MagickClassOptions,image->storage_class),(double) image->colors,
-      MagickOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
+      CommandOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
     (void) WriteBlobString(image,buffer);
     (void) FormatMagickString(buffer,MaxTextExtent,"columns=%.20g  rows=%.20g  "
       "depth=%.20g\n",(double) image->columns,(double) image->rows,(double)
@@ -1958,26 +1958,26 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     if (image->type != UndefinedType)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
-          MagickOptionToMnemonic(MagickTypeOptions,image->type));
+          CommandOptionToMnemonic(MagickTypeOptions,image->type));
         (void) WriteBlobString(image,buffer);
       }
     if (image->colorspace != UndefinedColorspace)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"colorspace=%s\n",
-          MagickOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
+          CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
         (void) WriteBlobString(image,buffer);
       }
     if (compression != UndefinedCompression)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"compression=%s  "
-          "quality=%.20g\n",MagickOptionToMnemonic(MagickCompressOptions,
+          "quality=%.20g\n",CommandOptionToMnemonic(MagickCompressOptions,
           compression),(double) image->quality);
         (void) WriteBlobString(image,buffer);
       }
     if (image->units != UndefinedResolution)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"units=%s\n",
-          MagickOptionToMnemonic(MagickResolutionOptions,image->units));
+          CommandOptionToMnemonic(MagickResolutionOptions,image->units));
         (void) WriteBlobString(image,buffer);
       }
     if ((image->x_resolution != 0) || (image->y_resolution != 0))
@@ -2050,20 +2050,20 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     if (image->gravity != UndefinedGravity)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"gravity=%s\n",
-          MagickOptionToMnemonic(MagickGravityOptions,image->gravity));
+          CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
         (void) WriteBlobString(image,buffer);
       }
     if (image->dispose != UndefinedDispose)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"dispose=%s\n",
-          MagickOptionToMnemonic(MagickDisposeOptions,image->dispose));
+          CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
         (void) WriteBlobString(image,buffer);
       }
     if (image->rendering_intent != UndefinedIntent)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,
           "rendering-intent=%s\n",
-           MagickOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
+           CommandOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
         (void) WriteBlobString(image,buffer);
       }
     if (image->gamma != 0.0)
@@ -2093,7 +2093,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     if (image->orientation != UndefinedOrientation)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"orientation=%s\n",
-          MagickOptionToMnemonic(MagickOrientationOptions,image->orientation));
+          CommandOptionToMnemonic(MagickOrientationOptions,image->orientation));
         (void) WriteBlobString(image,buffer);
       }
     if (image->profiles != (void *) NULL)

diff --git a/coders/mpc.c b/coders/mpc.c
index c46d43abd0fe00a80da63c158dc3b32faa0f114a..bb7d385181734c7f90108b6b11eb709385ed3ee4 100644 (file)
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -357,7 +357,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       storage_class;
 
-                    storage_class=ParseMagickOption(MagickClassOptions,
+                    storage_class=ParseCommandOption(MagickClassOptions,
                       MagickFalse,options);
                     if (storage_class < 0)
                       break;
@@ -374,7 +374,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       colorspace;
 
-                    colorspace=ParseMagickOption(MagickColorspaceOptions,
+                    colorspace=ParseCommandOption(MagickColorspaceOptions,
                       MagickFalse,options);
                     if (colorspace < 0)
                       break;
@@ -386,7 +386,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       compression;
 
-                    compression=ParseMagickOption(MagickCompressOptions,
+                    compression=ParseCommandOption(MagickCompressOptions,
                       MagickFalse,options);
                     if (compression < 0)
                       break;
@@ -419,7 +419,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       dispose;
 
-                    dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,
+                    dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,
                       options);
                     if (dispose < 0)
                       break;
@@ -437,7 +437,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       endian;
 
-                    endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+                    endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
                       options);
                     if (endian < 0)
                       break;
@@ -497,7 +497,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       matte;
 
-                    matte=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                    matte=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                       options);
                     if (matte < 0)
                       break;
@@ -536,7 +536,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       matte;
 
-                    matte=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                    matte=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                       options);
                     if (matte < 0)
                       break;
@@ -548,7 +548,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       orientation;
 
-                    orientation=ParseMagickOption(MagickOrientationOptions,
+                    orientation=ParseCommandOption(MagickOrientationOptions,
                       MagickFalse,options);
                     if (orientation < 0)
                       break;
@@ -618,7 +618,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       rendering_intent;
 
-                    rendering_intent=ParseMagickOption(MagickIntentOptions,
+                    rendering_intent=ParseCommandOption(MagickIntentOptions,
                       MagickFalse,options);
                     if (rendering_intent < 0)
                       break;
@@ -675,7 +675,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       type;
 
-                    type=ParseMagickOption(MagickTypeOptions,MagickFalse,
+                    type=ParseCommandOption(MagickTypeOptions,MagickFalse,
                       options);
                     if (type < 0)
                       break;
@@ -693,7 +693,7 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     ssize_t
                       units;
 
-                    units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+                    units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
                       options);
                     if (units < 0)
                       break;
@@ -1078,9 +1078,9 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image)
       MAGICKCORE_QUANTUM_DEPTH);
     (void) WriteBlobString(image,buffer);
     (void) FormatMagickString(buffer,MaxTextExtent,
-      "class=%s  colors=%.20g  matte=%s\n",MagickOptionToMnemonic(
+      "class=%s  colors=%.20g  matte=%s\n",CommandOptionToMnemonic(
       MagickClassOptions,image->storage_class),(double) image->colors,
-      MagickOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
+      CommandOptionToMnemonic(MagickBooleanOptions,(ssize_t) image->matte));
     (void) WriteBlobString(image,buffer);
     (void) FormatMagickString(buffer,MaxTextExtent,
       "columns=%.20g  rows=%.20g depth=%.20g\n",(double) image->columns,
@@ -1089,32 +1089,32 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image)
     if (image->type != UndefinedType)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
-          MagickOptionToMnemonic(MagickTypeOptions,image->type));
+          CommandOptionToMnemonic(MagickTypeOptions,image->type));
         (void) WriteBlobString(image,buffer);
       }
     if (image->colorspace != UndefinedColorspace)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"colorspace=%s\n",
-          MagickOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
+          CommandOptionToMnemonic(MagickColorspaceOptions,image->colorspace));
         (void) WriteBlobString(image,buffer);
       }
     if (image->endian != UndefinedEndian)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"endian=%s\n",
-          MagickOptionToMnemonic(MagickEndianOptions,image->endian));
+          CommandOptionToMnemonic(MagickEndianOptions,image->endian));
         (void) WriteBlobString(image,buffer);
       }
     if (image->compression != UndefinedCompression)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,
-          "compression=%s  quality=%.20g\n",MagickOptionToMnemonic(
+          "compression=%s  quality=%.20g\n",CommandOptionToMnemonic(
           MagickCompressOptions,image->compression),(double) image->quality);
         (void) WriteBlobString(image,buffer);
       }
     if (image->units != UndefinedResolution)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"units=%s\n",
-          MagickOptionToMnemonic(MagickResolutionOptions,image->units));
+          CommandOptionToMnemonic(MagickResolutionOptions,image->units));
         (void) WriteBlobString(image,buffer);
       }
     if ((image->x_resolution != 0) || (image->y_resolution != 0))
@@ -1188,20 +1188,20 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image)
     if (image->gravity != UndefinedGravity)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"gravity=%s\n",
-          MagickOptionToMnemonic(MagickGravityOptions,image->gravity));
+          CommandOptionToMnemonic(MagickGravityOptions,image->gravity));
         (void) WriteBlobString(image,buffer);
       }
     if (image->dispose != UndefinedDispose)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"dispose=%s\n",
-          MagickOptionToMnemonic(MagickDisposeOptions,image->dispose));
+          CommandOptionToMnemonic(MagickDisposeOptions,image->dispose));
         (void) WriteBlobString(image,buffer);
       }
     if (image->rendering_intent != UndefinedIntent)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,
           "rendering-intent=%s\n",
-           MagickOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
+           CommandOptionToMnemonic(MagickIntentOptions,image->rendering_intent));
         (void) WriteBlobString(image,buffer);
       }
     if (image->gamma != 0.0)
@@ -1231,7 +1231,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image)
     if (image->orientation != UndefinedOrientation)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,
-          "orientation=%s\n",MagickOptionToMnemonic(MagickOrientationOptions,
+          "orientation=%s\n",CommandOptionToMnemonic(MagickOrientationOptions,
           image->orientation));
         (void) WriteBlobString(image,buffer);
       }

diff --git a/coders/msl.c b/coders/msl.c
index addf6447c9f6c2fc23aff1b92b0bcc058f115e98..5647efc221ebc261747b0354b4786e91e8e048bc 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -715,7 +715,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"noise") == 0)
                     {
-                      option=ParseMagickOption(MagickNoiseOptions,MagickFalse,
+                      option=ParseCommandOption(MagickNoiseOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedNoiseType",
@@ -800,7 +800,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"align") == 0)
                     {
-                      option=ParseMagickOption(MagickAlignOptions,MagickFalse,
+                      option=ParseCommandOption(MagickAlignOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedAlignType",
@@ -810,7 +810,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"antialias") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -883,7 +883,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"gravity") == 0)
                     {
-                      option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+                      option=ParseCommandOption(MagickGravityOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedGravityType",
@@ -951,7 +951,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"stretch") == 0)
                     {
-                      option=ParseMagickOption(MagickStretchOptions,MagickFalse,
+                      option=ParseCommandOption(MagickStretchOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedStretchType",
@@ -972,7 +972,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"style") == 0)
                     {
-                      option=ParseMagickOption(MagickStyleOptions,MagickFalse,
+                      option=ParseCommandOption(MagickStyleOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedStyleType",
@@ -1107,7 +1107,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"stack") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -1264,7 +1264,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"compose") == 0)
                     {
-                      option=ParseMagickOption(MagickComposeOptions,MagickFalse,
+                      option=ParseCommandOption(MagickComposeOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedComposeType",
@@ -1756,7 +1756,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"compose") == 0)
                     {
-                      option=ParseMagickOption(MagickComposeOptions,MagickFalse,
+                      option=ParseCommandOption(MagickComposeOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedComposeType",
@@ -1855,7 +1855,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"gravity") == 0)
                     {
-                      option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+                      option=ParseCommandOption(MagickGravityOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedGravityType",
@@ -1970,7 +1970,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                       MagickBooleanType
                         tile;
 
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -2094,7 +2094,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"sharpen") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -2388,7 +2388,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"align") == 0)
                     {
-                      option=ParseMagickOption(MagickAlignOptions,MagickFalse,
+                      option=ParseCommandOption(MagickAlignOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedAlignType",
@@ -2398,7 +2398,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"antialias") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -2471,7 +2471,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"gravity") == 0)
                     {
-                      option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+                      option=ParseCommandOption(MagickGravityOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedGravityType",
@@ -2542,7 +2542,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"stretch") == 0)
                     {
-                      option=ParseMagickOption(MagickStretchOptions,MagickFalse,
+                      option=ParseCommandOption(MagickStretchOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedStretchType",
@@ -2563,7 +2563,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"style") == 0)
                     {
-                      option=ParseMagickOption(MagickStyleOptions,MagickFalse,
+                      option=ParseCommandOption(MagickStyleOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedStyleType",
@@ -3002,7 +3002,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"compose") == 0)
                     {
-                      option=ParseMagickOption(MagickComposeOptions,
+                      option=ParseCommandOption(MagickComposeOptions,
                         MagickFalse,value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedComposeType",
@@ -3579,7 +3579,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"dither") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -4023,7 +4023,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"gray") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -4411,7 +4411,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"colorspace") == 0)
                     {
-                      option=ParseMagickOption(MagickColorspaceOptions,
+                      option=ParseCommandOption(MagickColorspaceOptions,
                         MagickFalse,value);
                       if (option < 0)
                         ThrowMSLException(OptionError,
@@ -4428,7 +4428,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"dither") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -4445,7 +4445,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"measure") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -4537,7 +4537,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"align") == 0)
                     {
-                      option=ParseMagickOption(MagickAlignOptions,MagickFalse,
+                      option=ParseCommandOption(MagickAlignOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedAlignType",
@@ -4547,7 +4547,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"antialias") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedBooleanType",
@@ -4620,7 +4620,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"gravity") == 0)
                     {
-                      option=ParseMagickOption(MagickGravityOptions,MagickFalse,
+                      option=ParseCommandOption(MagickGravityOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedGravityType",
@@ -4686,7 +4686,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"stretch") == 0)
                     {
-                      option=ParseMagickOption(MagickStretchOptions,MagickFalse,
+                      option=ParseCommandOption(MagickStretchOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedStretchType",
@@ -4707,7 +4707,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"style") == 0)
                     {
-                      option=ParseMagickOption(MagickStyleOptions,MagickFalse,
+                      option=ParseCommandOption(MagickStyleOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedStyleType",
@@ -4908,7 +4908,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"raise") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedNoiseType",
@@ -5321,7 +5321,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 {
                   if (LocaleCompare(keyword,"filter") == 0)
                     {
-                      option=ParseMagickOption(MagickFilterOptions,MagickFalse,
+                      option=ParseCommandOption(MagickFilterOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedNoiseType",
@@ -5873,7 +5873,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"colorspace") == 0)
                     {
-                      option=ParseMagickOption(MagickColorspaceOptions,
+                      option=ParseCommandOption(MagickColorspaceOptions,
                         MagickFalse,value);
                       if (option < 0)
                         ThrowMSLException(OptionError,
@@ -5981,7 +5981,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                   ssize_t
                     colorspace;
 
-                  colorspace=(ColorspaceType) ParseMagickOption(
+                  colorspace=(ColorspaceType) ParseCommandOption(
                     MagickColorspaceOptions,MagickFalse,value);
                   if (colorspace < 0)
                     ThrowMSLException(OptionError,"UnrecognizedColorspace",
@@ -6138,7 +6138,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                     }
                   if (LocaleCompare(keyword,"gray") == 0)
                     {
-                      option=ParseMagickOption(MagickBooleanOptions,MagickFalse,
+                      option=ParseCommandOption(MagickBooleanOptions,MagickFalse,
                         value);
                       if (option < 0)
                         ThrowMSLException(OptionError,"UnrecognizedNoiseType",
@@ -7821,7 +7821,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
           ssize_t
             adjoin;
 
-          adjoin=ParseMagickOption(MagickBooleanOptions,MagickFalse,value);
+          adjoin=ParseCommandOption(MagickBooleanOptions,MagickFalse,value);
           if (adjoin < 0)
             ThrowMSLException(OptionError,"UnrecognizedType",value);
           image_info->adjoin=(MagickBooleanType) adjoin;
@@ -7832,7 +7832,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
           ssize_t
             alpha;
 
-          alpha=ParseMagickOption(MagickAlphaOptions,MagickFalse,value);
+          alpha=ParseCommandOption(MagickAlphaOptions,MagickFalse,value);
           if (alpha < 0)
             ThrowMSLException(OptionError,"UnrecognizedType",value);
           if (image != (Image *) NULL)
@@ -7844,7 +7844,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
           ssize_t
             antialias;
 
-          antialias=ParseMagickOption(MagickBooleanOptions,MagickFalse,value);
+          antialias=ParseCommandOption(MagickBooleanOptions,MagickFalse,value);
           if (antialias < 0)
             ThrowMSLException(OptionError,"UnrecognizedGravityType",value);
           image_info->antialias=(MagickBooleanType) antialias;
@@ -7948,7 +7948,7 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
           ssize_t
             gravity;
 
-          gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,value);
+          gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,value);
           if (gravity < 0)
             ThrowMSLException(OptionError,"UnrecognizedGravityType",value);
           (void) SetImageOption(image_info,keyword,value);

diff --git a/coders/tiff.c b/coders/tiff.c
index cf5dbb0bd26bc9b027e3e6a7a9434f0c100743bd..5dbcd1927efaef4270533ac1d5a7770304077981 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2589,7 +2589,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         (TIFFIsCODECConfigured(compress_tag) == 0))
       {
         (void) ThrowMagickException(&image->exception,GetMagickModule(),
-          CoderError,"CompressionNotSupported","`%s'",MagickOptionToMnemonic(
+          CoderError,"CompressionNotSupported","`%s'",CommandOptionToMnemonic(
           MagickCompressOptions,(ssize_t) compression));
         compress_tag=COMPRESSION_NONE;
         compression=NoCompression;
@@ -2621,7 +2621,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
         default:
         {
           (void) ThrowMagickException(&image->exception,GetMagickModule(),
-            CoderError,"CompressionNotSupported","`%s'",MagickOptionToMnemonic(
+            CoderError,"CompressionNotSupported","`%s'",CommandOptionToMnemonic(
               MagickCompressOptions,(ssize_t) compression));
           compress_tag=COMPRESSION_NONE;
           compression=NoCompression;

diff --git a/coders/txt.c b/coders/txt.c
index bc4e03f6fca03571f640c4b81d851f53bae78548..0d0eeeb1cc80f6e1fbf97ab5bfcd359b11a0ad6a 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -441,7 +441,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         colorspace[i]='\0';
         image->matte=MagickTrue;
       }
-    type=ParseMagickOption(MagickColorspaceOptions,MagickFalse,colorspace);
+    type=ParseCommandOption(MagickColorspaceOptions,MagickFalse,colorspace);
     if (type < 0)
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     image->colorspace=(ColorspaceType) type;
@@ -652,7 +652,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
   scene=0;
   do
   {
-    (void) CopyMagickString(colorspace,MagickOptionToMnemonic(
+    (void) CopyMagickString(colorspace,CommandOptionToMnemonic(
       MagickColorspaceOptions,(ssize_t) image->colorspace),MaxTextExtent);
     LocaleLower(colorspace);
     image->depth=GetImageQuantumDepth(image,MagickTrue);

diff --git a/magick/color.c b/magick/color.c
index 5ffee8fdf40c78d53cbbd4694d622cf724dcc5b1..81052a55054b33663a726ccd19b7eaa2609a3b69 100644 (file)
--- a/magick/color.c
+++ b/magick/color.c
@@ -1439,7 +1439,7 @@ MagickExport void GetColorTuple(const MagickPixelPacket *pixel,
       if (status != MagickFalse)
         color.depth=8;
     }
-  (void) ConcatenateMagickString(tuple,MagickOptionToMnemonic(
+  (void) ConcatenateMagickString(tuple,CommandOptionToMnemonic(
     MagickColorspaceOptions,(ssize_t) color.colorspace),MaxTextExtent);
   if (color.matte != MagickFalse)
     (void) ConcatenateMagickString(tuple,"a",MaxTextExtent);
@@ -2662,7 +2662,7 @@ MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name,
           colorspace[i]='\0';
           color->matte=MagickTrue;
         }
-      type=ParseMagickOption(MagickColorspaceOptions,MagickFalse,colorspace);
+      type=ParseCommandOption(MagickColorspaceOptions,MagickFalse,colorspace);
       if (type < 0)
         {
           (void) ThrowMagickException(exception,GetMagickModule(),

diff --git a/magick/constitute.c b/magick/constitute.c
index d5f5b05664b7600e11abcd0a6250df2017d00cf5..433280b96e06cf92a9dead50ff55c7137636c21a 100644 (file)
--- a/magick/constitute.c
+++ b/magick/constitute.c
@@ -792,7 +792,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       }
     option=GetImageOption(image_info,"dispose");
     if (option != (const char *) NULL)
-      next->dispose=(DisposeType) ParseMagickOption(MagickDisposeOptions,
+      next->dispose=(DisposeType) ParseCommandOption(MagickDisposeOptions,
         MagickFalse,option);
     if (read_info->verbose != MagickFalse)
       (void) IdentifyImage(next,stderr,MagickFalse);

diff --git a/magick/display.c b/magick/display.c
index 527d3e5e3ea028c6efda081b005721931c9fd9ff..c968904522c0020b31ce19ccbd4cbe2f6ce41076 100644 (file)
--- a/magick/display.c
+++ b/magick/display.c
@@ -3385,13 +3385,13 @@ static MagickBooleanType XColorEditImage(Display *display,
             /*
               Select a method from the pop-up menu.
             */
-            methods=(char **) GetMagickOptions(MagickMethodOptions);
+            methods=(char **) GetCommandOptions(MagickMethodOptions);
             if (methods == (char **) NULL)
               break;
             entry=XMenuWidget(display,windows,ColorEditMenu[id],
               (const char **) methods,command);
             if (entry >= 0)
-              method=(PaintMethod) ParseMagickOption(MagickMethodOptions,
+              method=(PaintMethod) ParseCommandOption(MagickMethodOptions,
                 MagickFalse,methods[entry]);
             methods=DestroyStringList(methods);
             break;
@@ -4015,13 +4015,13 @@ static MagickBooleanType XCompositeImage(Display *display,
             /*
               Select a command from the pop-up menu.
             */
-            operators=GetMagickOptions(MagickComposeOptions);
+            operators=GetCommandOptions(MagickComposeOptions);
             if (operators == (char **) NULL)
               break;
             entry=XMenuWidget(display,windows,CompositeMenu[id],
               (const char **) operators,command);
             if (entry >= 0)
-              compose=(CompositeOperator) ParseMagickOption(
+              compose=(CompositeOperator) ParseCommandOption(
                 MagickComposeOptions,MagickFalse,operators[entry]);
             operators=DestroyStringList(operators);
             break;
@@ -8102,7 +8102,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       /*
         Add noise to the image.
       */
-      noises=GetMagickOptions(MagickNoiseOptions);
+      noises=GetCommandOptions(MagickNoiseOptions);
       if (noises == (char **) NULL)
         break;
       XListBrowserWidget(display,windows,&windows->widget,
@@ -8113,7 +8113,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
         break;
       XSetCursorState(display,windows,MagickTrue);
       XCheckRefreshWindows(display,windows);
-      noise_image=AddNoiseImage(*image,(NoiseType) ParseMagickOption(
+      noise_image=AddNoiseImage(*image,(NoiseType) ParseCommandOption(
         MagickNoiseOptions,MagickFalse,noise_type),&(*image)->exception);
       if (noise_image != (Image *) NULL)
         {
@@ -8985,7 +8985,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       /*
         Select preview type from menu.
       */
-      previews=GetMagickOptions(MagickPreviewOptions);
+      previews=GetCommandOptions(MagickPreviewOptions);
       if (previews == (char **) NULL)
         break;
       XListBrowserWidget(display,windows,&windows->widget,
@@ -9000,7 +9000,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
       XSetCursorState(display,windows,MagickTrue);
       XCheckRefreshWindows(display,windows);
       image_info->preview_type=(PreviewType)
-        ParseMagickOption(MagickPreviewOptions,MagickFalse,preview_type);
+        ParseCommandOption(MagickPreviewOptions,MagickFalse,preview_type);
       image_info->group=(ssize_t) windows->image.id;
       (void) DeleteImageProperty(*image,"label");
       (void) SetImageProperty(*image,"label","Preview");
@@ -9671,13 +9671,13 @@ static MagickBooleanType XMatteEditImage(Display *display,
             /*
               Select a method from the pop-up menu.
             */
-            methods=GetMagickOptions(MagickMethodOptions);
+            methods=GetCommandOptions(MagickMethodOptions);
             if (methods == (char **) NULL)
               break;
             entry=XMenuWidget(display,windows,MatteEditMenu[id],
               (const char **) methods,command);
             if (entry >= 0)
-              method=(PaintMethod) ParseMagickOption(MagickMethodOptions,
+              method=(PaintMethod) ParseCommandOption(MagickMethodOptions,
                 MagickFalse,methods[entry]);
             methods=DestroyStringList(methods);
             break;
@@ -10606,13 +10606,13 @@ static MagickBooleanType XPasteImage(Display *display,
             /*
               Select a command from the pop-up menu.
             */
-            operators=GetMagickOptions(MagickComposeOptions);
+            operators=GetCommandOptions(MagickComposeOptions);
             if (operators == (char **) NULL)
               break;
             entry=XMenuWidget(display,windows,PasteMenu[id],
               (const char **) operators,command);
             if (entry >= 0)
-              compose=(CompositeOperator) ParseMagickOption(
+              compose=(CompositeOperator) ParseCommandOption(
                 MagickComposeOptions,MagickFalse,operators[entry]);
             operators=DestroyStringList(operators);
             break;

diff --git a/magick/distort.c b/magick/distort.c
index 64e6e94839ed5cd0b883180a652f7729f1667add..3243f03a9a2d07ab877f5cb2dacae957a5421289 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -552,7 +552,7 @@ static double *GenerateCoefficients(const Image *image,
           coeff = (double *) RelinquishMagickMemory(coeff);
           (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument","%s : 'Unsolvable Matrix'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method) );
+              CommandOptionToMnemonic(MagickDistortOptions, *method) );
           return((double *) NULL);
         }
       }
@@ -578,7 +578,7 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument","%s : 'Needs 6 coeff values'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method) );
+              CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       /* FUTURE: trap test for sx*sy-rx*ry == 0 (determinant = 0, no inverse) */
@@ -627,7 +627,7 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument","%s : 'Needs at least 1 argument'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method) );
+              CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       case 1:
         a = arguments[0];
@@ -669,7 +669,7 @@ static double *GenerateCoefficients(const Image *image,
           coeff = (double *) RelinquishMagickMemory(coeff);
           (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument","%s : 'Too Many Arguments (7 or less)'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method) );
+              CommandOptionToMnemonic(MagickDistortOptions, *method) );
           return((double *) NULL);
         }
         break;
@@ -679,7 +679,7 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument","%s : 'Zero Scale Given'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method) );
+              CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       /* Save the given arguments as an affine distortion */
@@ -741,7 +741,7 @@ static double *GenerateCoefficients(const Image *image,
            number_arguments < cp_size*4 ) {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument", "%s : 'require at least %.20g CPs'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method), 4.0);
+              CommandOptionToMnemonic(MagickDistortOptions, *method), 4.0);
         coeff=(double *) RelinquishMagickMemory(coeff);
         return((double *) NULL);
       }
@@ -786,7 +786,7 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
             "InvalidArgument","%s : 'Unsolvable Matrix'",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       /*
@@ -809,7 +809,7 @@ static double *GenerateCoefficients(const Image *image,
       if (number_arguments != 8) {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument", "%s : 'Needs 8 coefficient values'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method));
+              CommandOptionToMnemonic(MagickDistortOptions, *method));
         return((double *) NULL);
       }
       /* FUTURE: trap test  c0*c4-c3*c1 == 0  (determinate = 0, no inverse) */
@@ -857,7 +857,7 @@ static double *GenerateCoefficients(const Image *image,
            number_arguments < cp_size*4 ) {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument", "%s : 'require at least %.20g CPs'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method), 4.0);
+              CommandOptionToMnemonic(MagickDistortOptions, *method), 4.0);
         coeff=(double *) RelinquishMagickMemory(coeff);
         return((double *) NULL);
       }
@@ -894,7 +894,7 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
             "InvalidArgument","%s : 'Unsolvable Matrix'",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       if ( *method == BilinearForwardDistortion ) {
@@ -1037,7 +1037,7 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
             "InvalidArgument","%s : 'Unsolvable Matrix'",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       return(coeff);
@@ -1082,14 +1082,14 @@ static double *GenerateCoefficients(const Image *image,
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
             "InvalidArgument","%s : 'Arc Angle Too Small'",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       if ( number_arguments >= 3 && arguments[2] < MagickEpsilon ) {
         coeff = (double *) RelinquishMagickMemory(coeff);
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
             "InvalidArgument","%s : 'Outer Radius Too Small'",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         return((double *) NULL);
       }
       coeff[0] = -MagickPI2;   /* -90, place at top! */
@@ -1133,7 +1133,7 @@ static double *GenerateCoefficients(const Image *image,
           || number_arguments > 8 ) {
           (void) ThrowMagickException(exception,GetMagickModule(),
             OptionError,"InvalidArgument", "%s : number of arguments",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         coeff=(double *) RelinquishMagickMemory(coeff);
         return((double *) NULL);
       }
@@ -1193,7 +1193,7 @@ static double *GenerateCoefficients(const Image *image,
            || (coeff[0]-coeff[1]) < MagickEpsilon ) {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
             "InvalidArgument", "%s : Invalid Radius",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
         coeff=(double *) RelinquishMagickMemory(coeff);
         return((double *) NULL);
       }
@@ -1239,7 +1239,7 @@ static double *GenerateCoefficients(const Image *image,
           coeff=(double *) RelinquishMagickMemory(coeff);
           (void) ThrowMagickException(exception,GetMagickModule(),
             OptionError,"InvalidArgument", "%s : number of arguments",
-            MagickOptionToMnemonic(MagickDistortOptions, *method) );
+            CommandOptionToMnemonic(MagickDistortOptions, *method) );
           return((double *) NULL);
         }
       /* A,B,C,D coefficients */
@@ -1299,7 +1299,7 @@ static double *GenerateCoefficients(const Image *image,
            number_arguments < cp_size ) {
         (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
               "InvalidArgument", "%s : 'require at least %.20g CPs'",
-              MagickOptionToMnemonic(MagickDistortOptions, *method), 1.0);
+              CommandOptionToMnemonic(MagickDistortOptions, *method), 1.0);
         coeff=(double *) RelinquishMagickMemory(coeff);
         return((double *) NULL);
       }

diff --git a/magick/draw.c b/magick/draw.c
index 5646e34b82f1d3054e8a6cbcdf3497ffbe9a3ad0..8ca0f1f2f4cc14d9f031b5f35468a0ff2c2a5781 100644 (file)
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -1891,7 +1891,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               fill_rule;
 
             GetMagickToken(q,&q,token);
-            fill_rule=ParseMagickOption(MagickFillRuleOptions,MagickFalse,
+            fill_rule=ParseCommandOption(MagickFillRuleOptions,MagickFalse,
               token);
             if (fill_rule == -1)
               {
@@ -1907,7 +1907,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               clip_units;
 
             GetMagickToken(q,&q,token);
-            clip_units=ParseMagickOption(MagickClipPathOptions,MagickFalse,
+            clip_units=ParseCommandOption(MagickClipPathOptions,MagickFalse,
               token);
             if (clip_units == -1)
               {
@@ -1948,7 +1948,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               decorate;
 
             GetMagickToken(q,&q,token);
-            decorate=ParseMagickOption(MagickDecorateOptions,MagickFalse,
+            decorate=ParseCommandOption(MagickDecorateOptions,MagickFalse,
               token);
             if (decorate == -1)
               {
@@ -2022,7 +2022,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               fill_rule;
 
             GetMagickToken(q,&q,token);
-            fill_rule=ParseMagickOption(MagickFillRuleOptions,MagickFalse,
+            fill_rule=ParseCommandOption(MagickFillRuleOptions,MagickFalse,
               token);
             if (fill_rule == -1)
               {
@@ -2059,7 +2059,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               stretch;
 
             GetMagickToken(q,&q,token);
-            stretch=ParseMagickOption(MagickStretchOptions,MagickFalse,token);
+            stretch=ParseCommandOption(MagickStretchOptions,MagickFalse,token);
             if (stretch == -1)
               {
                 status=MagickFalse;
@@ -2074,7 +2074,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               style;
 
             GetMagickToken(q,&q,token);
-            style=ParseMagickOption(MagickStyleOptions,MagickFalse,token);
+            style=ParseCommandOption(MagickStyleOptions,MagickFalse,token);
             if (style == -1)
               {
                 status=MagickFalse;
@@ -2118,7 +2118,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               gravity;
 
             GetMagickToken(q,&q,token);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,token);
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,token);
             if (gravity == -1)
               {
                 status=MagickFalse;
@@ -2140,7 +2140,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
 
             primitive_type=ImagePrimitive;
             GetMagickToken(q,&q,token);
-            compose=ParseMagickOption(MagickComposeOptions,MagickFalse,token);
+            compose=ParseCommandOption(MagickComposeOptions,MagickFalse,token);
             if (compose == -1)
               {
                 status=MagickFalse;
@@ -2594,7 +2594,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               linecap;
 
             GetMagickToken(q,&q,token);
-            linecap=ParseMagickOption(MagickLineCapOptions,MagickFalse,token);
+            linecap=ParseCommandOption(MagickLineCapOptions,MagickFalse,token);
             if (linecap == -1)
               {
                 status=MagickFalse;
@@ -2609,7 +2609,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               linejoin;
 
             GetMagickToken(q,&q,token);
-            linejoin=ParseMagickOption(MagickLineJoinOptions,MagickFalse,token);
+            linejoin=ParseCommandOption(MagickLineJoinOptions,MagickFalse,token);
             if (linejoin == -1)
               {
                 status=MagickFalse;
@@ -2655,7 +2655,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               align;
 
             GetMagickToken(q,&q,token);
-            align=ParseMagickOption(MagickAlignOptions,MagickFalse,token);
+            align=ParseCommandOption(MagickAlignOptions,MagickFalse,token);
             if (align == -1)
               {
                 status=MagickFalse;
@@ -2670,7 +2670,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
               align;
 
             GetMagickToken(q,&q,token);
-            align=ParseMagickOption(MagickAlignOptions,MagickFalse,token);
+            align=ParseCommandOption(MagickAlignOptions,MagickFalse,token);
             if (align == -1)
               {
                 status=MagickFalse;
@@ -3031,7 +3031,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info)
             break;
           }
         GetMagickToken(q,&q,token);
-        method=ParseMagickOption(MagickMethodOptions,MagickFalse,token);
+        method=ParseCommandOption(MagickMethodOptions,MagickFalse,token);
         if (method == -1)
           {
             status=MagickFalse;
@@ -4768,7 +4768,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
     draw_info->interword_spacing=StringToDouble(option);
   option=GetImageOption(clone_info,"direction");
   if (option != (const char *) NULL)
-    draw_info->direction=(DirectionType) ParseMagickOption(
+    draw_info->direction=(DirectionType) ParseCommandOption(
       MagickDirectionOptions,MagickFalse,option);
   option=GetImageOption(clone_info,"fill");
   if (option != (const char *) NULL)
@@ -4784,7 +4784,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
     (void) QueryColorDatabase(option,&draw_info->undercolor,exception);
   option=GetImageOption(clone_info,"gravity");
   if (option != (const char *) NULL)
-    draw_info->gravity=(GravityType) ParseMagickOption(MagickGravityOptions,
+    draw_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
       MagickFalse,option);
   exception=DestroyExceptionInfo(exception);
   draw_info->signature=MagickSignature;

diff --git a/magick/enhance.c b/magick/enhance.c
index 326e321e72bfa3ae249edfe977e49c8db9f89162..e9961659024e332b269007a465a98535743fd88b 100644 (file)
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -3181,7 +3181,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
   colorspace=UndefinedColorspace;
   artifact=GetImageArtifact(image,"modulate:colorspace");
   if (artifact != (const char *) NULL)
-    colorspace=(ColorspaceType) ParseMagickOption(MagickColorspaceOptions,
+    colorspace=(ColorspaceType) ParseCommandOption(MagickColorspaceOptions,
       MagickFalse,artifact);
   if (image->storage_class == PseudoClass)
     {

diff --git a/magick/identify.c b/magick/identify.c
index c807b4195de71d26d156a609d081608b38571b65..ecd49438839a26ba8714061d801d3c8266109cdf 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -337,7 +337,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           (double) image->page.y);
       (void) fprintf(file,"%.20g-bit ",(double) image->depth);
       if (image->type != UndefinedType)
-        (void) fprintf(file,"%s ",MagickOptionToMnemonic(MagickTypeOptions,
+        (void) fprintf(file,"%s ",CommandOptionToMnemonic(MagickTypeOptions,
           (ssize_t) image->type));
       if (image->storage_class == DirectClass)
         {
@@ -397,7 +397,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   else
     (void) fprintf(file,"  Format: %s (%s)\n",image->magick,
       GetMagickDescription(magick_info));
-  (void) fprintf(file,"  Class: %s\n",MagickOptionToMnemonic(MagickClassOptions,
+  (void) fprintf(file,"  Class: %s\n",CommandOptionToMnemonic(MagickClassOptions,
     (ssize_t) image->storage_class));
   (void) fprintf(file,"  Geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
     image->columns,(double) image->rows,(double) image->tile_offset.x,(double)
@@ -414,19 +414,19 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
       (void) fprintf(file,"  Print size: %gx%g\n",(double) image->columns/
         image->x_resolution,(double) image->rows/image->y_resolution);
     }
-  (void) fprintf(file,"  Units: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Units: %s\n",CommandOptionToMnemonic(
     MagickResolutionOptions,(ssize_t) image->units));
-  (void) fprintf(file,"  Type: %s\n",MagickOptionToMnemonic(MagickTypeOptions,
+  (void) fprintf(file,"  Type: %s\n",CommandOptionToMnemonic(MagickTypeOptions,
     (ssize_t) type));
   if (image->type != UndefinedType)
-    (void) fprintf(file,"  Base type: %s\n",MagickOptionToMnemonic(
+    (void) fprintf(file,"  Base type: %s\n",CommandOptionToMnemonic(
       MagickTypeOptions,(ssize_t) image->type));
-  (void) fprintf(file,"  Endianess: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Endianess: %s\n",CommandOptionToMnemonic(
     MagickEndianOptions,(ssize_t) image->endian));
   /*
     Detail channel depth and extrema.
   */
-  (void) fprintf(file,"  Colorspace: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Colorspace: %s\n",CommandOptionToMnemonic(
     MagickColorspaceOptions,(ssize_t) image->colorspace));
   channel_statistics=(ChannelStatistics *) NULL;
   channel_features=(ChannelFeatures *) NULL;
@@ -692,7 +692,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if (image->error.normalized_maximum_error != 0.0)
     (void) fprintf(file,"  Normalized maximum error: %g\n",
       image->error.normalized_maximum_error);
-  (void) fprintf(file,"  Rendering intent: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Rendering intent: %s\n",CommandOptionToMnemonic(
     MagickIntentOptions,(ssize_t) image->rendering_intent));
   if (image->gamma != 0.0)
     (void) fprintf(file,"  Gamma: %g\n",image->gamma);
@@ -719,7 +719,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     (void) fprintf(file,"  Tile geometry: %.20gx%.20g%+.20g%+.20g\n",(double)
       image->extract_info.width,(double) image->extract_info.height,(double)
       image->extract_info.x,(double) image->extract_info.y);
-  (void) fprintf(file,"  Interlace: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Interlace: %s\n",CommandOptionToMnemonic(
     MagickInterlaceOptions,(ssize_t) image->interlace));
   (void) QueryColorname(image,&image->background_color,SVGCompliance,color,
     &image->exception);
@@ -733,7 +733,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   (void) QueryColorname(image,&image->transparent_color,SVGCompliance,color,
     &image->exception);
   (void) fprintf(file,"  Transparent color: %s\n",color);
-  (void) fprintf(file,"  Compose: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Compose: %s\n",CommandOptionToMnemonic(
     MagickComposeOptions,(ssize_t) image->compose));
   if ((image->page.width != 0) || (image->page.height != 0) ||
       (image->page.x != 0) || (image->page.y != 0))
@@ -743,7 +743,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if ((image->page.x != 0) || (image->page.y != 0))
     (void) fprintf(file,"  Origin geometry: %+.20g%+.20g\n",(double)
       image->page.x,(double) image->page.y);
-  (void) fprintf(file,"  Dispose: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Dispose: %s\n",CommandOptionToMnemonic(
     MagickDisposeOptions,(ssize_t) image->dispose));
   if (image->delay != 0)
     (void) fprintf(file,"  Delay: %.20gx%.20g\n",(double) image->delay,
@@ -756,11 +756,11 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   else
     if (image->scene != 0)
       (void) fprintf(file,"  Scene: %.20g\n",(double) image->scene);
-  (void) fprintf(file,"  Compression: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Compression: %s\n",CommandOptionToMnemonic(
     MagickCompressOptions,(ssize_t) image->compression));
   if (image->quality != UndefinedCompressionQuality)
     (void) fprintf(file,"  Quality: %.20g\n",(double) image->quality);
-  (void) fprintf(file,"  Orientation: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Orientation: %s\n",CommandOptionToMnemonic(
     MagickOrientationOptions,(ssize_t) image->orientation));
   if (image->montage != (char *) NULL)
     (void) fprintf(file,"  Montage: %s\n",image->montage);
@@ -1060,7 +1060,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
         registry=GetNextImageRegistry();
       }
     }
-  (void) fprintf(file,"  Tainted: %s\n",MagickOptionToMnemonic(
+  (void) fprintf(file,"  Tainted: %s\n",CommandOptionToMnemonic(
     MagickBooleanOptions,(ssize_t) image->taint));
   (void) FormatMagickSize(GetBlobSize(image),MagickFalse,format);
   (void) fprintf(file,"  Filesize: %sB\n",format);

diff --git a/magick/image.c b/magick/image.c
index dabfc11b36637bc06fab5a51d5fa68a215723542..c84f24d1414debc60cb57759c1040c1c55bff016 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -288,7 +288,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info)
     }
   option=GetImageOption(image_info,"dispose");
   if (option != (const char *) NULL)
-    image->dispose=(DisposeType) ParseMagickOption(MagickDisposeOptions,
+    image->dispose=(DisposeType) ParseCommandOption(MagickDisposeOptions,
       MagickFalse,option);
   return(image);
 }
@@ -4336,7 +4336,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     image->bias=SiPrefixToDouble(option,QuantumRange);
   option=GetImageOption(image_info,"black-point-compensation");
   if (option != (const char *) NULL)
-    image->black_point_compensation=(MagickBooleanType) ParseMagickOption(
+    image->black_point_compensation=(MagickBooleanType) ParseCommandOption(
       MagickBooleanOptions,MagickFalse,option);
   option=GetImageOption(image_info,"blue-primary");
   if (option != (const char *) NULL)
@@ -4355,15 +4355,15 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     image->colors=StringToUnsignedLong(option);
   option=GetImageOption(image_info,"compose");
   if (option != (const char *) NULL)
-    image->compose=(CompositeOperator) ParseMagickOption(MagickComposeOptions,
+    image->compose=(CompositeOperator) ParseCommandOption(MagickComposeOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"compress");
   if (option != (const char *) NULL)
-    image->compression=(CompressionType) ParseMagickOption(
+    image->compression=(CompressionType) ParseCommandOption(
       MagickCompressOptions,MagickFalse,option);
   option=GetImageOption(image_info,"debug");
   if (option != (const char *) NULL)
-    image->debug=(MagickBooleanType) ParseMagickOption(MagickBooleanOptions,
+    image->debug=(MagickBooleanType) ParseCommandOption(MagickBooleanOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"density");
   if (option != (const char *) NULL)
@@ -4385,18 +4385,18 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     image->depth=StringToUnsignedLong(option);
   option=GetImageOption(image_info,"endian");
   if (option != (const char *) NULL)
-    image->endian=(EndianType) ParseMagickOption(MagickEndianOptions,
+    image->endian=(EndianType) ParseCommandOption(MagickEndianOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"filter");
   if (option != (const char *) NULL)
-    image->filter=(FilterTypes) ParseMagickOption(MagickFilterOptions,
+    image->filter=(FilterTypes) ParseCommandOption(MagickFilterOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"fuzz");
   if (option != (const char *) NULL)
     image->fuzz=SiPrefixToDouble(option,QuantumRange);
   option=GetImageOption(image_info,"gravity");
   if (option != (const char *) NULL)
-    image->gravity=(GravityType) ParseMagickOption(MagickGravityOptions,
+    image->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"green-primary");
   if (option != (const char *) NULL)
@@ -4409,15 +4409,15 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     }
   option=GetImageOption(image_info,"intent");
   if (option != (const char *) NULL)
-    image->rendering_intent=(RenderingIntent) ParseMagickOption(
+    image->rendering_intent=(RenderingIntent) ParseCommandOption(
       MagickIntentOptions,MagickFalse,option);
   option=GetImageOption(image_info,"interlace");
   if (option != (const char *) NULL)
-    image->interlace=(InterlaceType) ParseMagickOption(MagickInterlaceOptions,
+    image->interlace=(InterlaceType) ParseCommandOption(MagickInterlaceOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"interpolate");
   if (option != (const char *) NULL)
-    image->interpolate=(InterpolatePixelMethod) ParseMagickOption(
+    image->interpolate=(InterpolatePixelMethod) ParseCommandOption(
       MagickInterpolateOptions,MagickFalse,option);
   option=GetImageOption(image_info,"loop");
   if (option != (const char *) NULL)
@@ -4427,7 +4427,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     (void) QueryColorDatabase(option,&image->matte_color,&image->exception);
   option=GetImageOption(image_info,"orient");
   if (option != (const char *) NULL)
-    image->orientation=(OrientationType) ParseMagickOption(
+    image->orientation=(OrientationType) ParseCommandOption(
       MagickOrientationOptions,MagickFalse,option);
   option=GetImageOption(image_info,"page");
   if (option != (const char *) NULL)
@@ -4458,7 +4458,7 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     image->scene=StringToUnsignedLong(option);
   option=GetImageOption(image_info,"taint");
   if (option != (const char *) NULL)
-    image->taint=(MagickBooleanType) ParseMagickOption(MagickBooleanOptions,
+    image->taint=(MagickBooleanType) ParseCommandOption(MagickBooleanOptions,
       MagickFalse,option);
   option=GetImageOption(image_info,"tile-offset");
   if (option != (const char *) NULL)
@@ -4476,11 +4476,11 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
       &image->exception);
   option=GetImageOption(image_info,"type");
   if (option != (const char *) NULL)
-    image->type=(ImageType) ParseMagickOption(MagickTypeOptions,MagickFalse,
+    image->type=(ImageType) ParseCommandOption(MagickTypeOptions,MagickFalse,
       option);
   option=GetImageOption(image_info,"units");
   if (option != (const char *) NULL)
-    units=(ResolutionType) ParseMagickOption(MagickResolutionOptions,
+    units=(ResolutionType) ParseCommandOption(MagickResolutionOptions,
       MagickFalse,option);
   else
     units = image_info->units;

diff --git a/magick/layer.c b/magick/layer.c
index d343fa4e6aeac4bea6e44eb2a04b8096c13eb1f9..10b8e1110aa3620305d434a17081a5e42a95ddfc 100644 (file)
--- a/magick/layer.c
+++ b/magick/layer.c
@@ -1352,14 +1352,14 @@ static Image *OptimizeLayerFrames(const Image *image,
 #if DEBUG_OPT_FRAME
     fprintf(stderr, "final   %.20g : %s  %.20gx%.20g%+.20g%+.20g\n",
          (double) i-1,
-         MagickOptionToMnemonic(MagickDisposeOptions, disposals[i-1]),
+         CommandOptionToMnemonic(MagickDisposeOptions, disposals[i-1]),
          (double) bounds[i-1].width, (double) bounds[i-1].height,
          (double) bounds[i-1].x, (double) bounds[i-1].y );
 #endif
 #if DEBUG_OPT_FRAME
     fprintf(stderr, "interum %.20g : %s  %.20gx%.20g%+.20g%+.20g\n",
          (double) i,
-         MagickOptionToMnemonic(MagickDisposeOptions, disposals[i]),
+         CommandOptionToMnemonic(MagickDisposeOptions, disposals[i]),
          (double) bounds[i].width, (double) bounds[i].height,
          (double) bounds[i].x, (double) bounds[i].y );
     fprintf(stderr, "\n");

diff --git a/magick/log.c b/magick/log.c
index 5973b0fad3cd379650ac6e81fae52804edd16a66..97168cd9bc9e51e8a1940d3d7bf403e8b16e264c 100644 (file)
--- a/magick/log.c
+++ b/magick/log.c
@@ -1135,7 +1135,7 @@ MagickBooleanType LogMagickEventList(const LogEventType type,const char *module,
       UnlockSemaphoreInfo(log_semaphore);
       return(MagickTrue);
     }
-  domain=MagickOptionToMnemonic(MagickLogEventOptions,type);
+  domain=CommandOptionToMnemonic(MagickLogEventOptions,type);
 #if defined(MAGICKCORE_HAVE_VSNPRINTF)
   n=vsnprintf(event,MaxTextExtent,format,operands);
 #else
@@ -1413,7 +1413,7 @@ static MagickBooleanType LoadLogList(const char *xml,const char *filename,
         if (LocaleCompare((char *) keyword,"events") == 0)
           {
             log_info->event_mask=(LogEventType) (log_info->event_mask |
-              ParseMagickOption(MagickLogEventOptions,MagickTrue,token));
+              ParseCommandOption(MagickLogEventOptions,MagickTrue,token));
             break;
           }
         break;
@@ -1686,7 +1686,7 @@ MagickExport LogEventType SetLogEventMask(const char *events)
   exception=AcquireExceptionInfo();
   log_info=(LogInfo *) GetLogInfo("*",exception);
   exception=DestroyExceptionInfo(exception);
-  option=ParseMagickOption(MagickLogEventOptions,MagickTrue,events);
+  option=ParseCommandOption(MagickLogEventOptions,MagickTrue,events);
   LockSemaphoreInfo(log_semaphore);
   log_info=(LogInfo *) GetValueFromLinkedList(log_list,0);
   log_info->event_mask=(LogEventType) option;

diff --git a/magick/methods.h b/magick/methods.h
index 784c4bf5d857ace37246d55c02f050a880f3151f..65a2b71c59b15a71f2afc861ae899da887867e62 100644 (file)
--- a/magick/methods.h
+++ b/magick/methods.h
@@ -493,7 +493,7 @@ extern "C" {
 #define GetMagickInfo  PrependMagickMethod(GetMagickInfo)
 #define GetMagickList  PrependMagickMethod(GetMagickList)
 #define GetMagickMemoryMethods  PrependMagickMethod(GetMagickMemoryMethods)
-#define GetMagickOptions  PrependMagickMethod(GetMagickOptions)
+#define GetCommandOptions  PrependMagickMethod(GetCommandOptions)
 #define GetMagickPackageName  PrependMagickMethod(GetMagickPackageName)
 #define GetMagickPageSize  PrependMagickMethod(GetMagickPageSize)
 #define GetMagickPixelPacket  PrependMagickMethod(GetMagickPixelPacket)
@@ -667,7 +667,7 @@ extern "C" {
 #define IsMagickColorSimilar  PrependMagickMethod(IsMagickColorSimilar)
 #define IsMagickConflict  PrependMagickMethod(IsMagickConflict)
 #define IsMagickInstantiated  PrependMagickMethod(IsMagickInstantiated)
-#define IsMagickOption  PrependMagickMethod(IsMagickOption)
+#define IsCommandOption  PrependMagickMethod(IsCommandOption)
 #define IsMagickTrue  PrependMagickMethod(IsMagickTrue)
 #define IsMonochromeImage  PrependMagickMethod(IsMonochromeImage)
 #define IsOpacitySimilar  PrependMagickMethod(IsOpacitySimilar)
@@ -703,7 +703,7 @@ extern "C" {
 #define ListLogInfo  PrependMagickMethod(ListLogInfo)
 #define ListMagicInfo  PrependMagickMethod(ListMagicInfo)
 #define ListMagickInfo  PrependMagickMethod(ListMagickInfo)
-#define ListMagickOptions  PrependMagickMethod(ListMagickOptions)
+#define ListCommandOptions  PrependMagickMethod(ListCommandOptions)
 #define ListMagickResourceInfo  PrependMagickMethod(ListMagickResourceInfo)
 #define ListMimeInfo  PrependMagickMethod(ListMimeInfo)
 #define ListModuleInfo  PrependMagickMethod(ListModuleInfo)
@@ -738,7 +738,7 @@ extern "C" {
 #define MagickGetThreadValue  PrependMagickMethod(MagickGetThreadValue)
 #define MagickIncarnate  PrependMagickMethod(MagickIncarnate)
 #define MagickMonitor  PrependMagickMethod(MagickMonitor)
-#define MagickOptionToMnemonic  PrependMagickMethod(MagickOptionToMnemonic)
+#define CommandOptionToMnemonic  PrependMagickMethod(CommandOptionToMnemonic)
 #define MagickSetThreadValue  PrependMagickMethod(MagickSetThreadValue)
 #define MagickToMime  PrependMagickMethod(MagickToMime)
 #define MagickWarning  PrependMagickMethod(MagickWarning)
@@ -802,7 +802,7 @@ extern "C" {
 #define ParseGeometry  PrependMagickMethod(ParseGeometry)
 #define ParseGravityGeometry  PrependMagickMethod(ParseGravityGeometry)
 #define ParseImageGeometry  PrependMagickMethod(ParseImageGeometry)
-#define ParseMagickOption  PrependMagickMethod(ParseMagickOption)
+#define ParseCommandOption  PrependMagickMethod(ParseCommandOption)
 #define ParseMetaGeometry  PrependMagickMethod(ParseMetaGeometry)
 #define ParsePageGeometry  PrependMagickMethod(ParsePageGeometry)
 #define ParseRegionGeometry  PrependMagickMethod(ParseRegionGeometry)

diff --git a/magick/mime.c b/magick/mime.c
index 41a65dd7178ea184538e0d0c4ee920f35578fa14..b5d6dae04b8bc0bd826146e5cee941cb11ead630 100644 (file)
--- a/magick/mime.c
+++ b/magick/mime.c
@@ -822,14 +822,14 @@ static MagickBooleanType LoadMimeList(const char *xml,const char *filename,
     mime_info->signature=MagickSignature;
     attribute=GetXMLTreeAttribute(mime,"data-type");
     if (attribute != (const char *) NULL)
-      mime_info->data_type=(DataType) ParseMagickOption(MagickDataTypeOptions,
+      mime_info->data_type=(DataType) ParseCommandOption(MagickDataTypeOptions,
         MagickTrue,attribute);
     attribute=GetXMLTreeAttribute(mime,"description");
     if (attribute != (const char *) NULL)
       mime_info->description=ConstantString(attribute);
     attribute=GetXMLTreeAttribute(mime,"endian");
     if (attribute != (const char *) NULL)
-      mime_info->endian=(EndianType) ParseMagickOption(MagickEndianOptions,
+      mime_info->endian=(EndianType) ParseCommandOption(MagickEndianOptions,
         MagickTrue,attribute);
     attribute=GetXMLTreeAttribute(mime,"magic");
     if (attribute != (const char *) NULL)

diff --git a/magick/morphology.c b/magick/morphology.c
index d4b8b9d15a4f11f231db0e73edf6b5a91a0daf15..6ec58618ee14039b0fbc0ba0e7171677bd4c3853 100644 (file)
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -394,7 +394,7 @@ static KernelInfo *ParseKernelName(const char *kernel_string)
 
   /* Parse special 'named' kernel */
   GetMagickToken(kernel_string,&p,token);
-  type=ParseMagickOption(MagickKernelOptions,MagickFalse,token);
+  type=ParseCommandOption(MagickKernelOptions,MagickFalse,token);
   if ( type < 0 || type == UserDefinedKernel )
     return((KernelInfo *)NULL);  /* not a valid named kernel */
 
@@ -3844,7 +3844,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
 
       if ( verbose == MagickTrue )
         (void) fprintf(stderr, "%s:%.20g.%.20g #%.20g => Changed %.20g\n",
-            MagickOptionToMnemonic(MagickMorphologyOptions, method),
+            CommandOptionToMnemonic(MagickMorphologyOptions, method),
             1.0,0.0,1.0, (double) changed);
 
       if ( changed < 0 )
@@ -3990,11 +3990,11 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
         if ( verbose == MagickTrue ) {
           if ( stage_limit > 1 )
             (void) FormatMagickString(v_info,MaxTextExtent,"%s:%.20g.%.20g -> ",
-             MagickOptionToMnemonic(MagickMorphologyOptions,method),(double)
+             CommandOptionToMnemonic(MagickMorphologyOptions,method),(double)
              method_loop,(double) stage_loop);
           else if ( primitive != method )
             (void) FormatMagickString(v_info, MaxTextExtent, "%s:%.20g -> ",
-              MagickOptionToMnemonic(MagickMorphologyOptions, method),(double)
+              CommandOptionToMnemonic(MagickMorphologyOptions, method),(double)
               method_loop);
           else
             v_info[0] = '\0';
@@ -4030,7 +4030,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
             if ( kernel_loop > 1 )
               fprintf(stderr, "\n"); /* add end-of-line from previous */
             (void) fprintf(stderr, "%s%s%s:%.20g.%.20g #%.20g => Changed %.20g",
-              v_info,MagickOptionToMnemonic(MagickMorphologyOptions,
+              v_info,CommandOptionToMnemonic(MagickMorphologyOptions,
               primitive),(this_kernel == rflt_kernel ) ? "*" : "",
               (double) (method_loop+kernel_loop-1),(double) kernel_number,
               (double) count,(double) changed);
@@ -4079,7 +4079,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
         case BottomHatMorphology:
           if ( verbose == MagickTrue )
             fprintf(stderr, "\n%s: Difference with original image",
-                 MagickOptionToMnemonic(MagickMorphologyOptions, method) );
+                 CommandOptionToMnemonic(MagickMorphologyOptions, method) );
           (void) CompositeImageChannel(curr_image,
                   (ChannelType) (channel & ~SyncChannels),
                   DifferenceCompositeOp, image, 0, 0);
@@ -4087,7 +4087,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
         case EdgeMorphology:
           if ( verbose == MagickTrue )
             fprintf(stderr, "\n%s: Difference of Dilate and Erode",
-                 MagickOptionToMnemonic(MagickMorphologyOptions, method) );
+                 CommandOptionToMnemonic(MagickMorphologyOptions, method) );
           (void) CompositeImageChannel(curr_image,
                   (ChannelType) (channel & ~SyncChannels),
                   DifferenceCompositeOp, save_image, 0, 0);
@@ -4125,7 +4125,7 @@ MagickExport Image *MorphologyApply(const Image *image, const ChannelType
           */
           if ( verbose == MagickTrue )
             fprintf(stderr, " (compose \"%s\")",
-                 MagickOptionToMnemonic(MagickComposeOptions, rslt_compose) );
+                 CommandOptionToMnemonic(MagickComposeOptions, rslt_compose) );
           (void) CompositeImageChannel(rslt_image,
                (ChannelType) (channel & ~SyncChannels), rslt_compose,
                curr_image, 0, 0);
@@ -4271,7 +4271,7 @@ MagickExport Image *MorphologyImageChannel(const Image *image,
     artifact = GetImageArtifact(image,"morphology:compose");
     compose = UndefinedCompositeOp;  /* use default for method */
     if ( artifact != (const char *) NULL)
-      compose = (CompositeOperator) ParseMagickOption(
+      compose = (CompositeOperator) ParseCommandOption(
                              MagickComposeOptions,MagickFalse,artifact);
   }
   /* Apply the Morphology */
@@ -4731,7 +4731,7 @@ MagickExport void ShowKernelInfo(KernelInfo *kernel)
     if ( kernel->next != (KernelInfo *) NULL )
       fprintf(stderr, " #%lu", (unsigned long) c );
     fprintf(stderr, " \"%s",
-          MagickOptionToMnemonic(MagickKernelOptions, k->type) );
+          CommandOptionToMnemonic(MagickKernelOptions, k->type) );
     if ( fabs(k->angle) > MagickEpsilon )
       fprintf(stderr, "@%lg", k->angle);
     fprintf(stderr, "\" of size %lux%lu%+ld%+ld",(unsigned long) k->width,

diff --git a/magick/option.c b/magick/option.c
index c111ffa1bd38aa39edf96fd0fb959bf11433dfc4..85ae86304ce759ae54416ec1450e5d145ed2f455 100644 (file)
--- a/magick/option.c
+++ b/magick/option.c
@@ -81,1490 +81,1449 @@
 static const OptionInfo
   AlignOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedAlign, MagickTrue },
-    { "Center", (ssize_t) CenterAlign, MagickFalse },
-    { "End", (ssize_t) RightAlign, MagickFalse },
-    { "Left", (ssize_t) LeftAlign, MagickFalse },
-    { "Middle", (ssize_t) CenterAlign, MagickFalse },
-    { "Right", (ssize_t) RightAlign, MagickFalse },
-    { "Start", (ssize_t) LeftAlign, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedAlign, MagickFalse }
+    { "Undefined", UndefinedAlign, UndefinedOptionFlag, MagickTrue },
+    { "Center", CenterAlign, UndefinedOptionFlag, MagickFalse },
+    { "End", RightAlign, UndefinedOptionFlag, MagickFalse },
+    { "Left", LeftAlign, UndefinedOptionFlag, MagickFalse },
+    { "Middle", CenterAlign, UndefinedOptionFlag, MagickFalse },
+    { "Right", RightAlign, UndefinedOptionFlag, MagickFalse },
+    { "Start", LeftAlign, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedAlign, UndefinedOptionFlag, MagickFalse }
   },
   AlphaOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedAlphaChannel, MagickTrue },
-    { "Activate", (ssize_t) ActivateAlphaChannel, MagickFalse },
-    { "Background", (ssize_t) BackgroundAlphaChannel, MagickFalse },
-    { "Copy", (ssize_t) CopyAlphaChannel, MagickFalse },
-    { "Deactivate", (ssize_t) DeactivateAlphaChannel, MagickFalse },
-    { "Extract", (ssize_t) ExtractAlphaChannel, MagickFalse },
-    { "Off", (ssize_t) DeactivateAlphaChannel, MagickFalse },
-    { "On", (ssize_t) ActivateAlphaChannel, MagickFalse },
-    { "Opaque", (ssize_t) OpaqueAlphaChannel, MagickFalse },
-    { "Set", (ssize_t) SetAlphaChannel, MagickFalse },
-    { "Shape", (ssize_t) ShapeAlphaChannel, MagickFalse },
-    { "Reset", (ssize_t) SetAlphaChannel, MagickTrue },  /* deprecated */
-    { "Transparent", (ssize_t) TransparentAlphaChannel, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedAlphaChannel, MagickFalse }
+    { "Undefined", UndefinedAlphaChannel, UndefinedOptionFlag, MagickTrue },
+    { "Activate", ActivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Background", BackgroundAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Copy", CopyAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Deactivate", DeactivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Extract", ExtractAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Off", DeactivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "On", ActivateAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Opaque", OpaqueAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Set", SetAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Shape", ShapeAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Reset", SetAlphaChannel, UndefinedOptionFlag, MagickTrue },  /* deprecated */
+    { "Transparent", TransparentAlphaChannel, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedAlphaChannel, UndefinedOptionFlag, MagickFalse }
   },
   BooleanOptions[] =
   {
-    { "False", 0L, MagickFalse },
-    { "True", 1L, MagickFalse },
-    { "0", 0L, MagickFalse },
-    { "1", 1L, MagickFalse },
-    { (char *) NULL, 0L, MagickFalse }
+    { "False", 0L, UndefinedOptionFlag, MagickFalse },
+    { "True", 1L, UndefinedOptionFlag, MagickFalse },
+    { "0", 0L, UndefinedOptionFlag, MagickFalse },
+    { "1", 1L, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, 0L, UndefinedOptionFlag, MagickFalse }
   },
   ChannelOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedChannel, MagickTrue },
-    { "All", (ssize_t) AllChannels, MagickFalse },
-    { "Alpha", (ssize_t) OpacityChannel, MagickFalse },
-    { "Black", (ssize_t) BlackChannel, MagickFalse },
-    { "Blue", (ssize_t) BlueChannel, MagickFalse },
-    { "Cyan", (ssize_t) CyanChannel, MagickFalse },
-    { "Default", (ssize_t) DefaultChannels, MagickFalse },
-    { "Gray", (ssize_t) GrayChannel, MagickFalse },
-    { "Green", (ssize_t) GreenChannel, MagickFalse },
-    { "Hue", (ssize_t) RedChannel, MagickFalse },
-    { "Index", (ssize_t) IndexChannel, MagickFalse },
-    { "Lightness", (ssize_t) BlueChannel, MagickFalse },
-    { "Luminance", (ssize_t) BlueChannel, MagickFalse },
-    { "Luminosity", (ssize_t) BlueChannel, MagickTrue },  /* deprecated */
-    { "Magenta", (ssize_t) MagentaChannel, MagickFalse },
-    { "Matte", (ssize_t) OpacityChannel, MagickFalse },
-    { "Opacity", (ssize_t) OpacityChannel, MagickFalse },
-    { "Red", (ssize_t) RedChannel, MagickFalse },
-    { "Saturation", (ssize_t) GreenChannel, MagickFalse },
-    { "Yellow", (ssize_t) YellowChannel, MagickFalse },
-    { "Sync", (ssize_t) SyncChannels, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedChannel, MagickFalse }
+    { "Undefined", UndefinedChannel, UndefinedOptionFlag, MagickTrue },
+    { "All", AllChannels, UndefinedOptionFlag, MagickFalse },
+    { "Alpha", OpacityChannel, UndefinedOptionFlag, MagickFalse },
+    { "Black", BlackChannel, UndefinedOptionFlag, MagickFalse },
+    { "Blue", BlueChannel, UndefinedOptionFlag, MagickFalse },
+    { "Cyan", CyanChannel, UndefinedOptionFlag, MagickFalse },
+    { "Default", DefaultChannels, UndefinedOptionFlag, MagickFalse },
+    { "Gray", GrayChannel, UndefinedOptionFlag, MagickFalse },
+    { "Green", GreenChannel, UndefinedOptionFlag, MagickFalse },
+    { "Hue", RedChannel, UndefinedOptionFlag, MagickFalse },
+    { "Index", IndexChannel, UndefinedOptionFlag, MagickFalse },
+    { "Lightness", BlueChannel, UndefinedOptionFlag, MagickFalse },
+    { "Luminance", BlueChannel, UndefinedOptionFlag, MagickFalse },
+    { "Luminosity", BlueChannel, UndefinedOptionFlag, MagickTrue },  /* deprecated */
+    { "Magenta", MagentaChannel, UndefinedOptionFlag, MagickFalse },
+    { "Matte", OpacityChannel, UndefinedOptionFlag, MagickFalse },
+    { "Opacity", OpacityChannel, UndefinedOptionFlag, MagickFalse },
+    { "Red", RedChannel, UndefinedOptionFlag, MagickFalse },
+    { "Saturation", GreenChannel, UndefinedOptionFlag, MagickFalse },
+    { "Yellow", YellowChannel, UndefinedOptionFlag, MagickFalse },
+    { "Sync", SyncChannels, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedChannel, UndefinedOptionFlag, MagickFalse }
   },
   ClassOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedClass, MagickTrue },
-    { "DirectClass", (ssize_t) DirectClass, MagickFalse },
-    { "PseudoClass", (ssize_t) PseudoClass, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedClass, MagickFalse }
+    { "Undefined", UndefinedClass, UndefinedOptionFlag, MagickTrue },
+    { "DirectClass", DirectClass, UndefinedOptionFlag, MagickFalse },
+    { "PseudoClass", PseudoClass, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedClass, UndefinedOptionFlag, MagickFalse }
   },
   ClipPathOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedPathUnits, MagickTrue },
-    { "ObjectBoundingBox", (ssize_t) ObjectBoundingBox, MagickFalse },
-    { "UserSpace", (ssize_t) UserSpace, MagickFalse },
-    { "UserSpaceOnUse", (ssize_t) UserSpaceOnUse, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedPathUnits, MagickFalse }
+    { "Undefined", UndefinedPathUnits, UndefinedOptionFlag, MagickTrue },
+    { "ObjectBoundingBox", ObjectBoundingBox, UndefinedOptionFlag, MagickFalse },
+    { "UserSpace", UserSpace, UndefinedOptionFlag, MagickFalse },
+    { "UserSpaceOnUse", UserSpaceOnUse, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedPathUnits, UndefinedOptionFlag, MagickFalse }
   },
   CommandOptions[] =
   {
-    { "+adjoin", 0L, MagickFalse },
-    { "-adjoin", 0L, MagickFalse },
-    { "+adaptive-sharpen", 1L, MagickFalse },
-    { "-adaptive-sharpen", 1L, MagickFalse },
-    { "+adaptive-threshold", 1L, MagickFalse },
-    { "-adaptive-threshold", 1L, MagickFalse },
-    { "+affine", 0L, MagickFalse },
-    { "-affine", 1L, MagickFalse },
-    { "+affinity", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-affinity", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+alpha", 1L, MagickFalse },
-    { "-alpha", 1L, MagickFalse },
-    { "+annotate", 0L, MagickFalse },
-    { "-annotate", 2L, MagickFalse },
-    { "+antialias", 0L, MagickFalse },
-    { "-antialias", 0L, MagickFalse },
-    { "+append", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-append", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+authenticate", 0L, MagickFalse },
-    { "-authenticate", 1L, MagickFalse },
-    { "+auto-gamma", 0L, MagickTrue },
-    { "-auto-gamma", 0L, MagickTrue },
-    { "+auto-level", 0L, MagickTrue },
-    { "-auto-level", 0L, MagickTrue },
-    { "+auto-orient", 0L, MagickFalse },
-    { "-auto-orient", 0L, MagickFalse },
-    { "+average", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "-average", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "+backdrop", 0L, MagickFalse },
-    { "-backdrop", 1L, MagickFalse },
-    { "+background", 0L, MagickFalse },
-    { "-background", 1L, MagickFalse },
-    { "+bench", 0L, MagickTrue },
-    { "-bench", 1L, MagickTrue },
-    { "+bias", 0L, MagickFalse },
-    { "-bias", 1L, MagickFalse },
-    { "+black-threshold", 0L, MagickFalse },
-    { "-black-threshold", 1L, MagickFalse },
-    { "+blend", 0L, MagickFalse },
-    { "-blend", 1L, MagickFalse },
-    { "+blue-primary", 0L, MagickFalse },
-    { "-blue-primary", 1L, MagickFalse },
-    { "+blue-shift", 1L, MagickFalse },
-    { "-blue-shift", 1L, MagickFalse },
-    { "+blur", 0L, MagickFalse },
-    { "-blur", 1L, MagickFalse },
-    { "+border", 0L, MagickFalse },
-    { "-border", 1L, MagickFalse },
-    { "+bordercolor", 0L, MagickFalse },
-    { "-bordercolor", 1L, MagickFalse },
-    { "+borderwidth", 0L, MagickFalse },
-    { "-borderwidth", 1L, MagickFalse },
-    { "+box", 0L, MagickFalse },
-    { "-box", 1L, MagickFalse },
-    { "+brightness-contrast", 0L, MagickFalse },
-    { "-brightness-contrast", 1L, MagickFalse },
-    { "+cache", 0L, MagickFalse },
-    { "-cache", 1L, MagickFalse },
-    { "+cdl", 1L, MagickFalse },
-    { "-cdl", 1L, MagickFalse },
-    { "+channel", 0L, MagickFalse },
-    { "-channel", 1L, MagickFalse },
-    { "+charcoal", 0L, MagickFalse },
-    { "-charcoal", 0L, MagickFalse },
-    { "+chop", 0L, MagickFalse },
-    { "-chop", 1L, MagickFalse },
-    { "+clip", 0L, MagickFalse },
-    { "-clip", 0L, MagickFalse },
-    { "+clip-mask", 0L, MagickFalse },
-    { "-clip-mask", 1L, MagickFalse },
-    { "+clip-path", 0L, MagickFalse },
-    { "-clip-path", 1L, MagickFalse },
-    { "+clone", 0L, MagickFalse },
-    { "-clone", 1L, MagickFalse },
-    { "+clut", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-clut", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+coalesce", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-coalesce", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+colorize", 0L, MagickFalse },
-    { "-colorize", 1L, MagickFalse },
-    { "+colormap", 0L, MagickFalse },
-    { "-colormap", 1L, MagickFalse },
-    { "+color-matrix", 0L, MagickFalse },
-    { "-color-matrix", 1L, MagickFalse },
-    { "+colors", 0L, MagickFalse },
-    { "-colors", 1L, MagickFalse },
-    { "+colorspace", 0L, MagickFalse },
-    { "-colorspace", 1L, MagickFalse },
-    { "+combine", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-combine", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+comment", 0L, MagickFalse },
-    { "-comment", 1L, MagickFalse },
-    { "+compose", 0L, MagickFalse },
-    { "-compose", 1L, MagickFalse },
-    { "+composite", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-composite", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+compress", 0L, MagickFalse },
-    { "-compress", 1L, MagickFalse },
-    { "+concurrent", 0L, MagickTrue },
-    { "-concurrent", 0L, MagickTrue },
-    { "+contrast", 0L, MagickFalse },
-    { "-contrast", 0L, MagickFalse },
-    { "+contrast-stretch", 0L, MagickFalse },
-    { "-contrast-stretch", 1L, MagickFalse },
-    { "+convolve", 0L, MagickFalse },
-    { "-convolve", 1L, MagickFalse },
-    { "+crop", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-crop", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+cycle", 0L, MagickFalse },
-    { "-cycle", 1L, MagickFalse },
-    { "+debug", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-debug", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+decipher", 1L, MagickFalse },
-    { "-decipher", 1L, MagickFalse },
-    { "+deconstruct", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-deconstruct", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+define", 1L, MagickFalse },
-    { "-define", 1L, MagickFalse },
-    { "+delay", 0L, MagickFalse },
-    { "-delay", 1L, MagickFalse },
-    { "+delete", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-delete", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+density", 0L, MagickFalse },
-    { "-density", 1L, MagickFalse },
-    { "+depth", 0L, MagickFalse },
-    { "-depth", 1L, MagickFalse },
-    { "+descend", 0L, MagickFalse },
-    { "-descend", 1L, MagickFalse },
-    { "+deskew", 0L, MagickFalse },
-    { "-deskew", 1L, MagickFalse },
-    { "+despeckle", 0L, MagickFalse },
-    { "-despeckle", 0L, MagickFalse },
-    { "+direction", 0L, MagickFalse },
-    { "-direction", 1L, MagickFalse },
-    { "+displace", 0L, MagickFalse },
-    { "-displace", 1L, MagickFalse },
-    { "+display", 0L, MagickFalse },
-    { "-display", 1L, MagickFalse },
-    { "+dispose", 0L, MagickFalse },
-    { "-dispose", 1L, MagickFalse },
-    { "+dissolve", 0L, MagickFalse },
-    { "-dissolve", 1L, MagickFalse },
-    { "+distort", 2L, MagickFalse },
-    { "-distort", 2L, MagickFalse },
-    { "+dither", 0L, MagickFalse },
-    { "-dither", 1L, MagickFalse },
-    { "+draw", 0L, MagickFalse },
-    { "-draw", 1L, MagickFalse },
-    { "+duplicate", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-duplicate", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+duration", 1L, MagickFalse },
-    { "-duration", 1L, MagickFalse },
-    { "+edge", 0L, MagickFalse },
-    { "-edge", 1L, MagickFalse },
-    { "+emboss", 0L, MagickFalse },
-    { "-emboss", 1L, MagickFalse },
-    { "+encipher", 1L, MagickFalse },
-    { "-encipher", 1L, MagickFalse },
-    { "+encoding", 0L, MagickFalse },
-    { "-encoding", 1L, MagickFalse },
-    { "+endian", 0L, MagickFalse },
-    { "-endian", 1L, MagickFalse },
-    { "+enhance", 0L, MagickFalse },
-    { "-enhance", 0L, MagickFalse },
-    { "+equalize", 0L, MagickFalse },
-    { "-equalize", 0L, MagickFalse },
-    { "+evaluate", 0L, MagickFalse },
-    { "-evaluate", 2L, MagickFalse },
-    { "+evaluate-sequence", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-evaluate-sequence", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+extent", 0L, MagickFalse },
-    { "-extent", 1L, MagickFalse },
-    { "+extract", 0L, MagickFalse },
-    { "-extract", 1L, MagickFalse },
-    { "+family", 0L, MagickFalse },
-    { "-family", 1L, MagickFalse },
-    { "+fft", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-fft", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+fill", 0L, MagickFalse },
-    { "-fill", 1L, MagickFalse },
-    { "+filter", 0L, MagickFalse },
-    { "-filter", 1L, MagickFalse },
-    { "+flatten", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "-flatten", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "+flip", 0L, MagickFalse },
-    { "-flip", 0L, MagickFalse },
-    { "+floodfill", 0L, MagickFalse },
-    { "-floodfill", 2L, MagickFalse },
-    { "+flop", 0L, MagickFalse },
-    { "-flop", 0L, MagickFalse },
-    { "+font", 0L, MagickFalse },
-    { "-font", 1L, MagickFalse },
-    { "+foreground", 0L, MagickFalse },
-    { "-foreground", 1L, MagickFalse },
-    { "+format", 0L, MagickFalse },
-    { "-format", 1L, MagickFalse },
-    { "+frame", 0L, MagickFalse },
-    { "-frame", 1L, MagickFalse },
-    { "+fuzz", 0L, MagickFalse },
-    { "-fuzz", 1L, MagickFalse },
-    { "+fx", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-fx", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+gamma", 0L, MagickFalse },
-    { "-gamma", 1L, MagickFalse },
-    { "+gaussian", 0L, MagickFalse },
-    { "-gaussian", 1L, MagickFalse },
-    { "+gaussian-blur", 0L, MagickFalse },
-    { "-gaussian-blur", 1L, MagickFalse },
-    { "+geometry", 0L, MagickFalse },
-    { "-geometry", 1L, MagickFalse },
-    { "+gravity", 0L, MagickFalse },
-    { "-gravity", 1L, MagickFalse },
-    { "+green-primary", 0L, MagickFalse },
-    { "-green-primary", 1L, MagickFalse },
-    { "+hald-clut", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-hald-clut", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+help", 0L, MagickFalse },
-    { "-help", 0L, MagickFalse },
-    { "+highlight-color", 1L, MagickFalse },
-    { "-highlight-color", 1L, MagickFalse },
-    { "+iconGeometry", 0L, MagickFalse },
-    { "-iconGeometry", 1L, MagickFalse },
-    { "+iconic", 0L, MagickFalse },
-    { "-iconic", 1L, MagickFalse },
-    { "+identify", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-identify", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+ift", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-ift", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+immutable", 0L, MagickFalse },
-    { "-immutable", 0L, MagickFalse },
-    { "+implode", 0L, MagickFalse },
-    { "-implode", 1L, MagickFalse },
-    { "+insert", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-insert", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+intent", 0L, MagickFalse },
-    { "-intent", 1L, MagickFalse },
-    { "+interlace", 0L, MagickFalse },
-    { "-interlace", 1L, MagickFalse },
-    { "+interpolate", 0L, MagickFalse },
-    { "-interpolate", 1L, MagickFalse },
-    { "+interword-spacing", 0L, MagickFalse },
-    { "-interword-spacing", 1L, MagickFalse },
-    { "+kerning", 0L, MagickFalse },
-    { "-kerning", 1L, MagickFalse },
-    { "+label", 0L, MagickFalse },
-    { "-label", 1L, MagickFalse },
-    { "+lat", 0L, MagickFalse },
-    { "-lat", 1L, MagickFalse },
-    { "+layers", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-layers", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+level", 1L, MagickFalse },
-    { "-level", 1L, MagickFalse },
-    { "+level-colors", 1L, MagickFalse },
-    { "-level-colors", 1L, MagickFalse },
-    { "+limit", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-limit", (ssize_t) (FireOption|2L), MagickFalse },
-    { "+linear-stretch", 0L, MagickFalse },
-    { "-linear-stretch", 1L, MagickFalse },
-    { "+linewidth", 0L, MagickFalse },
-    { "-linewidth", 1L, MagickFalse },
-    { "+liquid-rescale", 0L, MagickFalse },
-    { "-liquid-rescale", 1L, MagickFalse },
-    { "+list", 0L, MagickFalse },
-    { "-list", 1L, MagickFalse },
-    { "+log", 0L, MagickFalse },
-    { "-log", 1L, MagickFalse },
-    { "+loop", 0L, MagickFalse },
-    { "-loop", 1L, MagickFalse },
-    { "+lowlight-color", 1L, MagickFalse },
-    { "-lowlight-color", 1L, MagickFalse },
-    { "+magnify", 0L, MagickFalse },
-    { "-magnify", 1L, MagickFalse },
-    { "+map", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-map", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+mask", 0L, MagickFalse },
-    { "-mask", 1L, MagickFalse },
-    { "+matte", (ssize_t) (DepreciatedOption|0L), MagickFalse },
-    { "-matte", (ssize_t) (DepreciatedOption|0L), MagickFalse },
-    { "+mattecolor", 0L, MagickFalse },
-    { "-mattecolor", 1L, MagickFalse },
-    { "+maximum", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "-maximum", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "+median", 0L, MagickFalse },
-    { "-median", 1L, MagickFalse },
-    { "+metric", 0L, MagickFalse },
-    { "-metric", 1L, MagickFalse },
-    { "+minimum", 0L, MagickFalse },
-    { "-minimum", 0L, MagickFalse },
-    { "+mode", 0L, MagickFalse },
-    { "-mode", 1L, MagickFalse },
-    { "+modulate", 0L, MagickFalse },
-    { "-modulate", 1L, MagickFalse },
-    { "+monitor", 0L, MagickFalse },
-    { "-monitor", 0L, MagickFalse },
-    { "+monochrome", 0L, MagickFalse },
-    { "-monochrome", 0L, MagickFalse },
-    { "+morph", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-morph", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+morphology", 0L, MagickFalse },
-    { "-morphology", 2L, MagickFalse },
-    { "+mosaic", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "-mosaic", (ssize_t) (FireOption|DepreciatedOption|0L), MagickFalse },
-    { "+motion-blur", 0L, MagickFalse },
-    { "-motion-blur", 1L, MagickFalse },
-    { "+name", 0L, MagickFalse },
-    { "-name", 1L, MagickFalse },
-    { "+negate", 0L, MagickFalse },
-    { "-negate", 0L, MagickFalse },
-    { "+noise", 1L, MagickFalse },
-    { "-noise", 1L, MagickFalse },
-    { "+noop", 0L, MagickFalse },
-    { "-noop", 0L, MagickFalse },
-    { "+normalize", 0L, MagickFalse },
-    { "-normalize", 0L, MagickFalse },
-    { "+opaque", 1L, MagickFalse },
-    { "-opaque", 1L, MagickFalse },
-    { "+ordered-dither", 0L, MagickFalse },
-    { "-ordered-dither", 1L, MagickFalse },
-    { "+orient", 0L, MagickFalse },
-    { "-orient", 1L, MagickFalse },
-    { "+origin", 0L, MagickFalse },
-    { "-origin", 1L, MagickFalse },
-    { "+page", 0L, MagickFalse },
-    { "-page", 1L, MagickFalse },
-    { "+paint", 0L, MagickFalse },
-    { "-paint", 1L, MagickFalse },
-    { "+path", 0L, MagickFalse },
-    { "-path", 1L, MagickFalse },
-    { "+pause", 0L, MagickFalse },
-    { "-pause", 1L, MagickFalse },
-    { "+passphrase", 0L, MagickFalse },
-    { "-passphrase", 1L, MagickFalse },
-    { "+pen", (ssize_t) (DepreciatedOption|0L), MagickFalse },
-    { "-pen", (ssize_t) (DepreciatedOption|1L), MagickFalse },
-    { "+ping", 0L, MagickFalse },
-    { "-ping", 0L, MagickFalse },
-    { "+pointsize", 0L, MagickFalse },
-    { "-pointsize", 1L, MagickFalse },
-    { "+polaroid", 0L, MagickFalse },
-    { "-polaroid", 1L, MagickFalse },
-    { "+posterize", 0L, MagickFalse },
-    { "-posterize", 1L, MagickFalse },
-    { "+preview", 0L, MagickFalse },
-    { "-preview", 1L, MagickFalse },
-    { "+print", (ssize_t) (FireOption|1L), MagickFalse },
-    { "-print", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+process", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-process", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+profile", 1L, MagickFalse },
-    { "-profile", 1L, MagickFalse },
-    { "+quality", 0L, MagickFalse },
-    { "-quality", 1L, MagickFalse },
-    { "+quiet", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-quiet", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+radial-blur", 0L, MagickFalse },
-    { "-radial-blur", 1L, MagickFalse },
-    { "+raise", 0L, MagickFalse },
-    { "-raise", 1L, MagickFalse },
-    { "+random-threshold", 0L, MagickFalse },
-    { "-random-threshold", 1L, MagickFalse },
-    { "+recolor", 0L, MagickFalse },
-    { "-recolor", 1L, MagickFalse },
-    { "+red-primary", 0L, MagickFalse },
-    { "-red-primary", 1L, MagickFalse },
-    { "+regard-warnings", 0L, MagickFalse },
-    { "-regard-warnings", 0L, MagickFalse },
-    { "+region", 0L, MagickFalse },
-    { "-region", 1L, MagickFalse },
-    { "+remote", 0L, MagickFalse },
-    { "-remote", 1L, MagickFalse },
-    { "+render", 0L, MagickFalse },
-    { "-render", 0L, MagickFalse },
-    { "+repage", 0L, MagickFalse },
-    { "-repage", 1L, MagickFalse },
-    { "+resample", 0L, MagickFalse },
-    { "-resample", 1L, MagickFalse },
-    { "+resize", 0L, MagickFalse },
-    { "-resize", 1L, MagickFalse },
-    { "+respect-parenthesis", 0L, MagickFalse },
-    { "-respect-parenthesis", 0L, MagickFalse },
-    { "+reverse", 0L, MagickFalse },
-    { "-reverse", 0L, MagickFalse },
-    { "+roll", 0L, MagickFalse },
-    { "-roll", 1L, MagickFalse },
-    { "+rotate", 0L, MagickFalse },
-    { "-rotate", 1L, MagickFalse },
-    { "+sample", 0L, MagickFalse },
-    { "-sample", 1L, MagickFalse },
-    { "+sampling-factor", 0L, MagickFalse },
-    { "-sampling-factor", 1L, MagickFalse },
-    { "+sans", 0L, MagickFalse },
-    { "-sans", 1L, MagickFalse },
-    { "+sans0", 0L, MagickFalse },
-    { "-sans0", 0L, MagickFalse },
-    { "+sans2", 2L, MagickFalse },
-    { "-sans2", 2L, MagickFalse },
-    { "+scale", 0L, MagickFalse },
-    { "-scale", 1L, MagickFalse },
-    { "+scene", 0L, MagickFalse },
-    { "-scene", 1L, MagickFalse },
-    { "+scenes", 0L, MagickFalse },
-    { "-scenes", 1L, MagickFalse },
-    { "+screen", 0L, MagickFalse },
-    { "-screen", 1L, MagickFalse },
-    { "+seed", 0L, MagickFalse },
-    { "-seed", 1L, MagickFalse },
-    { "+segment", 0L, MagickFalse },
-    { "-segment", 1L, MagickFalse },
-    { "+separate", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-separate", (ssize_t) (FireOption|0L), MagickFalse },
-    { "+sepia-tone", 0L, MagickFalse },
-    { "-sepia-tone", 1L, MagickFalse },
-    { "+set", 1L, MagickFalse },
-    { "-set", 2L, MagickFalse },
-    { "+shade", 0L, MagickFalse },
-    { "-shade", 1L, MagickFalse },
-    { "+shadow", 0L, MagickFalse },
-    { "-shadow", 1L, MagickFalse },
-    { "+shared-memory", 0L, MagickFalse },
-    { "-shared-memory", 1L, MagickFalse },
-    { "+sharpen", 0L, MagickFalse },
-    { "-sharpen", 1L, MagickFalse },
-    { "+shave", 0L, MagickFalse },
-    { "-shave", 1L, MagickFalse },
-    { "+shear", 0L, MagickFalse },
-    { "-shear", 1L, MagickFalse },
-    { "+sigmoidal-contrast", 0L, MagickFalse },
-    { "-sigmoidal-contrast", 1L, MagickFalse },
-    { "+silent", 0L, MagickFalse },
-    { "-silent", 1L, MagickFalse },
-    { "+size", 0L, MagickFalse },
-    { "-size", 1L, MagickFalse },
-    { "+sketch", 0L, MagickFalse },
-    { "-sketch", 1L, MagickFalse },
-    { "+smush", (ssize_t) (FireOption|1L), MagickFalse },
-    { "-smush", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+snaps", 0L, MagickFalse },
-    { "-snaps", 1L, MagickFalse },
-    { "+solarize", 0L, MagickFalse },
-    { "-solarize", 1L, MagickFalse },
-    { "+splice", 0L, MagickFalse },
-    { "-splice", 1L, MagickFalse },
-    { "+sparse-color", 2L, MagickFalse },
-    { "-sparse-color", 2L, MagickFalse },
-    { "+spread", 0L, MagickFalse },
-    { "-spread", 1L, MagickFalse },
-    { "+statistic", 2L, MagickFalse },
-    { "-statistic", 2L, MagickFalse },
-    { "+stegano", 0L, MagickFalse },
-    { "-stegano", 1L, MagickFalse },
-    { "+stereo", 0L, MagickFalse },
-    { "-stereo", 1L, MagickFalse },
-    { "+stretch", 0L, MagickFalse },
-    { "-stretch", 1L, MagickFalse },
-    { "+strip", 0L, MagickFalse },
-    { "-strip", 0L, MagickFalse },
-    { "+stroke", 0L, MagickFalse },
-    { "-stroke", 1L, MagickFalse },
-    { "+strokewidth", 0L, MagickFalse },
-    { "-strokewidth", 1L, MagickFalse },
-    { "+style", 0L, MagickFalse },
-    { "-style", 1L, MagickFalse },
-    { "+subimage-search", 0L, MagickFalse },
-    { "-subimage-search", 0L, MagickFalse },
-    { "+swap", (ssize_t) (FireOption|0L), MagickFalse },
-    { "-swap", (ssize_t) (FireOption|1L), MagickFalse },
-    { "+swirl", 0L, MagickFalse },
-    { "-swirl", 1L, MagickFalse },
-    { "+synchronize", 0L, MagickFalse },
-    { "-synchronize", 0L, MagickFalse },
-    { "+taint", 0L, MagickFalse },
-    { "-taint", 0L, MagickFalse },
-    { "+text-font", 0L, MagickFalse },
-    { "-text-font", 1L, MagickFalse },
-    { "+texture", 0L, MagickFalse },
-    { "-texture", 1L, MagickFalse },
-    { "+threshold", 0L, MagickFalse },
-    { "-threshold", 1L, MagickFalse },
-    { "+thumbnail", 0L, MagickFalse },
-    { "-thumbnail", 1L, MagickFalse },
-    { "+thumnail", 0L, MagickFalse },
-    { "-thumnail", 1L, MagickFalse },
-    { "+tile", 0L, MagickFalse },
-    { "-tile", 1L, MagickFalse },
-    { "+tile-offset", 0L, MagickFalse },
-    { "-tile-offset", 1L, MagickFalse },
-    { "+tint", 0L, MagickFalse },
-    { "-tint", 1L, MagickFalse },
-    { "+title", 0L, MagickFalse },
-    { "-title", 1L, MagickFalse },
-    { "+transform", 0L, MagickFalse },
-    { "-transform", 0L, MagickFalse },
-    { "+transparent", 1L, MagickFalse },
-    { "-transparent", 1L, MagickFalse },
-    { "+transparent-color", 1L, MagickFalse },
-    { "-transparent-color", 1L, MagickFalse },
-    { "+transpose", 0L, MagickFalse },
-    { "-transpose", 0L, MagickFalse },
-    { "+transverse", 0L, MagickFalse },
-    { "-transverse", 0L, MagickFalse },
-    { "+treedepth", 0L, MagickFalse },
-    { "-treedepth", 1L, MagickFalse },
-    { "+trim", 0L, MagickFalse },
-    { "-trim", 0L, MagickFalse },
-    { "+type", 0L, MagickFalse },
-    { "-type", 1L, MagickFalse },
-    { "+undercolor", 0L, MagickFalse },
-    { "-undercolor", 1L, MagickFalse },
-    { "+unique-colors", 0L, MagickFalse },
-    { "-unique-colors", 0L, MagickFalse },
-    { "+units", 0L, MagickFalse },
-    { "-units", 1L, MagickFalse },
-    { "+unsharp", 0L, MagickFalse },
-    { "-unsharp", 1L, MagickFalse },
-    { "+update", 0L, MagickFalse },
-    { "-update", 1L, MagickFalse },
-    { "+use-pixmap", 0L, MagickFalse },
-    { "-use-pixmap", 1L, MagickFalse },
-    { "+verbose", 0L, MagickFalse },
-    { "-verbose", 0L, MagickFalse },
-    { "+version", 0L, MagickFalse },
-    { "-version", 1L, MagickFalse },
-    { "+view", 0L, MagickFalse },
-    { "-view", 1L, MagickFalse },
-    { "+vignette", 0L, MagickFalse },
-    { "-vignette", 1L, MagickFalse },
-    { "+virtual-pixel", 0L, MagickFalse },
-    { "-virtual-pixel", 1L, MagickFalse },
-    { "+visual", 0L, MagickFalse },
-    { "-visual", 1L, MagickFalse },
-    { "+watermark", 0L, MagickFalse },
-    { "-watermark", 1L, MagickFalse },
-    { "+wave", 0L, MagickFalse },
-    { "-wave", 1L, MagickFalse },
-    { "+weight", 0L, MagickFalse },
-    { "-weight", 1L, MagickFalse },
-    { "+white-point", 0L, MagickFalse },
-    { "-white-point", 1L, MagickFalse },
-    { "+white-threshold", 0L, MagickFalse },
-    { "-white-threshold", 1L, MagickFalse },
-    { "+window", 0L, MagickFalse },
-    { "-window", 1L, MagickFalse },
-    { "+window-group", 0L, MagickFalse },
-    { "-window-group", 1L, MagickFalse },
-    { "+write", (ssize_t) (FireOption|1L), MagickFalse },
-    { "-write", (ssize_t) (FireOption|1L), MagickFalse },
-    { (char *) NULL, (ssize_t) 0L, MagickFalse }
+    { "+adjoin", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-adjoin", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+adaptive-sharpen", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-adaptive-sharpen", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+adaptive-threshold", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-adaptive-threshold", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+affine", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-affine", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+affinity", 0L, FireOptionFlag, MagickFalse },
+    { "-affinity", 1L, FireOptionFlag, MagickFalse },
+    { "+alpha", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-alpha", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+annotate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-annotate", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+antialias", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-antialias", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+append", 0L, FireOptionFlag, MagickFalse },
+    { "-append", 0L, FireOptionFlag, MagickFalse },
+    { "+authenticate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-authenticate", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+auto-gamma", 0L, UndefinedOptionFlag, MagickTrue },
+    { "-auto-gamma", 0L, UndefinedOptionFlag, MagickTrue },
+    { "+auto-level", 0L, UndefinedOptionFlag, MagickTrue },
+    { "-auto-level", 0L, UndefinedOptionFlag, MagickTrue },
+    { "+auto-orient", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-auto-orient", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+average", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "-average", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "+backdrop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-backdrop", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+background", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-background", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+bench", 0L, UndefinedOptionFlag, MagickTrue },
+    { "-bench", 1L, UndefinedOptionFlag, MagickTrue },
+    { "+bias", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-bias", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+black-threshold", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-black-threshold", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+blend", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-blend", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+blue-primary", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-blue-primary", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+blue-shift", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-blue-shift", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+blur", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-blur", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+border", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-border", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+bordercolor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-bordercolor", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+borderwidth", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-borderwidth", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+box", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-box", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+brightness-contrast", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-brightness-contrast", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+cache", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-cache", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+cdl", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-cdl", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+channel", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-channel", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+charcoal", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-charcoal", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+chop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-chop", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+clip", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-clip", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+clip-mask", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-clip-mask", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+clip-path", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-clip-path", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+clone", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-clone", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+clut", 0L, FireOptionFlag, MagickFalse },
+    { "-clut", 0L, FireOptionFlag, MagickFalse },
+    { "+coalesce", 0L, FireOptionFlag, MagickFalse },
+    { "-coalesce", 0L, FireOptionFlag, MagickFalse },
+    { "+colorize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-colorize", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+colormap", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-colormap", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+color-matrix", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-color-matrix", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+colors", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-colors", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+colorspace", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-colorspace", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+combine", 0L, FireOptionFlag, MagickFalse },
+    { "-combine", 0L, FireOptionFlag, MagickFalse },
+    { "+comment", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-comment", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+compose", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-compose", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+composite", 0L, FireOptionFlag, MagickFalse },
+    { "-composite", 0L, FireOptionFlag, MagickFalse },
+    { "+compress", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-compress", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+concurrent", 0L, UndefinedOptionFlag, MagickTrue },
+    { "-concurrent", 0L, UndefinedOptionFlag, MagickTrue },
+    { "+contrast", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-contrast", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+contrast-stretch", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-contrast-stretch", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+convolve", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-convolve", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+crop", 0L, FireOptionFlag, MagickFalse },
+    { "-crop", 1L, FireOptionFlag, MagickFalse },
+    { "+cycle", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-cycle", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+debug", 0L, FireOptionFlag, MagickFalse },
+    { "-debug", 1L, FireOptionFlag, MagickFalse },
+    { "+decipher", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-decipher", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+deconstruct", 0L, FireOptionFlag, MagickFalse },
+    { "-deconstruct", 0L, FireOptionFlag, MagickFalse },
+    { "+define", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-define", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+delay", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-delay", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+delete", 0L, FireOptionFlag, MagickFalse },
+    { "-delete", 1L, FireOptionFlag, MagickFalse },
+    { "+density", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-density", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+depth", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-depth", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+descend", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-descend", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+deskew", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-deskew", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+despeckle", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-despeckle", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+direction", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-direction", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+displace", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-displace", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+display", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-display", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+dispose", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-dispose", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+dissolve", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-dissolve", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+distort", 2L, UndefinedOptionFlag, MagickFalse },
+    { "-distort", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+dither", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-dither", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+draw", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-draw", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+duplicate", 0L, FireOptionFlag, MagickFalse },
+    { "-duplicate", 1L, FireOptionFlag, MagickFalse },
+    { "+duration", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-duration", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+edge", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-edge", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+emboss", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-emboss", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+encipher", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-encipher", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+encoding", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-encoding", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+endian", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-endian", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+enhance", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-enhance", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+equalize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-equalize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+evaluate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-evaluate", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+evaluate-sequence", 0L, FireOptionFlag, MagickFalse },
+    { "-evaluate-sequence", 1L, FireOptionFlag, MagickFalse },
+    { "+extent", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-extent", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+extract", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-extract", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+family", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-family", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+fft", 0L, FireOptionFlag, MagickFalse },
+    { "-fft", 0L, FireOptionFlag, MagickFalse },
+    { "+fill", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-fill", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+filter", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-filter", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+flatten", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "-flatten", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "+flip", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-flip", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+floodfill", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-floodfill", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+flop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-flop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+font", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-font", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+foreground", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-foreground", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+format", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-format", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+frame", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-frame", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+fuzz", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-fuzz", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+fx", 0L, FireOptionFlag, MagickFalse },
+    { "-fx", 1L, FireOptionFlag, MagickFalse },
+    { "+gamma", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-gamma", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+gaussian", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-gaussian", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+gaussian-blur", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-gaussian-blur", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+geometry", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-geometry", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+gravity", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-gravity", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+green-primary", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-green-primary", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+hald-clut", 0L, FireOptionFlag, MagickFalse },
+    { "-hald-clut", 0L, FireOptionFlag, MagickFalse },
+    { "+help", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-help", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+highlight-color", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-highlight-color", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+iconGeometry", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-iconGeometry", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+iconic", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-iconic", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+identify", 0L, FireOptionFlag, MagickFalse },
+    { "-identify", 0L, FireOptionFlag, MagickFalse },
+    { "+ift", 0L, FireOptionFlag, MagickFalse },
+    { "-ift", 0L, FireOptionFlag, MagickFalse },
+    { "+immutable", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-immutable", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+implode", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-implode", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+insert", 0L, FireOptionFlag, MagickFalse },
+    { "-insert", 1L, FireOptionFlag, MagickFalse },
+    { "+intent", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-intent", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+interlace", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-interlace", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+interpolate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-interpolate", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+interword-spacing", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-interword-spacing", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+kerning", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-kerning", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+label", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-label", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+lat", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-lat", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+layers", 0L, FireOptionFlag, MagickFalse },
+    { "-layers", 1L, FireOptionFlag, MagickFalse },
+    { "+level", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-level", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+level-colors", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-level-colors", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+limit", 0L, FireOptionFlag, MagickFalse },
+    { "-limit", 2L, FireOptionFlag, MagickFalse },
+    { "+linear-stretch", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-linear-stretch", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+linewidth", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-linewidth", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+liquid-rescale", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-liquid-rescale", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+list", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-list", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+log", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-log", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+loop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-loop", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+lowlight-color", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-lowlight-color", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+magnify", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-magnify", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+map", 0L, FireOptionFlag, MagickFalse },
+    { "-map", 1L, FireOptionFlag, MagickFalse },
+    { "+mask", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-mask", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+matte", 0L, DeprecatedOptionFlag, MagickFalse },
+    { "-matte", 0L, DeprecatedOptionFlag, MagickFalse },
+    { "+mattecolor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-mattecolor", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+maximum", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "-maximum", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "+median", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-median", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+metric", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-metric", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+minimum", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-minimum", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+mode", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-mode", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+modulate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-modulate", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+monitor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-monitor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+monochrome", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-monochrome", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+morph", 0L, FireOptionFlag, MagickFalse },
+    { "-morph", 1L, FireOptionFlag, MagickFalse },
+    { "+morphology", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-morphology", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+mosaic", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "-mosaic", 0L, FireOptionFlag | DeprecatedOptionFlag, MagickFalse },
+    { "+motion-blur", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-motion-blur", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+name", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-name", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+negate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-negate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+noise", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-noise", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+noop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-noop", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+normalize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-normalize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+opaque", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-opaque", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+ordered-dither", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-ordered-dither", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+orient", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-orient", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+origin", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-origin", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+page", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-page", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+paint", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-paint", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+path", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-path", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+pause", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-pause", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+passphrase", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-passphrase", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+pen", 0L, DeprecatedOptionFlag, MagickFalse },
+    { "-pen", 1L, DeprecatedOptionFlag, MagickFalse },
+    { "+ping", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-ping", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+pointsize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-pointsize", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+polaroid", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-polaroid", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+posterize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-posterize", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+preview", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-preview", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+print", 1L, FireOptionFlag, MagickFalse },
+    { "-print", 1L, FireOptionFlag, MagickFalse },
+    { "+process", 0L, FireOptionFlag, MagickFalse },
+    { "-process", 1L, FireOptionFlag, MagickFalse },
+    { "+profile", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-profile", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+quality", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-quality", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+quiet", 0L, FireOptionFlag, MagickFalse },
+    { "-quiet", 0L, FireOptionFlag, MagickFalse },
+    { "+radial-blur", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-radial-blur", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+raise", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-raise", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+random-threshold", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-random-threshold", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+recolor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-recolor", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+red-primary", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-red-primary", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+regard-warnings", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-regard-warnings", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+region", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-region", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+remote", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-remote", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+render", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-render", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+repage", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-repage", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+resample", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-resample", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+resize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-resize", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+respect-parenthesis", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-respect-parenthesis", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+reverse", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-reverse", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+roll", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-roll", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+rotate", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-rotate", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sample", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sample", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sampling-factor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sampling-factor", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sans", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sans", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sans0", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sans0", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+sans2", 2L, UndefinedOptionFlag, MagickFalse },
+    { "-sans2", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+scale", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-scale", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+scene", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-scene", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+scenes", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-scenes", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+screen", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-screen", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+seed", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-seed", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+segment", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-segment", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+separate", 0L, FireOptionFlag, MagickFalse },
+    { "-separate", 0L, FireOptionFlag, MagickFalse },
+    { "+sepia-tone", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sepia-tone", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+set", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-set", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+shade", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-shade", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+shadow", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-shadow", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+shared-memory", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-shared-memory", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sharpen", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sharpen", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+shave", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-shave", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+shear", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-shear", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sigmoidal-contrast", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sigmoidal-contrast", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+silent", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-silent", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+size", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-size", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sketch", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-sketch", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+smush", 1L, FireOptionFlag, MagickFalse },
+    { "-smush", 1L, FireOptionFlag, MagickFalse },
+    { "+snaps", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-snaps", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+solarize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-solarize", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+splice", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-splice", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+sparse-color", 2L, UndefinedOptionFlag, MagickFalse },
+    { "-sparse-color", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+spread", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-spread", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+statistic", 2L, UndefinedOptionFlag, MagickFalse },
+    { "-statistic", 2L, UndefinedOptionFlag, MagickFalse },
+    { "+stegano", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-stegano", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+stereo", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-stereo", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+stretch", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-stretch", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+strip", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-strip", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+stroke", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-stroke", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+strokewidth", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-strokewidth", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+style", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-style", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+subimage-search", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-subimage-search", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+swap", 0L, FireOptionFlag, MagickFalse },
+    { "-swap", 1L, FireOptionFlag, MagickFalse },
+    { "+swirl", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-swirl", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+synchronize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-synchronize", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+taint", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-taint", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+text-font", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-text-font", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+texture", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-texture", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+threshold", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-threshold", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+thumbnail", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-thumbnail", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+thumnail", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-thumnail", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+tile", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-tile", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+tile-offset", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-tile-offset", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+tint", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-tint", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+title", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-title", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+transform", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-transform", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+transparent", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-transparent", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+transparent-color", 1L, UndefinedOptionFlag, MagickFalse },
+    { "-transparent-color", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+transpose", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-transpose", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+transverse", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-transverse", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+treedepth", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-treedepth", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+trim", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-trim", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+type", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-type", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+undercolor", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-undercolor", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+unique-colors", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-unique-colors", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+units", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-units", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+unsharp", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-unsharp", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+update", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-update", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+use-pixmap", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-use-pixmap", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+verbose", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-verbose", 0L, UndefinedOptionFlag, MagickFalse },
+    { "+version", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-version", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+view", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-view", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+vignette", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-vignette", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+virtual-pixel", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-virtual-pixel", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+visual", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-visual", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+watermark", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-watermark", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+wave", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-wave", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+weight", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-weight", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+white-point", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-white-point", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+white-threshold", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-white-threshold", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+window", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-window", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+window-group", 0L, UndefinedOptionFlag, MagickFalse },
+    { "-window-group", 1L, UndefinedOptionFlag, MagickFalse },
+    { "+write", 1L, FireOptionFlag, MagickFalse },
+    { "-write", 1L, FireOptionFlag, MagickFalse },
+    { (char *) NULL, 0L, UndefinedOptionFlag, MagickFalse }
   },
   ComposeOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedCompositeOp, MagickTrue },
-    { "Atop", (ssize_t) AtopCompositeOp, MagickFalse },
-    { "Blend", (ssize_t) BlendCompositeOp, MagickFalse },
-    { "Blur", (ssize_t) BlurCompositeOp, MagickFalse },
-    { "Bumpmap", (ssize_t) BumpmapCompositeOp, MagickFalse },
-    { "ChangeMask", (ssize_t) ChangeMaskCompositeOp, MagickFalse },
-    { "Clear", (ssize_t) ClearCompositeOp, MagickFalse },
-    { "ColorBurn", (ssize_t) ColorBurnCompositeOp, MagickFalse },
-    { "ColorDodge", (ssize_t) ColorDodgeCompositeOp, MagickFalse },
-    { "Colorize", (ssize_t) ColorizeCompositeOp, MagickFalse },
-    { "CopyBlack", (ssize_t) CopyBlackCompositeOp, MagickFalse },
-    { "CopyBlue", (ssize_t) CopyBlueCompositeOp, MagickFalse },
-    { "CopyCyan", (ssize_t) CopyCyanCompositeOp, MagickFalse },
-    { "CopyGreen", (ssize_t) CopyGreenCompositeOp, MagickFalse },
-    { "Copy", (ssize_t) CopyCompositeOp, MagickFalse },
-    { "CopyMagenta", (ssize_t) CopyMagentaCompositeOp, MagickFalse },
-    { "CopyOpacity", (ssize_t) CopyOpacityCompositeOp, MagickFalse },
-    { "CopyRed", (ssize_t) CopyRedCompositeOp, MagickFalse },
-    { "CopyYellow", (ssize_t) CopyYellowCompositeOp, MagickFalse },
-    { "Darken", (ssize_t) DarkenCompositeOp, MagickFalse },
-    { "DarkenIntensity", (ssize_t) DarkenIntensityCompositeOp, MagickFalse },
-    { "DivideDst", (ssize_t) DivideDstCompositeOp, MagickFalse },
-    { "DivideSrc", (ssize_t) DivideSrcCompositeOp, MagickFalse },
-    { "Dst", (ssize_t) DstCompositeOp, MagickFalse },
-    { "Difference", (ssize_t) DifferenceCompositeOp, MagickFalse },
-    { "Displace", (ssize_t) DisplaceCompositeOp, MagickFalse },
-    { "Dissolve", (ssize_t) DissolveCompositeOp, MagickFalse },
-    { "Distort", (ssize_t) DistortCompositeOp, MagickFalse },
-    { "DstAtop", (ssize_t) DstAtopCompositeOp, MagickFalse },
-    { "DstIn", (ssize_t) DstInCompositeOp, MagickFalse },
-    { "DstOut", (ssize_t) DstOutCompositeOp, MagickFalse },
-    { "DstOver", (ssize_t) DstOverCompositeOp, MagickFalse },
-    { "Dst", (ssize_t) DstCompositeOp, MagickFalse },
-    { "Exclusion", (ssize_t) ExclusionCompositeOp, MagickFalse },
-    { "HardLight", (ssize_t) HardLightCompositeOp, MagickFalse },
-    { "Hue", (ssize_t) HueCompositeOp, MagickFalse },
-    { "In", (ssize_t) InCompositeOp, MagickFalse },
-    { "Lighten", (ssize_t) LightenCompositeOp, MagickFalse },
-    { "LightenIntensity", (ssize_t) LightenIntensityCompositeOp, MagickFalse },
-    { "LinearBurn", (ssize_t) LinearBurnCompositeOp, MagickFalse },
-    { "LinearDodge", (ssize_t) LinearDodgeCompositeOp, MagickFalse },
-    { "LinearLight", (ssize_t) LinearLightCompositeOp, MagickFalse },
-    { "Luminize", (ssize_t) LuminizeCompositeOp, MagickFalse },
-    { "Mathematics", (ssize_t) MathematicsCompositeOp, MagickFalse },
-    { "MinusDst", (ssize_t) MinusDstCompositeOp, MagickFalse },
-    { "MinusSrc", (ssize_t) MinusSrcCompositeOp, MagickFalse },
-    { "Modulate", (ssize_t) ModulateCompositeOp, MagickFalse },
-    { "ModulusAdd", (ssize_t) ModulusAddCompositeOp, MagickFalse },
-    { "ModulusSubtract", (ssize_t) ModulusSubtractCompositeOp, MagickFalse },
-    { "Multiply", (ssize_t) MultiplyCompositeOp, MagickFalse },
-    { "None", (ssize_t) NoCompositeOp, MagickFalse },
-    { "Out", (ssize_t) OutCompositeOp, MagickFalse },
-    { "Overlay", (ssize_t) OverlayCompositeOp, MagickFalse },
-    { "Over", (ssize_t) OverCompositeOp, MagickFalse },
-    { "PegtopLight", (ssize_t) PegtopLightCompositeOp, MagickFalse },
-    { "PinLight", (ssize_t) PinLightCompositeOp, MagickFalse },
-    { "Plus", (ssize_t) PlusCompositeOp, MagickFalse },
-    { "Replace", (ssize_t) ReplaceCompositeOp, MagickFalse },
-    { "Saturate", (ssize_t) SaturateCompositeOp, MagickFalse },
-    { "Screen", (ssize_t) ScreenCompositeOp, MagickFalse },
-    { "SoftLight", (ssize_t) SoftLightCompositeOp, MagickFalse },
-    { "Src", (ssize_t) SrcCompositeOp, MagickFalse },
-    { "SrcAtop", (ssize_t) SrcAtopCompositeOp, MagickFalse },
-    { "SrcIn", (ssize_t) SrcInCompositeOp, MagickFalse },
-    { "SrcOut", (ssize_t) SrcOutCompositeOp, MagickFalse },
-    { "SrcOver", (ssize_t) SrcOverCompositeOp, MagickFalse },
-    { "Src", (ssize_t) SrcCompositeOp, MagickFalse },
-    { "VividLight", (ssize_t) VividLightCompositeOp, MagickFalse },
-    { "Xor", (ssize_t) XorCompositeOp, MagickFalse },
-    { "Add", (ssize_t) AddCompositeOp, MagickTrue }, /* deprecate */
-    { "Divide", (ssize_t) DivideDstCompositeOp, MagickTrue }, /* deprecate */
-    { "Minus", (ssize_t) MinusDstCompositeOp, MagickTrue }, /* deprecate */
-    { "Subtract", (ssize_t) SubtractCompositeOp, MagickTrue }, /* deprecate */
-    { "Threshold", (ssize_t) ThresholdCompositeOp, MagickTrue }, /* deprecate */
-    { (char *) NULL, (ssize_t) UndefinedCompositeOp, MagickFalse }
+    { "Undefined", UndefinedCompositeOp, UndefinedOptionFlag, MagickTrue },
+    { "Atop", AtopCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Blend", BlendCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Blur", BlurCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Bumpmap", BumpmapCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "ChangeMask", ChangeMaskCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Clear", ClearCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "ColorBurn", ColorBurnCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "ColorDodge", ColorDodgeCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Colorize", ColorizeCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyBlack", CopyBlackCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyBlue", CopyBlueCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyCyan", CopyCyanCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyGreen", CopyGreenCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Copy", CopyCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyMagenta", CopyMagentaCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyOpacity", CopyOpacityCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyRed", CopyRedCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "CopyYellow", CopyYellowCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Darken", DarkenCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DarkenIntensity", DarkenIntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DivideDst", DivideDstCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DivideSrc", DivideSrcCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Dst", DstCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Difference", DifferenceCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Displace", DisplaceCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Dissolve", DissolveCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Distort", DistortCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DstAtop", DstAtopCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DstIn", DstInCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DstOut", DstOutCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "DstOver", DstOverCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Dst", DstCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Exclusion", ExclusionCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "HardLight", HardLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Hue", HueCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "In", InCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Lighten", LightenCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "LightenIntensity", LightenIntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "LinearBurn", LinearBurnCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "LinearDodge", LinearDodgeCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "LinearLight", LinearLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Luminize", LuminizeCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Mathematics", MathematicsCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "MinusDst", MinusDstCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "MinusSrc", MinusSrcCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Modulate", ModulateCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "ModulusAdd", ModulusAddCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "ModulusSubtract", ModulusSubtractCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Multiply", MultiplyCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "None", NoCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Out", OutCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Overlay", OverlayCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Over", OverCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "PegtopLight", PegtopLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "PinLight", PinLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Plus", PlusCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Replace", ReplaceCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Saturate", SaturateCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Screen", ScreenCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "SoftLight", SoftLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Src", SrcCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "SrcAtop", SrcAtopCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "SrcIn", SrcInCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "SrcOut", SrcOutCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "SrcOver", SrcOverCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Src", SrcCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "VividLight", VividLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Xor", XorCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Add", AddCompositeOp, UndefinedOptionFlag, MagickTrue }, /* deprecate */
+    { "Divide", DivideDstCompositeOp, UndefinedOptionFlag, MagickTrue }, /* deprecate */
+    { "Minus", MinusDstCompositeOp, UndefinedOptionFlag, MagickTrue }, /* deprecate */
+    { "Subtract", SubtractCompositeOp, UndefinedOptionFlag, MagickTrue }, /* deprecate */
+    { "Threshold", ThresholdCompositeOp, UndefinedOptionFlag, MagickTrue }, /* deprecate */
+    { (char *) NULL, UndefinedCompositeOp, UndefinedOptionFlag, MagickFalse }
   },
   CompressOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedCompression, MagickTrue },
-    { "B44", (ssize_t) B44Compression, MagickFalse },
-    { "B44A", (ssize_t) B44ACompression, MagickFalse },
-    { "BZip", (ssize_t) BZipCompression, MagickFalse },
-    { "DXT1", (ssize_t) DXT1Compression, MagickFalse },
-    { "DXT3", (ssize_t) DXT3Compression, MagickFalse },
-    { "DXT5", (ssize_t) DXT5Compression, MagickFalse },
-    { "Fax", (ssize_t) FaxCompression, MagickFalse },
-    { "Group4", (ssize_t) Group4Compression, MagickFalse },
-    { "JPEG", (ssize_t) JPEGCompression, MagickFalse },
-    { "JPEG2000", (ssize_t) JPEG2000Compression, MagickFalse },
-    { "Lossless", (ssize_t) LosslessJPEGCompression, MagickFalse },
-    { "LosslessJPEG", (ssize_t) LosslessJPEGCompression, MagickFalse },
-    { "LZMA", (ssize_t) LZMACompression, MagickFalse },
-    { "LZW", (ssize_t) LZWCompression, MagickFalse },
-    { "None", (ssize_t) NoCompression, MagickFalse },
-    { "Piz", (ssize_t) PizCompression, MagickFalse },
-    { "Pxr24", (ssize_t) Pxr24Compression, MagickFalse },
-    { "RLE", (ssize_t) RLECompression, MagickFalse },
-    { "Zip", (ssize_t) ZipCompression, MagickFalse },
-    { "RunlengthEncoded", (ssize_t) RLECompression, MagickFalse },
-    { "ZipS", (ssize_t) ZipSCompression, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedCompression, MagickFalse }
+    { "Undefined", UndefinedCompression, UndefinedOptionFlag, MagickTrue },
+    { "B44", B44Compression, UndefinedOptionFlag, MagickFalse },
+    { "B44A", B44ACompression, UndefinedOptionFlag, MagickFalse },
+    { "BZip", BZipCompression, UndefinedOptionFlag, MagickFalse },
+    { "DXT1", DXT1Compression, UndefinedOptionFlag, MagickFalse },
+    { "DXT3", DXT3Compression, UndefinedOptionFlag, MagickFalse },
+    { "DXT5", DXT5Compression, UndefinedOptionFlag, MagickFalse },
+    { "Fax", FaxCompression, UndefinedOptionFlag, MagickFalse },
+    { "Group4", Group4Compression, UndefinedOptionFlag, MagickFalse },
+    { "JPEG", JPEGCompression, UndefinedOptionFlag, MagickFalse },
+    { "JPEG2000", JPEG2000Compression, UndefinedOptionFlag, MagickFalse },
+    { "Lossless", LosslessJPEGCompression, UndefinedOptionFlag, MagickFalse },
+    { "LosslessJPEG", LosslessJPEGCompression, UndefinedOptionFlag, MagickFalse },
+    { "LZMA", LZMACompression, UndefinedOptionFlag, MagickFalse },
+    { "LZW", LZWCompression, UndefinedOptionFlag, MagickFalse },
+    { "None", NoCompression, UndefinedOptionFlag, MagickFalse },
+    { "Piz", PizCompression, UndefinedOptionFlag, MagickFalse },
+    { "Pxr24", Pxr24Compression, UndefinedOptionFlag, MagickFalse },
+    { "RLE", RLECompression, UndefinedOptionFlag, MagickFalse },
+    { "Zip", ZipCompression, UndefinedOptionFlag, MagickFalse },
+    { "RunlengthEncoded", RLECompression, UndefinedOptionFlag, MagickFalse },
+    { "ZipS", ZipSCompression, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedCompression, UndefinedOptionFlag, MagickFalse }
   },
   ColorspaceOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedColorspace, MagickTrue },
-    { "CMY", (ssize_t) CMYColorspace, MagickFalse },
-    { "CMYK", (ssize_t) CMYKColorspace, MagickFalse },
-    { "Gray", (ssize_t) GRAYColorspace, MagickFalse },
-    { "HSB", (ssize_t) HSBColorspace, MagickFalse },
-    { "HSL", (ssize_t) HSLColorspace, MagickFalse },
-    { "HWB", (ssize_t) HWBColorspace, MagickFalse },
-    { "Lab", (ssize_t) LabColorspace, MagickFalse },
-    { "Log", (ssize_t) LogColorspace, MagickFalse },
-    { "OHTA", (ssize_t) OHTAColorspace, MagickFalse },
-    { "Rec601Luma", (ssize_t) Rec601LumaColorspace, MagickFalse },
-    { "Rec601YCbCr", (ssize_t) Rec601YCbCrColorspace, MagickFalse },
-    { "Rec709Luma", (ssize_t) Rec709LumaColorspace, MagickFalse },
-    { "Rec709YCbCr", (ssize_t) Rec709YCbCrColorspace, MagickFalse },
-    { "RGB", (ssize_t) RGBColorspace, MagickFalse },
-    { "sRGB", (ssize_t) sRGBColorspace, MagickFalse },
-    { "Transparent", (ssize_t) TransparentColorspace, MagickFalse },
-    { "XYZ", (ssize_t) XYZColorspace, MagickFalse },
-    { "YCbCr", (ssize_t) YCbCrColorspace, MagickFalse },
-    { "YCC", (ssize_t) YCCColorspace, MagickFalse },
-    { "YIQ", (ssize_t) YIQColorspace, MagickFalse },
-    { "YPbPr", (ssize_t) YPbPrColorspace, MagickFalse },
-    { "YUV", (ssize_t) YUVColorspace, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedColorspace, MagickFalse }
+    { "Undefined", UndefinedColorspace, UndefinedOptionFlag, MagickTrue },
+    { "CMY", CMYColorspace, UndefinedOptionFlag, MagickFalse },
+    { "CMYK", CMYKColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Gray", GRAYColorspace, UndefinedOptionFlag, MagickFalse },
+    { "HSB", HSBColorspace, UndefinedOptionFlag, MagickFalse },
+    { "HSL", HSLColorspace, UndefinedOptionFlag, MagickFalse },
+    { "HWB", HWBColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Lab", LabColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Log", LogColorspace, UndefinedOptionFlag, MagickFalse },
+    { "OHTA", OHTAColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Rec601Luma", Rec601LumaColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Rec601YCbCr", Rec601YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Rec709Luma", Rec709LumaColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Rec709YCbCr", Rec709YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
+    { "RGB", RGBColorspace, UndefinedOptionFlag, MagickFalse },
+    { "sRGB", sRGBColorspace, UndefinedOptionFlag, MagickFalse },
+    { "Transparent", TransparentColorspace, UndefinedOptionFlag, MagickFalse },
+    { "XYZ", XYZColorspace, UndefinedOptionFlag, MagickFalse },
+    { "YCbCr", YCbCrColorspace, UndefinedOptionFlag, MagickFalse },
+    { "YCC", YCCColorspace, UndefinedOptionFlag, MagickFalse },
+    { "YIQ", YIQColorspace, UndefinedOptionFlag, MagickFalse },
+    { "YPbPr", YPbPrColorspace, UndefinedOptionFlag, MagickFalse },
+    { "YUV", YUVColorspace, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedColorspace, UndefinedOptionFlag, MagickFalse }
   },
   DataTypeOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedData, MagickTrue },
-    { "Byte", (ssize_t) ByteData, MagickFalse },
-    { "Long", (ssize_t) LongData, MagickFalse },
-    { "Short", (ssize_t) ShortData, MagickFalse },
-    { "String", (ssize_t) StringData, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedData, MagickFalse }
+    { "Undefined", UndefinedData, UndefinedOptionFlag, MagickTrue },
+    { "Byte", ByteData, UndefinedOptionFlag, MagickFalse },
+    { "Long", LongData, UndefinedOptionFlag, MagickFalse },
+    { "Short", ShortData, UndefinedOptionFlag, MagickFalse },
+    { "String", StringData, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedData, UndefinedOptionFlag, MagickFalse }
   },
   DecorateOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedDecoration, MagickTrue },
-    { "LineThrough", (ssize_t) LineThroughDecoration, MagickFalse },
-    { "None", (ssize_t) NoDecoration, MagickFalse },
-    { "Overline", (ssize_t) OverlineDecoration, MagickFalse },
-    { "Underline", (ssize_t) UnderlineDecoration, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedDecoration, MagickFalse }
+    { "Undefined", UndefinedDecoration, UndefinedOptionFlag, MagickTrue },
+    { "LineThrough", LineThroughDecoration, UndefinedOptionFlag, MagickFalse },
+    { "None", NoDecoration, UndefinedOptionFlag, MagickFalse },
+    { "Overline", OverlineDecoration, UndefinedOptionFlag, MagickFalse },
+    { "Underline", UnderlineDecoration, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedDecoration, UndefinedOptionFlag, MagickFalse }
   },
   DirectionOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedDirection, MagickTrue },
-    { "right-to-left", (ssize_t) RightToLeftDirection, MagickFalse },
-    { "left-to-right", (ssize_t) LeftToRightDirection, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedDirection, MagickFalse }
+    { "Undefined", UndefinedDirection, UndefinedOptionFlag, MagickTrue },
+    { "right-to-left", RightToLeftDirection, UndefinedOptionFlag, MagickFalse },
+    { "left-to-right", LeftToRightDirection, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedDirection, UndefinedOptionFlag, MagickFalse }
   },
   DisposeOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedDispose, MagickTrue },
-    { "Background", (ssize_t) BackgroundDispose, MagickFalse },
-    { "None", (ssize_t) NoneDispose, MagickFalse },
-    { "Previous", (ssize_t) PreviousDispose, MagickFalse },
-    { "Undefined", (ssize_t) UndefinedDispose, MagickFalse },
-    { "0", (ssize_t) UndefinedDispose, MagickFalse },
-    { "1", (ssize_t) NoneDispose, MagickFalse },
-    { "2", (ssize_t) BackgroundDispose, MagickFalse },
-    { "3", (ssize_t) PreviousDispose, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedDispose, MagickFalse }
+    { "Undefined", UndefinedDispose, UndefinedOptionFlag, MagickTrue },
+    { "Background", BackgroundDispose, UndefinedOptionFlag, MagickFalse },
+    { "None", NoneDispose, UndefinedOptionFlag, MagickFalse },
+    { "Previous", PreviousDispose, UndefinedOptionFlag, MagickFalse },
+    { "Undefined", UndefinedDispose, UndefinedOptionFlag, MagickFalse },
+    { "0", UndefinedDispose, UndefinedOptionFlag, MagickFalse },
+    { "1", NoneDispose, UndefinedOptionFlag, MagickFalse },
+    { "2", BackgroundDispose, UndefinedOptionFlag, MagickFalse },
+    { "3", PreviousDispose, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedDispose, UndefinedOptionFlag, MagickFalse }
   },
   DistortOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedDistortion, MagickTrue },
-    { "Affine", (ssize_t) AffineDistortion, MagickFalse },
-    { "AffineProjection", (ssize_t) AffineProjectionDistortion, MagickFalse },
-    { "ScaleRotateTranslate", (ssize_t) ScaleRotateTranslateDistortion, MagickFalse },
-    { "SRT", (ssize_t) ScaleRotateTranslateDistortion, MagickFalse },
-    { "Perspective", (ssize_t) PerspectiveDistortion, MagickFalse },
-    { "PerspectiveProjection", (ssize_t) PerspectiveProjectionDistortion, MagickFalse },
-    { "Bilinear", (ssize_t) BilinearForwardDistortion, MagickTrue },
-    { "BilinearForward", (ssize_t) BilinearForwardDistortion, MagickFalse },
-    { "BilinearReverse", (ssize_t) BilinearReverseDistortion, MagickFalse },
-    { "Polynomial", (ssize_t) PolynomialDistortion, MagickFalse },
-    { "Arc", (ssize_t) ArcDistortion, MagickFalse },
-    { "Polar", (ssize_t) PolarDistortion, MagickFalse },
-    { "DePolar", (ssize_t) DePolarDistortion, MagickFalse },
-    { "Barrel", (ssize_t) BarrelDistortion, MagickFalse },
-    { "BarrelInverse", (ssize_t) BarrelInverseDistortion, MagickFalse },
-    { "Shepards", (ssize_t) ShepardsDistortion, MagickFalse },
-    { "Resize", (ssize_t) ResizeDistortion, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedDistortion, MagickFalse }
+    { "Undefined", UndefinedDistortion, UndefinedOptionFlag, MagickTrue },
+    { "Affine", AffineDistortion, UndefinedOptionFlag, MagickFalse },
+    { "AffineProjection", AffineProjectionDistortion, UndefinedOptionFlag, MagickFalse },
+    { "ScaleRotateTranslate", ScaleRotateTranslateDistortion, UndefinedOptionFlag, MagickFalse },
+    { "SRT", ScaleRotateTranslateDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Perspective", PerspectiveDistortion, UndefinedOptionFlag, MagickFalse },
+    { "PerspectiveProjection", PerspectiveProjectionDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Bilinear", BilinearForwardDistortion, UndefinedOptionFlag, MagickTrue },
+    { "BilinearForward", BilinearForwardDistortion, UndefinedOptionFlag, MagickFalse },
+    { "BilinearReverse", BilinearReverseDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Polynomial", PolynomialDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Arc", ArcDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Polar", PolarDistortion, UndefinedOptionFlag, MagickFalse },
+    { "DePolar", DePolarDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Barrel", BarrelDistortion, UndefinedOptionFlag, MagickFalse },
+    { "BarrelInverse", BarrelInverseDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Shepards", ShepardsDistortion, UndefinedOptionFlag, MagickFalse },
+    { "Resize", ResizeDistortion, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedDistortion, UndefinedOptionFlag, MagickFalse }
   },
   DitherOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedDitherMethod, MagickTrue },
-    { "None", (ssize_t) NoDitherMethod, MagickFalse },
-    { "FloydSteinberg", (ssize_t) FloydSteinbergDitherMethod, MagickFalse },
-    { "Riemersma", (ssize_t) RiemersmaDitherMethod, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedEndian, MagickFalse }
+    { "Undefined", UndefinedDitherMethod, UndefinedOptionFlag, MagickTrue },
+    { "None", NoDitherMethod, UndefinedOptionFlag, MagickFalse },
+    { "FloydSteinberg", FloydSteinbergDitherMethod, UndefinedOptionFlag, MagickFalse },
+    { "Riemersma", RiemersmaDitherMethod, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedEndian, UndefinedOptionFlag, MagickFalse }
   },
   EndianOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedEndian, MagickTrue },
-    { "LSB", (ssize_t) LSBEndian, MagickFalse },
-    { "MSB", (ssize_t) MSBEndian, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedEndian, MagickFalse }
+    { "Undefined", UndefinedEndian, UndefinedOptionFlag, MagickTrue },
+    { "LSB", LSBEndian, UndefinedOptionFlag, MagickFalse },
+    { "MSB", MSBEndian, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedEndian, UndefinedOptionFlag, MagickFalse }
   },
   EvaluateOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedEvaluateOperator, MagickTrue },
-    { "Abs", (ssize_t) AbsEvaluateOperator, MagickFalse },
-    { "Add", (ssize_t) AddEvaluateOperator, MagickFalse },
-    { "AddModulus", (ssize_t) AddModulusEvaluateOperator, MagickFalse },
-    { "And", (ssize_t) AndEvaluateOperator, MagickFalse },
-    { "Cos", (ssize_t) CosineEvaluateOperator, MagickFalse },
-    { "Cosine", (ssize_t) CosineEvaluateOperator, MagickFalse },
-    { "Divide", (ssize_t) DivideEvaluateOperator, MagickFalse },
-    { "Exp", (ssize_t) ExponentialEvaluateOperator, MagickFalse },
-    { "Exponential", (ssize_t) ExponentialEvaluateOperator, MagickFalse },
-    { "GaussianNoise", (ssize_t) GaussianNoiseEvaluateOperator, MagickFalse },
-    { "ImpulseNoise", (ssize_t) ImpulseNoiseEvaluateOperator, MagickFalse },
-    { "LaplacianNoise", (ssize_t) LaplacianNoiseEvaluateOperator, MagickFalse },
-    { "LeftShift", (ssize_t) LeftShiftEvaluateOperator, MagickFalse },
-    { "Log", (ssize_t) LogEvaluateOperator, MagickFalse },
-    { "Max", (ssize_t) MaxEvaluateOperator, MagickFalse },
-    { "Mean", (ssize_t) MeanEvaluateOperator, MagickFalse },
-    { "Median", (ssize_t) MedianEvaluateOperator, MagickFalse },
-    { "Min", (ssize_t) MinEvaluateOperator, MagickFalse },
-    { "MultiplicativeNoise", (ssize_t) MultiplicativeNoiseEvaluateOperator, MagickFalse },
-    { "Multiply", (ssize_t) MultiplyEvaluateOperator, MagickFalse },
-    { "Or", (ssize_t) OrEvaluateOperator, MagickFalse },
-    { "PoissonNoise", (ssize_t) PoissonNoiseEvaluateOperator, MagickFalse },
-    { "Pow", (ssize_t) PowEvaluateOperator, MagickFalse },
-    { "RightShift", (ssize_t) RightShiftEvaluateOperator, MagickFalse },
-    { "Set", (ssize_t) SetEvaluateOperator, MagickFalse },
-    { "Sin", (ssize_t) SineEvaluateOperator, MagickFalse },
-    { "Sine", (ssize_t) SineEvaluateOperator, MagickFalse },
-    { "Subtract", (ssize_t) SubtractEvaluateOperator, MagickFalse },
-    { "Threshold", (ssize_t) ThresholdEvaluateOperator, MagickFalse },
-    { "ThresholdBlack", (ssize_t) ThresholdBlackEvaluateOperator, MagickFalse },
-    { "ThresholdWhite", (ssize_t) ThresholdWhiteEvaluateOperator, MagickFalse },
-    { "UniformNoise", (ssize_t) UniformNoiseEvaluateOperator, MagickFalse },
-    { "Xor", (ssize_t) XorEvaluateOperator, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedEvaluateOperator, MagickFalse }
+    { "Undefined", UndefinedEvaluateOperator, UndefinedOptionFlag, MagickTrue },
+    { "Abs", AbsEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Add", AddEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "AddModulus", AddModulusEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "And", AndEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Cos", CosineEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Cosine", CosineEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Divide", DivideEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Exp", ExponentialEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Exponential", ExponentialEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "GaussianNoise", GaussianNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "ImpulseNoise", ImpulseNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "LaplacianNoise", LaplacianNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "LeftShift", LeftShiftEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Log", LogEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Max", MaxEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Mean", MeanEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Median", MedianEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Min", MinEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "MultiplicativeNoise", MultiplicativeNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Multiply", MultiplyEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Or", OrEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "PoissonNoise", PoissonNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Pow", PowEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "RightShift", RightShiftEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Set", SetEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Sin", SineEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Sine", SineEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Subtract", SubtractEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Threshold", ThresholdEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "ThresholdBlack", ThresholdBlackEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "ThresholdWhite", ThresholdWhiteEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "UniformNoise", UniformNoiseEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { "Xor", XorEvaluateOperator, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedEvaluateOperator, UndefinedOptionFlag, MagickFalse }
   },
   FillRuleOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedRule, MagickTrue },
-    { "Evenodd", (ssize_t) EvenOddRule, MagickFalse },
-    { "NonZero", (ssize_t) NonZeroRule, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedRule, MagickFalse }
+    { "Undefined", UndefinedRule, UndefinedOptionFlag, MagickTrue },
+    { "Evenodd", EvenOddRule, UndefinedOptionFlag, MagickFalse },
+    { "NonZero", NonZeroRule, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedRule, UndefinedOptionFlag, MagickFalse }
   },
   FilterOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedFilter, MagickTrue },
-    { "Bartlett", (ssize_t) BartlettFilter, MagickFalse },
-    { "Blackman", (ssize_t) BlackmanFilter, MagickFalse },
-    { "Bohman", (ssize_t) BohmanFilter, MagickFalse },
-    { "Box", (ssize_t) BoxFilter, MagickFalse },
-    { "Catrom", (ssize_t) CatromFilter, MagickFalse },
-    { "Cubic", (ssize_t) CubicFilter, MagickFalse },
-    { "Gaussian", (ssize_t) GaussianFilter, MagickFalse },
-    { "Hamming", (ssize_t) HammingFilter, MagickFalse },
-    { "Hanning", (ssize_t) HanningFilter, MagickFalse },
-    { "Hermite", (ssize_t) HermiteFilter, MagickFalse },
-    { "Jinc", (ssize_t) JincFilter, MagickFalse },
-    { "Kaiser", (ssize_t) KaiserFilter, MagickFalse },
-    { "Lagrange", (ssize_t) LagrangeFilter, MagickFalse },
-    { "Lanczos", (ssize_t) LanczosFilter, MagickFalse },
-    { "LanczosSharp", (ssize_t) LanczosSharpFilter, MagickFalse },
-    { "Lanczos2", (ssize_t) Lanczos2Filter, MagickFalse },
-    { "Lanczos2Sharp", (ssize_t) Lanczos2SharpFilter, MagickFalse },
-    { "Mitchell", (ssize_t) MitchellFilter, MagickFalse },
-    { "Parzen", (ssize_t) ParzenFilter, MagickFalse },
-    { "Point", (ssize_t) PointFilter, MagickFalse },
-    { "Quadratic", (ssize_t) QuadraticFilter, MagickFalse },
-    { "Robidoux", (ssize_t) RobidouxFilter, MagickFalse },
-    { "Sinc", (ssize_t) SincFilter, MagickFalse },
-    { "SincFast", (ssize_t) SincFastFilter, MagickFalse },
-    { "Triangle", (ssize_t) TriangleFilter, MagickFalse },
-    { "Welsh", (ssize_t) WelshFilter, MagickFalse },
+    { "Undefined", UndefinedFilter, UndefinedOptionFlag, MagickTrue },
+    { "Bartlett", BartlettFilter, UndefinedOptionFlag, MagickFalse },
+    { "Blackman", BlackmanFilter, UndefinedOptionFlag, MagickFalse },
+    { "Bohman", BohmanFilter, UndefinedOptionFlag, MagickFalse },
+    { "Box", BoxFilter, UndefinedOptionFlag, MagickFalse },
+    { "Catrom", CatromFilter, UndefinedOptionFlag, MagickFalse },
+    { "Cubic", CubicFilter, UndefinedOptionFlag, MagickFalse },
+    { "Gaussian", GaussianFilter, UndefinedOptionFlag, MagickFalse },
+    { "Hamming", HammingFilter, UndefinedOptionFlag, MagickFalse },
+    { "Hanning", HanningFilter, UndefinedOptionFlag, MagickFalse },
+    { "Hermite", HermiteFilter, UndefinedOptionFlag, MagickFalse },
+    { "Jinc", JincFilter, UndefinedOptionFlag, MagickFalse },
+    { "Kaiser", KaiserFilter, UndefinedOptionFlag, MagickFalse },
+    { "Lagrange", LagrangeFilter, UndefinedOptionFlag, MagickFalse },
+    { "Lanczos", LanczosFilter, UndefinedOptionFlag, MagickFalse },
+    { "LanczosSharp", LanczosSharpFilter, UndefinedOptionFlag, MagickFalse },
+    { "Lanczos2", Lanczos2Filter, UndefinedOptionFlag, MagickFalse },
+    { "Lanczos2Sharp", Lanczos2SharpFilter, UndefinedOptionFlag, MagickFalse },
+    { "Mitchell", MitchellFilter, UndefinedOptionFlag, MagickFalse },
+    { "Parzen", ParzenFilter, UndefinedOptionFlag, MagickFalse },
+    { "Point", PointFilter, UndefinedOptionFlag, MagickFalse },
+    { "Quadratic", QuadraticFilter, UndefinedOptionFlag, MagickFalse },
+    { "Robidoux", RobidouxFilter, UndefinedOptionFlag, MagickFalse },
+    { "Sinc", SincFilter, UndefinedOptionFlag, MagickFalse },
+    { "SincFast", SincFastFilter, UndefinedOptionFlag, MagickFalse },
+    { "Triangle", TriangleFilter, UndefinedOptionFlag, MagickFalse },
+    { "Welsh", WelshFilter, UndefinedOptionFlag, MagickFalse },
     /* For backward compatibility - must be after "Jinc" */
-    { "Bessel", (ssize_t) JincFilter, MagickTrue },
-    { (char *) NULL, (ssize_t) UndefinedFilter, MagickFalse }
+    { "Bessel", JincFilter, UndefinedOptionFlag, MagickTrue },
+    { (char *) NULL, UndefinedFilter, UndefinedOptionFlag, MagickFalse }
   },
   FunctionOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedFunction, MagickTrue },
-    { "Polynomial", (ssize_t) PolynomialFunction, MagickFalse },
-    { "Sinusoid", (ssize_t) SinusoidFunction, MagickFalse },
-    { "ArcSin", (ssize_t) ArcsinFunction, MagickFalse },
-    { "ArcTan", (ssize_t) ArctanFunction, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedFunction, MagickFalse }
+    { "Undefined", UndefinedFunction, UndefinedOptionFlag, MagickTrue },
+    { "Polynomial", PolynomialFunction, UndefinedOptionFlag, MagickFalse },
+    { "Sinusoid", SinusoidFunction, UndefinedOptionFlag, MagickFalse },
+    { "ArcSin", ArcsinFunction, UndefinedOptionFlag, MagickFalse },
+    { "ArcTan", ArctanFunction, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedFunction, UndefinedOptionFlag, MagickFalse }
   },
   GravityOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedGravity, MagickTrue },
-    { "None", (ssize_t) UndefinedGravity, MagickFalse },
-    { "Center", (ssize_t) CenterGravity, MagickFalse },
-    { "East", (ssize_t) EastGravity, MagickFalse },
-    { "Forget", (ssize_t) ForgetGravity, MagickFalse },
-    { "NorthEast", (ssize_t) NorthEastGravity, MagickFalse },
-    { "North", (ssize_t) NorthGravity, MagickFalse },
-    { "NorthWest", (ssize_t) NorthWestGravity, MagickFalse },
-    { "SouthEast", (ssize_t) SouthEastGravity, MagickFalse },
-    { "South", (ssize_t) SouthGravity, MagickFalse },
-    { "SouthWest", (ssize_t) SouthWestGravity, MagickFalse },
-    { "West", (ssize_t) WestGravity, MagickFalse },
-    { "Static", (ssize_t) StaticGravity, MagickFalse },
-    { (char *) NULL, UndefinedGravity, MagickFalse }
+    { "Undefined", UndefinedGravity, UndefinedOptionFlag, MagickTrue },
+    { "None", UndefinedGravity, UndefinedOptionFlag, MagickFalse },
+    { "Center", CenterGravity, UndefinedOptionFlag, MagickFalse },
+    { "East", EastGravity, UndefinedOptionFlag, MagickFalse },
+    { "Forget", ForgetGravity, UndefinedOptionFlag, MagickFalse },
+    { "NorthEast", NorthEastGravity, UndefinedOptionFlag, MagickFalse },
+    { "North", NorthGravity, UndefinedOptionFlag, MagickFalse },
+    { "NorthWest", NorthWestGravity, UndefinedOptionFlag, MagickFalse },
+    { "SouthEast", SouthEastGravity, UndefinedOptionFlag, MagickFalse },
+    { "South", SouthGravity, UndefinedOptionFlag, MagickFalse },
+    { "SouthWest", SouthWestGravity, UndefinedOptionFlag, MagickFalse },
+    { "West", WestGravity, UndefinedOptionFlag, MagickFalse },
+    { "Static", StaticGravity, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedGravity, UndefinedOptionFlag, MagickFalse }
   },
-#if 0
-  ImageListOptions[] =
-  {
-    { "affinity", MagickTrue, MagickFalse },
-    { "append", MagickTrue, MagickFalse },
-    { "average", MagickTrue, MagickFalse },
-    { "clut", MagickTrue, MagickFalse },
-    { "coalesce", MagickTrue, MagickFalse },
-    { "combine", MagickTrue, MagickFalse },
-    { "composite", MagickTrue, MagickFalse },
-    { "crop", MagickTrue, MagickFalse },
-    { "debug", MagickTrue, MagickFalse },
-    { "deconstruct", MagickTrue, MagickFalse },
-    { "delete", MagickTrue, MagickFalse },
-    { "duplicate", MagickTrue, MagickFalse },
-    { "evaluate-sequence", MagickTrue, MagickFalse },
-    { "fft", MagickTrue, MagickFalse },
-    { "flatten", MagickTrue, MagickFalse },
-    { "fx", MagickTrue, MagickFalse },
-    { "hald-clut", MagickTrue, MagickFalse },
-    { "identify", MagickTrue, MagickFalse },
-    { "ift", MagickTrue, MagickFalse },
-    { "insert", MagickTrue, MagickFalse },
-    { "layers", MagickTrue, MagickFalse },
-    { "limit", MagickTrue, MagickFalse },
-    { "map", MagickTrue, MagickFalse },
-    { "maximum", MagickTrue, MagickFalse },
-    { "minimum", MagickTrue, MagickFalse },
-    { "morph", MagickTrue, MagickFalse },
-    { "mosaic", MagickTrue, MagickFalse },
-    { "optimize", MagickTrue, MagickFalse },
-    { "print", MagickTrue, MagickFalse },
-    { "process", MagickTrue, MagickFalse },
-    { "quiet", MagickTrue, MagickFalse },
-    { "separate", MagickTrue, MagickFalse },
-    { "smush", MagickTrue, MagickFalse },
-    { "swap", MagickTrue, MagickFalse },
-    { "write", MagickTrue, MagickFalse },
-    { (char *) NULL, MagickFalse, MagickFalse }
-  },
-#endif
   IntentOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedIntent, MagickTrue },
-    { "Absolute", (ssize_t) AbsoluteIntent, MagickFalse },
-    { "Perceptual", (ssize_t) PerceptualIntent, MagickFalse },
-    { "Relative", (ssize_t) RelativeIntent, MagickFalse },
-    { "Saturation", (ssize_t) SaturationIntent, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedIntent, MagickFalse }
+    { "Undefined", UndefinedIntent, UndefinedOptionFlag, MagickTrue },
+    { "Absolute", AbsoluteIntent, UndefinedOptionFlag, MagickFalse },
+    { "Perceptual", PerceptualIntent, UndefinedOptionFlag, MagickFalse },
+    { "Relative", RelativeIntent, UndefinedOptionFlag, MagickFalse },
+    { "Saturation", SaturationIntent, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedIntent, UndefinedOptionFlag, MagickFalse }
   },
   InterlaceOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedInterlace, MagickTrue },
-    { "Line", (ssize_t) LineInterlace, MagickFalse },
-    { "None", (ssize_t) NoInterlace, MagickFalse },
-    { "Plane", (ssize_t) PlaneInterlace, MagickFalse },
-    { "Partition", (ssize_t) PartitionInterlace, MagickFalse },
-    { "GIF", (ssize_t) GIFInterlace, MagickFalse },
-    { "JPEG", (ssize_t) JPEGInterlace, MagickFalse },
-    { "PNG", (ssize_t) PNGInterlace, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedInterlace, MagickFalse }
+    { "Undefined", UndefinedInterlace, UndefinedOptionFlag, MagickTrue },
+    { "Line", LineInterlace, UndefinedOptionFlag, MagickFalse },
+    { "None", NoInterlace, UndefinedOptionFlag, MagickFalse },
+    { "Plane", PlaneInterlace, UndefinedOptionFlag, MagickFalse },
+    { "Partition", PartitionInterlace, UndefinedOptionFlag, MagickFalse },
+    { "GIF", GIFInterlace, UndefinedOptionFlag, MagickFalse },
+    { "JPEG", JPEGInterlace, UndefinedOptionFlag, MagickFalse },
+    { "PNG", PNGInterlace, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedInterlace, UndefinedOptionFlag, MagickFalse }
   },
   InterpolateOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedInterpolatePixel, MagickTrue },
-    { "Average", (ssize_t) AverageInterpolatePixel, MagickFalse },
-    { "Bicubic", (ssize_t) BicubicInterpolatePixel, MagickFalse },
-    { "Bilinear", (ssize_t) BilinearInterpolatePixel, MagickFalse },
-    { "filter", (ssize_t) FilterInterpolatePixel, MagickFalse },
-    { "Integer", (ssize_t) IntegerInterpolatePixel, MagickFalse },
-    { "Mesh", (ssize_t) MeshInterpolatePixel, MagickFalse },
-    { "NearestNeighbor", (ssize_t) NearestNeighborInterpolatePixel, MagickFalse },
-    { "Spline", (ssize_t) SplineInterpolatePixel, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedInterpolatePixel, MagickFalse }
+    { "Undefined", UndefinedInterpolatePixel, UndefinedOptionFlag, MagickTrue },
+    { "Average", AverageInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "Bicubic", BicubicInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "Bilinear", BilinearInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "filter", FilterInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "Integer", IntegerInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "Mesh", MeshInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "NearestNeighbor", NearestNeighborInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { "Spline", SplineInterpolatePixel, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedInterpolatePixel, UndefinedOptionFlag, MagickFalse }
   },
   KernelOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedKernel, MagickTrue },
-    { "Unity", (ssize_t) UnityKernel, MagickFalse },
-    { "Gaussian", (ssize_t) GaussianKernel, MagickFalse },
-    { "DoG", (ssize_t) DoGKernel, MagickFalse },
-    { "LoG", (ssize_t) LoGKernel, MagickFalse },
-    { "Blur", (ssize_t) BlurKernel, MagickFalse },
-    { "Comet", (ssize_t) CometKernel, MagickFalse },
-    { "Laplacian", (ssize_t) LaplacianKernel, MagickFalse },
-    { "Sobel", (ssize_t) SobelKernel, MagickFalse },
-    { "FreiChen", (ssize_t) FreiChenKernel, MagickFalse },
-    { "Roberts", (ssize_t) RobertsKernel, MagickFalse },
-    { "Prewitt", (ssize_t) PrewittKernel, MagickFalse },
-    { "Compass", (ssize_t) CompassKernel, MagickFalse },
-    { "Kirsch", (ssize_t) KirschKernel, MagickFalse },
-    { "Diamond", (ssize_t) DiamondKernel, MagickFalse },
-    { "Square", (ssize_t) SquareKernel, MagickFalse },
-    { "Rectangle", (ssize_t) RectangleKernel, MagickFalse },
-    { "Disk", (ssize_t) DiskKernel, MagickFalse },
-    { "Octagon", (ssize_t) OctagonKernel, MagickFalse },
-    { "Plus", (ssize_t) PlusKernel, MagickFalse },
-    { "Cross", (ssize_t) CrossKernel, MagickFalse },
-    { "Ring", (ssize_t) RingKernel, MagickFalse },
-    { "Peaks", (ssize_t) PeaksKernel, MagickFalse },
-    { "Edges", (ssize_t) EdgesKernel, MagickFalse },
-    { "Corners", (ssize_t) CornersKernel, MagickFalse },
-    { "Diagonals", (ssize_t) DiagonalsKernel, MagickFalse },
-    { "ThinDiagonals", (ssize_t) DiagonalsKernel, MagickTrue }, /* depreciated */
-    { "LineEnds", (ssize_t) LineEndsKernel, MagickFalse },
-    { "LineJunctions", (ssize_t) LineJunctionsKernel, MagickFalse },
-    { "Ridges", (ssize_t) RidgesKernel, MagickFalse },
-    { "ConvexHull", (ssize_t) ConvexHullKernel, MagickFalse },
-    { "ThinSe", (ssize_t) ThinSEKernel, MagickFalse },
-    { "Skeleton", (ssize_t) SkeletonKernel, MagickFalse },
-    { "Chebyshev", (ssize_t) ChebyshevKernel, MagickFalse },
-    { "Manhattan", (ssize_t) ManhattanKernel, MagickFalse },
-    { "Octagonal", (ssize_t) OctagonalKernel, MagickFalse },
-    { "Euclidean", (ssize_t) EuclideanKernel, MagickFalse },
-    { "User Defined", (ssize_t) UserDefinedKernel, MagickTrue }, /* internal */
-    { (char *) NULL, (ssize_t) UndefinedKernel, MagickFalse }
+    { "Undefined", UndefinedKernel, UndefinedOptionFlag, MagickTrue },
+    { "Unity", UnityKernel, UndefinedOptionFlag, MagickFalse },
+    { "Gaussian", GaussianKernel, UndefinedOptionFlag, MagickFalse },
+    { "DoG", DoGKernel, UndefinedOptionFlag, MagickFalse },
+    { "LoG", LoGKernel, UndefinedOptionFlag, MagickFalse },
+    { "Blur", BlurKernel, UndefinedOptionFlag, MagickFalse },
+    { "Comet", CometKernel, UndefinedOptionFlag, MagickFalse },
+    { "Laplacian", LaplacianKernel, UndefinedOptionFlag, MagickFalse },
+    { "Sobel", SobelKernel, UndefinedOptionFlag, MagickFalse },
+    { "FreiChen", FreiChenKernel, UndefinedOptionFlag, MagickFalse },
+    { "Roberts", RobertsKernel, UndefinedOptionFlag, MagickFalse },
+    { "Prewitt", PrewittKernel, UndefinedOptionFlag, MagickFalse },
+    { "Compass", CompassKernel, UndefinedOptionFlag, MagickFalse },
+    { "Kirsch", KirschKernel, UndefinedOptionFlag, MagickFalse },
+    { "Diamond", DiamondKernel, UndefinedOptionFlag, MagickFalse },
+    { "Square", SquareKernel, UndefinedOptionFlag, MagickFalse },
+    { "Rectangle", RectangleKernel, UndefinedOptionFlag, MagickFalse },
+    { "Disk", DiskKernel, UndefinedOptionFlag, MagickFalse },
+    { "Octagon", OctagonKernel, UndefinedOptionFlag, MagickFalse },
+    { "Plus", PlusKernel, UndefinedOptionFlag, MagickFalse },
+    { "Cross", CrossKernel, UndefinedOptionFlag, MagickFalse },
+    { "Ring", RingKernel, UndefinedOptionFlag, MagickFalse },
+    { "Peaks", PeaksKernel, UndefinedOptionFlag, MagickFalse },
+    { "Edges", EdgesKernel, UndefinedOptionFlag, MagickFalse },
+    { "Corners", CornersKernel, UndefinedOptionFlag, MagickFalse },
+    { "Diagonals", DiagonalsKernel, UndefinedOptionFlag, MagickFalse },
+    { "ThinDiagonals", DiagonalsKernel, UndefinedOptionFlag, MagickTrue }, /* depreciated */
+    { "LineEnds", LineEndsKernel, UndefinedOptionFlag, MagickFalse },
+    { "LineJunctions", LineJunctionsKernel, UndefinedOptionFlag, MagickFalse },
+    { "Ridges", RidgesKernel, UndefinedOptionFlag, MagickFalse },
+    { "ConvexHull", ConvexHullKernel, UndefinedOptionFlag, MagickFalse },
+    { "ThinSe", ThinSEKernel, UndefinedOptionFlag, MagickFalse },
+    { "Skeleton", SkeletonKernel, UndefinedOptionFlag, MagickFalse },
+    { "Chebyshev", ChebyshevKernel, UndefinedOptionFlag, MagickFalse },
+    { "Manhattan", ManhattanKernel, UndefinedOptionFlag, MagickFalse },
+    { "Octagonal", OctagonalKernel, UndefinedOptionFlag, MagickFalse },
+    { "Euclidean", EuclideanKernel, UndefinedOptionFlag, MagickFalse },
+    { "User Defined", UserDefinedKernel, UndefinedOptionFlag, MagickTrue }, /* internal */
+    { (char *) NULL, UndefinedKernel, UndefinedOptionFlag, MagickFalse }
   },
   LayerOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedLayer, MagickTrue },
-    { "Coalesce", (ssize_t) CoalesceLayer, MagickFalse },
-    { "CompareAny", (ssize_t) CompareAnyLayer, MagickFalse },
-    { "CompareClear", (ssize_t) CompareClearLayer, MagickFalse },
-    { "CompareOverlay", (ssize_t) CompareOverlayLayer, MagickFalse },
-    { "Dispose", (ssize_t) DisposeLayer, MagickFalse },
-    { "Optimize", (ssize_t) OptimizeLayer, MagickFalse },
-    { "OptimizeFrame", (ssize_t) OptimizeImageLayer, MagickFalse },
-    { "OptimizePlus", (ssize_t) OptimizePlusLayer, MagickFalse },
-    { "OptimizeTransparency", (ssize_t) OptimizeTransLayer, MagickFalse },
-    { "RemoveDups", (ssize_t) RemoveDupsLayer, MagickFalse },
-    { "RemoveZero", (ssize_t) RemoveZeroLayer, MagickFalse },
-    { "Composite", (ssize_t) CompositeLayer, MagickFalse },
-    { "Merge", (ssize_t) MergeLayer, MagickFalse },
-    { "Flatten", (ssize_t) FlattenLayer, MagickFalse },
-    { "Mosaic", (ssize_t) MosaicLayer, MagickFalse },
-    { "TrimBounds", (ssize_t) TrimBoundsLayer, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedLayer, MagickFalse }
+    { "Undefined", UndefinedLayer, UndefinedOptionFlag, MagickTrue },
+    { "Coalesce", CoalesceLayer, UndefinedOptionFlag, MagickFalse },
+    { "CompareAny", CompareAnyLayer, UndefinedOptionFlag, MagickFalse },
+    { "CompareClear", CompareClearLayer, UndefinedOptionFlag, MagickFalse },
+    { "CompareOverlay", CompareOverlayLayer, UndefinedOptionFlag, MagickFalse },
+    { "Dispose", DisposeLayer, UndefinedOptionFlag, MagickFalse },
+    { "Optimize", OptimizeLayer, UndefinedOptionFlag, MagickFalse },
+    { "OptimizeFrame", OptimizeImageLayer, UndefinedOptionFlag, MagickFalse },
+    { "OptimizePlus", OptimizePlusLayer, UndefinedOptionFlag, MagickFalse },
+    { "OptimizeTransparency", OptimizeTransLayer, UndefinedOptionFlag, MagickFalse },
+    { "RemoveDups", RemoveDupsLayer, UndefinedOptionFlag, MagickFalse },
+    { "RemoveZero", RemoveZeroLayer, UndefinedOptionFlag, MagickFalse },
+    { "Composite", CompositeLayer, UndefinedOptionFlag, MagickFalse },
+    { "Merge", MergeLayer, UndefinedOptionFlag, MagickFalse },
+    { "Flatten", FlattenLayer, UndefinedOptionFlag, MagickFalse },
+    { "Mosaic", MosaicLayer, UndefinedOptionFlag, MagickFalse },
+    { "TrimBounds", TrimBoundsLayer, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedLayer, UndefinedOptionFlag, MagickFalse }
   },
   LineCapOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedCap, MagickTrue },
-    { "Butt", (ssize_t) ButtCap, MagickFalse },
-    { "Round", (ssize_t) RoundCap, MagickFalse },
-    { "Square", (ssize_t) SquareCap, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedCap, MagickFalse }
+    { "Undefined", UndefinedCap, UndefinedOptionFlag, MagickTrue },
+    { "Butt", ButtCap, UndefinedOptionFlag, MagickFalse },
+    { "Round", RoundCap, UndefinedOptionFlag, MagickFalse },
+    { "Square", SquareCap, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedCap, UndefinedOptionFlag, MagickFalse }
   },
   LineJoinOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedJoin, MagickTrue },
-    { "Bevel", (ssize_t) BevelJoin, MagickFalse },
-    { "Miter", (ssize_t) MiterJoin, MagickFalse },
-    { "Round", (ssize_t) RoundJoin, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedJoin, MagickFalse }
+    { "Undefined", UndefinedJoin, UndefinedOptionFlag, MagickTrue },
+    { "Bevel", BevelJoin, UndefinedOptionFlag, MagickFalse },
+    { "Miter", MiterJoin, UndefinedOptionFlag, MagickFalse },
+    { "Round", RoundJoin, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedJoin, UndefinedOptionFlag, MagickFalse }
   },
   ListOptions[] =
   {
-    { "Align", (ssize_t) MagickAlignOptions, MagickFalse },
-    { "Alpha", (ssize_t) MagickAlphaOptions, MagickFalse },
-    { "Boolean", (ssize_t) MagickBooleanOptions, MagickFalse },
-    { "Channel", (ssize_t) MagickChannelOptions, MagickFalse },
-    { "Class", (ssize_t) MagickClassOptions, MagickFalse },
-    { "ClipPath", (ssize_t) MagickClipPathOptions, MagickFalse },
-    { "Coder", (ssize_t) MagickCoderOptions, MagickFalse },
-    { "Color", (ssize_t) MagickColorOptions, MagickFalse },
-    { "Colorspace", (ssize_t) MagickColorspaceOptions, MagickFalse },
-    { "Command", (ssize_t) MagickCommandOptions, MagickFalse },
-    { "Compose", (ssize_t) MagickComposeOptions, MagickFalse },
-    { "Compress", (ssize_t) MagickCompressOptions, MagickFalse },
-    { "Configure", (ssize_t) MagickConfigureOptions, MagickFalse },
-    { "DataType", (ssize_t) MagickDataTypeOptions, MagickFalse },
-    { "Debug", (ssize_t) MagickDebugOptions, MagickFalse },
-    { "Decoration", (ssize_t) MagickDecorateOptions, MagickFalse },
-    { "Delegate", (ssize_t) MagickDelegateOptions, MagickFalse },
-    { "Direction", (ssize_t) MagickDirectionOptions, MagickFalse },
-    { "Dispose", (ssize_t) MagickDisposeOptions, MagickFalse },
-    { "Distort", (ssize_t) MagickDistortOptions, MagickFalse },
-    { "Dither", (ssize_t) MagickDitherOptions, MagickFalse },
-    { "Endian", (ssize_t) MagickEndianOptions, MagickFalse },
-    { "Evaluate", (ssize_t) MagickEvaluateOptions, MagickFalse },
-    { "FillRule", (ssize_t) MagickFillRuleOptions, MagickFalse },
-    { "Filter", (ssize_t) MagickFilterOptions, MagickFalse },
-    { "Font", (ssize_t) MagickFontOptions, MagickFalse },
-    { "Format", (ssize_t) MagickFormatOptions, MagickFalse },
-    { "Function", (ssize_t) MagickFunctionOptions, MagickFalse },
-    { "Gravity", (ssize_t) MagickGravityOptions, MagickFalse },
-/*  { "ImageList", (ssize_t) MagickImageListOptions, MagickFalse }, */
-    { "Intent", (ssize_t) MagickIntentOptions, MagickFalse },
-    { "Interlace", (ssize_t) MagickInterlaceOptions, MagickFalse },
-    { "Interpolate", (ssize_t) MagickInterpolateOptions, MagickFalse },
-    { "Kernel", (ssize_t) MagickKernelOptions, MagickFalse },
-    { "Layers", (ssize_t) MagickLayerOptions, MagickFalse },
-    { "LineCap", (ssize_t) MagickLineCapOptions, MagickFalse },
-    { "LineJoin", (ssize_t) MagickLineJoinOptions, MagickFalse },
-    { "List", (ssize_t) MagickListOptions, MagickFalse },
-    { "Locale", (ssize_t) MagickLocaleOptions, MagickFalse },
-    { "LogEvent", (ssize_t) MagickLogEventOptions, MagickFalse },
-    { "Log", (ssize_t) MagickLogOptions, MagickFalse },
-    { "Magic", (ssize_t) MagickMagicOptions, MagickFalse },
-    { "Method", (ssize_t) MagickMethodOptions, MagickFalse },
-    { "Metric", (ssize_t) MagickMetricOptions, MagickFalse },
-    { "Mime", (ssize_t) MagickMimeOptions, MagickFalse },
-    { "Mode", (ssize_t) MagickModeOptions, MagickFalse },
-    { "Morphology", (ssize_t) MagickMorphologyOptions, MagickFalse },
-    { "Module", (ssize_t) MagickModuleOptions, MagickFalse },
-    { "Noise", (ssize_t) MagickNoiseOptions, MagickFalse },
-    { "Orientation", (ssize_t) MagickOrientationOptions, MagickFalse },
-    { "Policy", (ssize_t) MagickPolicyOptions, MagickFalse },
-    { "PolicyDomain", (ssize_t) MagickPolicyDomainOptions, MagickFalse },
-    { "PolicyRights", (ssize_t) MagickPolicyRightsOptions, MagickFalse },
-    { "Preview", (ssize_t) MagickPreviewOptions, MagickFalse },
-    { "Primitive", (ssize_t) MagickPrimitiveOptions, MagickFalse },
-    { "QuantumFormat", (ssize_t) MagickQuantumFormatOptions, MagickFalse },
-    { "Resource", (ssize_t) MagickResourceOptions, MagickFalse },
-    { "SparseColor", (ssize_t) MagickSparseColorOptions, MagickFalse },
-    { "Statistic", (ssize_t) MagickStatisticOptions, MagickFalse },
-    { "Storage", (ssize_t) MagickStorageOptions, MagickFalse },
-    { "Stretch", (ssize_t) MagickStretchOptions, MagickFalse },
-    { "Style", (ssize_t) MagickStyleOptions, MagickFalse },
-    { "Threshold", (ssize_t) MagickThresholdOptions, MagickFalse },
-    { "Type", (ssize_t) MagickTypeOptions, MagickFalse },
-    { "Units", (ssize_t) MagickResolutionOptions, MagickFalse },
-    { "Undefined", (ssize_t) MagickUndefinedOptions, MagickTrue },
-    { "Validate", (ssize_t) MagickValidateOptions, MagickFalse },
-    { "VirtualPixel", (ssize_t) MagickVirtualPixelOptions, MagickFalse },
-    { (char *) NULL, (ssize_t) MagickUndefinedOptions, MagickFalse }
+    { "Align", MagickAlignOptions, UndefinedOptionFlag, MagickFalse },
+    { "Alpha", MagickAlphaOptions, UndefinedOptionFlag, MagickFalse },
+    { "Boolean", MagickBooleanOptions, UndefinedOptionFlag, MagickFalse },
+    { "Channel", MagickChannelOptions, UndefinedOptionFlag, MagickFalse },
+    { "Class", MagickClassOptions, UndefinedOptionFlag, MagickFalse },
+    { "ClipPath", MagickClipPathOptions, UndefinedOptionFlag, MagickFalse },
+    { "Coder", MagickCoderOptions, UndefinedOptionFlag, MagickFalse },
+    { "Color", MagickColorOptions, UndefinedOptionFlag, MagickFalse },
+    { "Colorspace", MagickColorspaceOptions, UndefinedOptionFlag, MagickFalse },
+    { "Command", MagickCommandOptions, UndefinedOptionFlag, MagickFalse },
+    { "Compose", MagickComposeOptions, UndefinedOptionFlag, MagickFalse },
+    { "Compress", MagickCompressOptions, UndefinedOptionFlag, MagickFalse },
+    { "Configure", MagickConfigureOptions, UndefinedOptionFlag, MagickFalse },
+    { "DataType", MagickDataTypeOptions, UndefinedOptionFlag, MagickFalse },
+    { "Debug", MagickDebugOptions, UndefinedOptionFlag, MagickFalse },
+    { "Decoration", MagickDecorateOptions, UndefinedOptionFlag, MagickFalse },
+    { "Delegate", MagickDelegateOptions, UndefinedOptionFlag, MagickFalse },
+    { "Direction", MagickDirectionOptions, UndefinedOptionFlag, MagickFalse },
+    { "Dispose", MagickDisposeOptions, UndefinedOptionFlag, MagickFalse },
+    { "Distort", MagickDistortOptions, UndefinedOptionFlag, MagickFalse },
+    { "Dither", MagickDitherOptions, UndefinedOptionFlag, MagickFalse },
+    { "Endian", MagickEndianOptions, UndefinedOptionFlag, MagickFalse },
+    { "Evaluate", MagickEvaluateOptions, UndefinedOptionFlag, MagickFalse },
+    { "FillRule", MagickFillRuleOptions, UndefinedOptionFlag, MagickFalse },
+    { "Filter", MagickFilterOptions, UndefinedOptionFlag, MagickFalse },
+    { "Font", MagickFontOptions, UndefinedOptionFlag, MagickFalse },
+    { "Format", MagickFormatOptions, UndefinedOptionFlag, MagickFalse },
+    { "Function", MagickFunctionOptions, UndefinedOptionFlag, MagickFalse },
+    { "Gravity", MagickGravityOptions, UndefinedOptionFlag, MagickFalse },
+/*  { "ImageList", MagickImageListOptions, UndefinedOptionFlag, MagickFalse }, */
+    { "Intent", MagickIntentOptions, UndefinedOptionFlag, MagickFalse },
+    { "Interlace", MagickInterlaceOptions, UndefinedOptionFlag, MagickFalse },
+    { "Interpolate", MagickInterpolateOptions, UndefinedOptionFlag, MagickFalse },
+    { "Kernel", MagickKernelOptions, UndefinedOptionFlag, MagickFalse },
+    { "Layers", MagickLayerOptions, UndefinedOptionFlag, MagickFalse },
+    { "LineCap", MagickLineCapOptions, UndefinedOptionFlag, MagickFalse },
+    { "LineJoin", MagickLineJoinOptions, UndefinedOptionFlag, MagickFalse },
+    { "List", MagickListOptions, UndefinedOptionFlag, MagickFalse },
+    { "Locale", MagickLocaleOptions, UndefinedOptionFlag, MagickFalse },
+    { "LogEvent", MagickLogEventOptions, UndefinedOptionFlag, MagickFalse },
+    { "Log", MagickLogOptions, UndefinedOptionFlag, MagickFalse },
+    { "Magic", MagickMagicOptions, UndefinedOptionFlag, MagickFalse },
+    { "Method", MagickMethodOptions, UndefinedOptionFlag, MagickFalse },
+    { "Metric", MagickMetricOptions, UndefinedOptionFlag, MagickFalse },
+    { "Mime", MagickMimeOptions, UndefinedOptionFlag, MagickFalse },
+    { "Mode", MagickModeOptions, UndefinedOptionFlag, MagickFalse },
+    { "Morphology", MagickMorphologyOptions, UndefinedOptionFlag, MagickFalse },
+    { "Module", MagickModuleOptions, UndefinedOptionFlag, MagickFalse },
+    { "Noise", MagickNoiseOptions, UndefinedOptionFlag, MagickFalse },
+    { "Orientation", MagickOrientationOptions, UndefinedOptionFlag, MagickFalse },
+    { "Policy", MagickPolicyOptions, UndefinedOptionFlag, MagickFalse },
+    { "PolicyDomain", MagickPolicyDomainOptions, UndefinedOptionFlag, MagickFalse },
+    { "PolicyRights", MagickPolicyRightsOptions, UndefinedOptionFlag, MagickFalse },
+    { "Preview", MagickPreviewOptions, UndefinedOptionFlag, MagickFalse },
+    { "Primitive", MagickPrimitiveOptions, UndefinedOptionFlag, MagickFalse },
+    { "QuantumFormat", MagickQuantumFormatOptions, UndefinedOptionFlag, MagickFalse },
+    { "Resource", MagickResourceOptions, UndefinedOptionFlag, MagickFalse },
+    { "SparseColor", MagickSparseColorOptions, UndefinedOptionFlag, MagickFalse },
+    { "Statistic", MagickStatisticOptions, UndefinedOptionFlag, MagickFalse },
+    { "Storage", MagickStorageOptions, UndefinedOptionFlag, MagickFalse },
+    { "Stretch", MagickStretchOptions, UndefinedOptionFlag, MagickFalse },
+    { "Style", MagickStyleOptions, UndefinedOptionFlag, MagickFalse },
+    { "Threshold", MagickThresholdOptions, UndefinedOptionFlag, MagickFalse },
+    { "Type", MagickTypeOptions, UndefinedOptionFlag, MagickFalse },
+    { "Units", MagickResolutionOptions, UndefinedOptionFlag, MagickFalse },
+    { "Undefined", MagickUndefinedOptions, UndefinedOptionFlag, MagickTrue },
+    { "Validate", MagickValidateOptions, UndefinedOptionFlag, MagickFalse },
+    { "VirtualPixel", MagickVirtualPixelOptions, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, MagickUndefinedOptions, UndefinedOptionFlag, MagickFalse }
   },
   LogEventOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedEvents, MagickTrue },
-    { "All", (ssize_t) (AllEvents &~ TraceEvent), MagickFalse },
-    { "Annotate", (ssize_t) AnnotateEvent, MagickFalse },
-    { "Blob", (ssize_t) BlobEvent, MagickFalse },
-    { "Cache", (ssize_t) CacheEvent, MagickFalse },
-    { "Coder", (ssize_t) CoderEvent, MagickFalse },
-    { "Configure", (ssize_t) ConfigureEvent, MagickFalse },
-    { "Deprecate", (ssize_t) DeprecateEvent, MagickFalse },
-    { "Draw", (ssize_t) DrawEvent, MagickFalse },
-    { "Exception", (ssize_t) ExceptionEvent, MagickFalse },
-    { "Locale", (ssize_t) LocaleEvent, MagickFalse },
-    { "Module", (ssize_t) ModuleEvent, MagickFalse },
-    { "None", (ssize_t) NoEvents, MagickFalse },
-    { "Policy", (ssize_t) PolicyEvent, MagickFalse },
-    { "Resource", (ssize_t) ResourceEvent, MagickFalse },
-    { "Trace", (ssize_t) TraceEvent, MagickFalse },
-    { "Transform", (ssize_t) TransformEvent, MagickFalse },
-    { "User", (ssize_t) UserEvent, MagickFalse },
-    { "Wand", (ssize_t) WandEvent, MagickFalse },
-    { "X11", (ssize_t) X11Event, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedEvents, MagickFalse }
+    { "Undefined", UndefinedEvents, UndefinedOptionFlag, MagickTrue },
+    { "All", (AllEvents &~ TraceEvent), UndefinedOptionFlag, MagickFalse },
+    { "Annotate", AnnotateEvent, UndefinedOptionFlag, MagickFalse },
+    { "Blob", BlobEvent, UndefinedOptionFlag, MagickFalse },
+    { "Cache", CacheEvent, UndefinedOptionFlag, MagickFalse },
+    { "Coder", CoderEvent, UndefinedOptionFlag, MagickFalse },
+    { "Configure", ConfigureEvent, UndefinedOptionFlag, MagickFalse },
+    { "Deprecate", DeprecateEvent, UndefinedOptionFlag, MagickFalse },
+    { "Draw", DrawEvent, UndefinedOptionFlag, MagickFalse },
+    { "Exception", ExceptionEvent, UndefinedOptionFlag, MagickFalse },
+    { "Locale", LocaleEvent, UndefinedOptionFlag, MagickFalse },
+    { "Module", ModuleEvent, UndefinedOptionFlag, MagickFalse },
+    { "None", NoEvents, UndefinedOptionFlag, MagickFalse },
+    { "Policy", PolicyEvent, UndefinedOptionFlag, MagickFalse },
+    { "Resource", ResourceEvent, UndefinedOptionFlag, MagickFalse },
+    { "Trace", TraceEvent, UndefinedOptionFlag, MagickFalse },
+    { "Transform", TransformEvent, UndefinedOptionFlag, MagickFalse },
+    { "User", UserEvent, UndefinedOptionFlag, MagickFalse },
+    { "Wand", WandEvent, UndefinedOptionFlag, MagickFalse },
+    { "X11", X11Event, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedEvents, UndefinedOptionFlag, MagickFalse }
   },
   MetricOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedMetric, MagickTrue },
-    { "AE", (ssize_t) AbsoluteErrorMetric, MagickFalse },
-    { "Fuzz", (ssize_t) FuzzErrorMetric, MagickFalse },
-    { "MAE", (ssize_t) MeanAbsoluteErrorMetric, MagickFalse },
-    { "MEPP", (ssize_t) MeanErrorPerPixelMetric, MagickFalse },
-    { "MSE", (ssize_t) MeanSquaredErrorMetric, MagickFalse },
-    { "NCC", (ssize_t) NormalizedCrossCorrelationErrorMetric, MagickFalse },
-    { "PAE", (ssize_t) PeakAbsoluteErrorMetric, MagickFalse },
-    { "PSNR", (ssize_t) PeakSignalToNoiseRatioMetric, MagickFalse },
-    { "RMSE", (ssize_t) RootMeanSquaredErrorMetric, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedMetric, MagickFalse }
+    { "Undefined", UndefinedMetric, UndefinedOptionFlag, MagickTrue },
+    { "AE", AbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { "Fuzz", FuzzErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { "MAE", MeanAbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { "MEPP", MeanErrorPerPixelMetric, UndefinedOptionFlag, MagickFalse },
+    { "MSE", MeanSquaredErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { "NCC", NormalizedCrossCorrelationErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { "PAE", PeakAbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { "PSNR", PeakSignalToNoiseRatioMetric, UndefinedOptionFlag, MagickFalse },
+    { "RMSE", RootMeanSquaredErrorMetric, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedMetric, UndefinedOptionFlag, MagickFalse }
   },
   MethodOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedMethod, MagickTrue },
-    { "FillToBorder", (ssize_t) FillToBorderMethod, MagickFalse },
-    { "Floodfill", (ssize_t) FloodfillMethod, MagickFalse },
-    { "Point", (ssize_t) PointMethod, MagickFalse },
-    { "Replace", (ssize_t) ReplaceMethod, MagickFalse },
-    { "Reset", (ssize_t) ResetMethod, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedMethod, MagickFalse }
+    { "Undefined", UndefinedMethod, UndefinedOptionFlag, MagickTrue },
+    { "FillToBorder", FillToBorderMethod, UndefinedOptionFlag, MagickFalse },
+    { "Floodfill", FloodfillMethod, UndefinedOptionFlag, MagickFalse },
+    { "Point", PointMethod, UndefinedOptionFlag, MagickFalse },
+    { "Replace", ReplaceMethod, UndefinedOptionFlag, MagickFalse },
+    { "Reset", ResetMethod, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedMethod, UndefinedOptionFlag, MagickFalse }
   },
   ModeOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedMode, MagickTrue },
-    { "Concatenate", (ssize_t) ConcatenateMode, MagickFalse },
-    { "Frame", (ssize_t) FrameMode, MagickFalse },
-    { "Unframe", (ssize_t) UnframeMode, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedMode, MagickFalse }
+    { "Undefined", UndefinedMode, UndefinedOptionFlag, MagickTrue },
+    { "Concatenate", ConcatenateMode, UndefinedOptionFlag, MagickFalse },
+    { "Frame", FrameMode, UndefinedOptionFlag, MagickFalse },
+    { "Unframe", UnframeMode, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedMode, UndefinedOptionFlag, MagickFalse }
   },
   MorphologyOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedMorphology, MagickTrue },
-    { "Correlate", (ssize_t) CorrelateMorphology, MagickFalse },
-    { "Convolve", (ssize_t) ConvolveMorphology, MagickFalse },
-    { "Dilate", (ssize_t) DilateMorphology, MagickFalse },
-    { "Erode", (ssize_t) ErodeMorphology, MagickFalse },
-    { "Close", (ssize_t) CloseMorphology, MagickFalse },
-    { "Open", (ssize_t) OpenMorphology, MagickFalse },
-    { "DilateIntensity", (ssize_t) DilateIntensityMorphology, MagickFalse },
-    { "ErodeIntensity", (ssize_t) ErodeIntensityMorphology, MagickFalse },
-    { "CloseIntensity", (ssize_t) CloseIntensityMorphology, MagickFalse },
-    { "OpenIntensity", (ssize_t) OpenIntensityMorphology, MagickFalse },
-    { "DilateI", (ssize_t) DilateIntensityMorphology, MagickFalse },
-    { "ErodeI", (ssize_t) ErodeIntensityMorphology, MagickFalse },
-    { "CloseI", (ssize_t) CloseIntensityMorphology, MagickFalse },
-    { "OpenI", (ssize_t) OpenIntensityMorphology, MagickFalse },
-    { "Smooth", (ssize_t) SmoothMorphology, MagickFalse },
-    { "EdgeOut", (ssize_t) EdgeOutMorphology, MagickFalse },
-    { "EdgeIn", (ssize_t) EdgeInMorphology, MagickFalse },
-    { "Edge", (ssize_t) EdgeMorphology, MagickFalse },
-    { "TopHat", (ssize_t) TopHatMorphology, MagickFalse },
-    { "BottomHat", (ssize_t) BottomHatMorphology, MagickFalse },
-    { "Distance", (ssize_t) DistanceMorphology, MagickFalse },
-    { "Hmt", (ssize_t) HitAndMissMorphology, MagickFalse },
-    { "HitNMiss", (ssize_t) HitAndMissMorphology, MagickFalse },
-    { "HitAndMiss", (ssize_t) HitAndMissMorphology, MagickFalse },
-    { "Thinning", (ssize_t) ThinningMorphology, MagickFalse },
-    { "Thicken", (ssize_t) ThickenMorphology, MagickFalse },
-    { "Voronoi", (ssize_t) VoronoiMorphology, MagickTrue },
-    { (char *) NULL, (ssize_t) UndefinedMorphology, MagickFalse }
+    { "Undefined", UndefinedMorphology, UndefinedOptionFlag, MagickTrue },
+    { "Correlate", CorrelateMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Convolve", ConvolveMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Dilate", DilateMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Erode", ErodeMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Close", CloseMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Open", OpenMorphology, UndefinedOptionFlag, MagickFalse },
+    { "DilateIntensity", DilateIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "ErodeIntensity", ErodeIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "CloseIntensity", CloseIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "OpenIntensity", OpenIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "DilateI", DilateIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "ErodeI", ErodeIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "CloseI", CloseIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "OpenI", OpenIntensityMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Smooth", SmoothMorphology, UndefinedOptionFlag, MagickFalse },
+    { "EdgeOut", EdgeOutMorphology, UndefinedOptionFlag, MagickFalse },
+    { "EdgeIn", EdgeInMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Edge", EdgeMorphology, UndefinedOptionFlag, MagickFalse },
+    { "TopHat", TopHatMorphology, UndefinedOptionFlag, MagickFalse },
+    { "BottomHat", BottomHatMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Distance", DistanceMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Hmt", HitAndMissMorphology, UndefinedOptionFlag, MagickFalse },
+    { "HitNMiss", HitAndMissMorphology, UndefinedOptionFlag, MagickFalse },
+    { "HitAndMiss", HitAndMissMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Thinning", ThinningMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Thicken", ThickenMorphology, UndefinedOptionFlag, MagickFalse },
+    { "Voronoi", VoronoiMorphology, UndefinedOptionFlag, MagickTrue },
+    { (char *) NULL, UndefinedMorphology, UndefinedOptionFlag, MagickFalse }
   },
   NoiseOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedNoise, MagickTrue },
-    { "Gaussian", (ssize_t) (ssize_t) GaussianNoise, MagickFalse },
-    { "Impulse", (ssize_t) ImpulseNoise, MagickFalse },
-    { "Laplacian", (ssize_t) LaplacianNoise, MagickFalse },
-    { "Multiplicative", (ssize_t) MultiplicativeGaussianNoise, MagickFalse },
-    { "Poisson", (ssize_t) PoissonNoise, MagickFalse },
-    { "Random", (ssize_t) RandomNoise, MagickFalse },
-    { "Uniform", (ssize_t) UniformNoise, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedNoise, MagickFalse }
+    { "Undefined", UndefinedNoise, UndefinedOptionFlag, MagickTrue },
+    { "Gaussian", GaussianNoise, UndefinedOptionFlag, MagickFalse },
+    { "Impulse", ImpulseNoise, UndefinedOptionFlag, MagickFalse },
+    { "Laplacian", LaplacianNoise, UndefinedOptionFlag, MagickFalse },
+    { "Multiplicative", MultiplicativeGaussianNoise, UndefinedOptionFlag, MagickFalse },
+    { "Poisson", PoissonNoise, UndefinedOptionFlag, MagickFalse },
+    { "Random", RandomNoise, UndefinedOptionFlag, MagickFalse },
+    { "Uniform", UniformNoise, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedNoise, UndefinedOptionFlag, MagickFalse }
   },
   OrientationOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedOrientation, MagickTrue },
-    { "TopLeft", (ssize_t) TopLeftOrientation, MagickFalse },
-    { "TopRight", (ssize_t) TopRightOrientation, MagickFalse },
-    { "BottomRight", (ssize_t) BottomRightOrientation, MagickFalse },
-    { "BottomLeft", (ssize_t) BottomLeftOrientation, MagickFalse },
-    { "LeftTop", (ssize_t) LeftTopOrientation, MagickFalse },
-    { "RightTop", (ssize_t) RightTopOrientation, MagickFalse },
-    { "RightBottom", (ssize_t) RightBottomOrientation, MagickFalse },
-    { "LeftBottom", (ssize_t) LeftBottomOrientation, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedOrientation, MagickFalse }
+    { "Undefined", UndefinedOrientation, UndefinedOptionFlag, MagickTrue },
+    { "TopLeft", TopLeftOrientation, UndefinedOptionFlag, MagickFalse },
+    { "TopRight", TopRightOrientation, UndefinedOptionFlag, MagickFalse },
+    { "BottomRight", BottomRightOrientation, UndefinedOptionFlag, MagickFalse },
+    { "BottomLeft", BottomLeftOrientation, UndefinedOptionFlag, MagickFalse },
+    { "LeftTop", LeftTopOrientation, UndefinedOptionFlag, MagickFalse },
+    { "RightTop", RightTopOrientation, UndefinedOptionFlag, MagickFalse },
+    { "RightBottom", RightBottomOrientation, UndefinedOptionFlag, MagickFalse },
+    { "LeftBottom", LeftBottomOrientation, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedOrientation, UndefinedOptionFlag, MagickFalse }
   },
   PolicyDomainOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedPolicyDomain, MagickTrue },
-    { "Coder", (ssize_t) CoderPolicyDomain, MagickFalse },
-    { "Delegate", (ssize_t) DelegatePolicyDomain, MagickFalse },
-    { "Filter", (ssize_t) FilterPolicyDomain, MagickFalse },
-    { "Path", (ssize_t) PathPolicyDomain, MagickFalse },
-    { "Resource", (ssize_t) ResourcePolicyDomain, MagickFalse },
-    { "System", (ssize_t) SystemPolicyDomain, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedPolicyDomain, MagickFalse }
+    { "Undefined", UndefinedPolicyDomain, UndefinedOptionFlag, MagickTrue },
+    { "Coder", CoderPolicyDomain, UndefinedOptionFlag, MagickFalse },
+    { "Delegate", DelegatePolicyDomain, UndefinedOptionFlag, MagickFalse },
+    { "Filter", FilterPolicyDomain, UndefinedOptionFlag, MagickFalse },
+    { "Path", PathPolicyDomain, UndefinedOptionFlag, MagickFalse },
+    { "Resource", ResourcePolicyDomain, UndefinedOptionFlag, MagickFalse },
+    { "System", SystemPolicyDomain, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedPolicyDomain, UndefinedOptionFlag, MagickFalse }
   },
   PolicyRightsOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedPolicyRights, MagickTrue },
-    { "None", (ssize_t) NoPolicyRights, MagickFalse },
-    { "Read", (ssize_t) ReadPolicyRights, MagickFalse },
-    { "Write", (ssize_t) WritePolicyRights, MagickFalse },
-    { "Execute", (ssize_t) ExecutePolicyRights, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedPolicyRights, MagickFalse }
+    { "Undefined", UndefinedPolicyRights, UndefinedOptionFlag, MagickTrue },
+    { "None", NoPolicyRights, UndefinedOptionFlag, MagickFalse },
+    { "Read", ReadPolicyRights, UndefinedOptionFlag, MagickFalse },
+    { "Write", WritePolicyRights, UndefinedOptionFlag, MagickFalse },
+    { "Execute", ExecutePolicyRights, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedPolicyRights, UndefinedOptionFlag, MagickFalse }
   },
   PreviewOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedPreview, MagickTrue },
-    { "AddNoise", (ssize_t) AddNoisePreview, MagickFalse },
-    { "Blur", (ssize_t) BlurPreview, MagickFalse },
-    { "Brightness", (ssize_t) BrightnessPreview, MagickFalse },
-    { "Charcoal", (ssize_t) CharcoalDrawingPreview, MagickFalse },
-    { "Despeckle", (ssize_t) DespecklePreview, MagickFalse },
-    { "Dull", (ssize_t) DullPreview, MagickFalse },
-    { "EdgeDetect", (ssize_t) EdgeDetectPreview, MagickFalse },
-    { "Gamma", (ssize_t) GammaPreview, MagickFalse },
-    { "Grayscale", (ssize_t) GrayscalePreview, MagickFalse },
-    { "Hue", (ssize_t) HuePreview, MagickFalse },
-    { "Implode", (ssize_t) ImplodePreview, MagickFalse },
-    { "JPEG", (ssize_t) JPEGPreview, MagickFalse },
-    { "OilPaint", (ssize_t) OilPaintPreview, MagickFalse },
-    { "Quantize", (ssize_t) QuantizePreview, MagickFalse },
-    { "Raise", (ssize_t) RaisePreview, MagickFalse },
-    { "ReduceNoise", (ssize_t) ReduceNoisePreview, MagickFalse },
-    { "Roll", (ssize_t) RollPreview, MagickFalse },
-    { "Rotate", (ssize_t) RotatePreview, MagickFalse },
-    { "Saturation", (ssize_t) SaturationPreview, MagickFalse },
-    { "Segment", (ssize_t) SegmentPreview, MagickFalse },
-    { "Shade", (ssize_t) ShadePreview, MagickFalse },
-    { "Sharpen", (ssize_t) SharpenPreview, MagickFalse },
-    { "Shear", (ssize_t) ShearPreview, MagickFalse },
-    { "Solarize", (ssize_t) SolarizePreview, MagickFalse },
-    { "Spiff", (ssize_t) SpiffPreview, MagickFalse },
-    { "Spread", (ssize_t) SpreadPreview, MagickFalse },
-    { "Swirl", (ssize_t) SwirlPreview, MagickFalse },
-    { "Threshold", (ssize_t) ThresholdPreview, MagickFalse },
-    { "Wave", (ssize_t) WavePreview, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedPreview, MagickFalse }
+    { "Undefined", UndefinedPreview, UndefinedOptionFlag, MagickTrue },
+    { "AddNoise", AddNoisePreview, UndefinedOptionFlag, MagickFalse },
+    { "Blur", BlurPreview, UndefinedOptionFlag, MagickFalse },
+    { "Brightness", BrightnessPreview, UndefinedOptionFlag, MagickFalse },
+    { "Charcoal", CharcoalDrawingPreview, UndefinedOptionFlag, MagickFalse },
+    { "Despeckle", DespecklePreview, UndefinedOptionFlag, MagickFalse },
+    { "Dull", DullPreview, UndefinedOptionFlag, MagickFalse },
+    { "EdgeDetect", EdgeDetectPreview, UndefinedOptionFlag, MagickFalse },
+    { "Gamma", GammaPreview, UndefinedOptionFlag, MagickFalse },
+    { "Grayscale", GrayscalePreview, UndefinedOptionFlag, MagickFalse },
+    { "Hue", HuePreview, UndefinedOptionFlag, MagickFalse },
+    { "Implode", ImplodePreview, UndefinedOptionFlag, MagickFalse },
+    { "JPEG", JPEGPreview, UndefinedOptionFlag, MagickFalse },
+    { "OilPaint", OilPaintPreview, UndefinedOptionFlag, MagickFalse },
+    { "Quantize", QuantizePreview, UndefinedOptionFlag, MagickFalse },
+    { "Raise", RaisePreview, UndefinedOptionFlag, MagickFalse },
+    { "ReduceNoise", ReduceNoisePreview, UndefinedOptionFlag, MagickFalse },
+    { "Roll", RollPreview, UndefinedOptionFlag, MagickFalse },
+    { "Rotate", RotatePreview, UndefinedOptionFlag, MagickFalse },
+    { "Saturation", SaturationPreview, UndefinedOptionFlag, MagickFalse },
+    { "Segment", SegmentPreview, UndefinedOptionFlag, MagickFalse },
+    { "Shade", ShadePreview, UndefinedOptionFlag, MagickFalse },
+    { "Sharpen", SharpenPreview, UndefinedOptionFlag, MagickFalse },
+    { "Shear", ShearPreview, UndefinedOptionFlag, MagickFalse },
+    { "Solarize", SolarizePreview, UndefinedOptionFlag, MagickFalse },
+    { "Spiff", SpiffPreview, UndefinedOptionFlag, MagickFalse },
+    { "Spread", SpreadPreview, UndefinedOptionFlag, MagickFalse },
+    { "Swirl", SwirlPreview, UndefinedOptionFlag, MagickFalse },
+    { "Threshold", ThresholdPreview, UndefinedOptionFlag, MagickFalse },
+    { "Wave", WavePreview, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedPreview, UndefinedOptionFlag, MagickFalse }
   },
   PrimitiveOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedPrimitive, MagickTrue },
-    { "Arc", (ssize_t) ArcPrimitive, MagickFalse },
-    { "Bezier", (ssize_t) BezierPrimitive, MagickFalse },
-    { "Circle", (ssize_t) CirclePrimitive, MagickFalse },
-    { "Color", (ssize_t) ColorPrimitive, MagickFalse },
-    { "Ellipse", (ssize_t) EllipsePrimitive, MagickFalse },
-    { "Image", (ssize_t) ImagePrimitive, MagickFalse },
-    { "Line", (ssize_t) LinePrimitive, MagickFalse },
-    { "Matte", (ssize_t) MattePrimitive, MagickFalse },
-    { "Path", (ssize_t) PathPrimitive, MagickFalse },
-    { "Point", (ssize_t) PointPrimitive, MagickFalse },
-    { "Polygon", (ssize_t) PolygonPrimitive, MagickFalse },
-    { "Polyline", (ssize_t) PolylinePrimitive, MagickFalse },
-    { "Rectangle", (ssize_t) RectanglePrimitive, MagickFalse },
-    { "RoundRectangle", (ssize_t) RoundRectanglePrimitive, MagickFalse },
-    { "Text", (ssize_t) TextPrimitive, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedPrimitive, MagickFalse }
+    { "Undefined", UndefinedPrimitive, UndefinedOptionFlag, MagickTrue },
+    { "Arc", ArcPrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Bezier", BezierPrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Circle", CirclePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Color", ColorPrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Ellipse", EllipsePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Image", ImagePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Line", LinePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Matte", MattePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Path", PathPrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Point", PointPrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Polygon", PolygonPrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Polyline", PolylinePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Rectangle", RectanglePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "RoundRectangle", RoundRectanglePrimitive, UndefinedOptionFlag, MagickFalse },
+    { "Text", TextPrimitive, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedPrimitive, UndefinedOptionFlag, MagickFalse }
   },
   QuantumFormatOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedQuantumFormat, MagickTrue },
-    { "FloatingPoint", (ssize_t) FloatingPointQuantumFormat, MagickFalse },
-    { "Signed", (ssize_t) SignedQuantumFormat, MagickFalse },
-    { "Unsigned", (ssize_t) UnsignedQuantumFormat, MagickFalse },
-    { (char *) NULL, (ssize_t) FloatingPointQuantumFormat, MagickFalse }
+    { "Undefined", UndefinedQuantumFormat, UndefinedOptionFlag, MagickTrue },
+    { "FloatingPoint", FloatingPointQuantumFormat, UndefinedOptionFlag, MagickFalse },
+    { "Signed", SignedQuantumFormat, UndefinedOptionFlag, MagickFalse },
+    { "Unsigned", UnsignedQuantumFormat, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, FloatingPointQuantumFormat, UndefinedOptionFlag, MagickFalse }
   },
   ResolutionOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedResolution, MagickTrue },
-    { "PixelsPerInch", (ssize_t) PixelsPerInchResolution, MagickFalse },
-    { "PixelsPerCentimeter", (ssize_t) PixelsPerCentimeterResolution, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedResolution, MagickFalse }
+    { "Undefined", UndefinedResolution, UndefinedOptionFlag, MagickTrue },
+    { "PixelsPerInch", PixelsPerInchResolution, UndefinedOptionFlag, MagickFalse },
+    { "PixelsPerCentimeter", PixelsPerCentimeterResolution, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedResolution, UndefinedOptionFlag, MagickFalse }
   },
   ResourceOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedResource, MagickTrue },
-    { "Area", (ssize_t) AreaResource, MagickFalse },
-    { "Disk", (ssize_t) DiskResource, MagickFalse },
-    { "File", (ssize_t) FileResource, MagickFalse },
-    { "Map", (ssize_t) MapResource, MagickFalse },
-    { "Memory", (ssize_t) MemoryResource, MagickFalse },
-    { "Thread", (ssize_t) ThreadResource, MagickFalse },
-    { "Time", (ssize_t) TimeResource, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedResource, MagickFalse }
+    { "Undefined", UndefinedResource, UndefinedOptionFlag, MagickTrue },
+    { "Area", AreaResource, UndefinedOptionFlag, MagickFalse },
+    { "Disk", DiskResource, UndefinedOptionFlag, MagickFalse },
+    { "File", FileResource, UndefinedOptionFlag, MagickFalse },
+    { "Map", MapResource, UndefinedOptionFlag, MagickFalse },
+    { "Memory", MemoryResource, UndefinedOptionFlag, MagickFalse },
+    { "Thread", ThreadResource, UndefinedOptionFlag, MagickFalse },
+    { "Time", TimeResource, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedResource, UndefinedOptionFlag, MagickFalse }
   },
   SparseColorOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedDistortion, MagickTrue },
-    { "Barycentric", (ssize_t) BarycentricColorInterpolate, MagickFalse },
-    { "Bilinear", (ssize_t) BilinearColorInterpolate, MagickFalse },
-    { "Shepards", (ssize_t) ShepardsColorInterpolate, MagickFalse },
-    { "Voronoi", (ssize_t) VoronoiColorInterpolate, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedResource, MagickFalse }
+    { "Undefined", UndefinedDistortion, UndefinedOptionFlag, MagickTrue },
+    { "Barycentric", BarycentricColorInterpolate, UndefinedOptionFlag, MagickFalse },
+    { "Bilinear", BilinearColorInterpolate, UndefinedOptionFlag, MagickFalse },
+    { "Shepards", ShepardsColorInterpolate, UndefinedOptionFlag, MagickFalse },
+    { "Voronoi", VoronoiColorInterpolate, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedResource, UndefinedOptionFlag, MagickFalse }
   },
   StatisticOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedStatistic, MagickTrue },
-    { "Gradient", (ssize_t) GradientStatistic, MagickFalse },
-    { "Maximum", (ssize_t) MaximumStatistic, MagickFalse },
-    { "Mean", (ssize_t) MeanStatistic, MagickFalse },
-    { "Median", (ssize_t) MedianStatistic, MagickFalse },
-    { "Minimum", (ssize_t) MinimumStatistic, MagickFalse },
-    { "Mode", (ssize_t) ModeStatistic, MagickFalse },
-    { "Nonpeak", (ssize_t) NonpeakStatistic, MagickFalse },
-    { "StandardDeviation", (ssize_t) StandardDeviationStatistic, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedMethod, MagickFalse }
+    { "Undefined", UndefinedStatistic, UndefinedOptionFlag, MagickTrue },
+    { "Gradient", GradientStatistic, UndefinedOptionFlag, MagickFalse },
+    { "Maximum", MaximumStatistic, UndefinedOptionFlag, MagickFalse },
+    { "Mean", MeanStatistic, UndefinedOptionFlag, MagickFalse },
+    { "Median", MedianStatistic, UndefinedOptionFlag, MagickFalse },
+    { "Minimum", MinimumStatistic, UndefinedOptionFlag, MagickFalse },
+    { "Mode", ModeStatistic, UndefinedOptionFlag, MagickFalse },
+    { "Nonpeak", NonpeakStatistic, UndefinedOptionFlag, MagickFalse },
+    { "StandardDeviation", StandardDeviationStatistic, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedMethod, UndefinedOptionFlag, MagickFalse }
   },
   StorageOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedPixel, MagickTrue },
-    { "Char", (ssize_t) CharPixel, MagickFalse },
-    { "Double", (ssize_t) DoublePixel, MagickFalse },
-    { "Float", (ssize_t) FloatPixel, MagickFalse },
-    { "Integer", (ssize_t) IntegerPixel, MagickFalse },
-    { "Long", (ssize_t) LongPixel, MagickFalse },
-    { "Quantum", (ssize_t) QuantumPixel, MagickFalse },
-    { "Short", (ssize_t) ShortPixel, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedResource, MagickFalse }
+    { "Undefined", UndefinedPixel, UndefinedOptionFlag, MagickTrue },
+    { "Char", CharPixel, UndefinedOptionFlag, MagickFalse },
+    { "Double", DoublePixel, UndefinedOptionFlag, MagickFalse },
+    { "Float", FloatPixel, UndefinedOptionFlag, MagickFalse },
+    { "Integer", IntegerPixel, UndefinedOptionFlag, MagickFalse },
+    { "Long", LongPixel, UndefinedOptionFlag, MagickFalse },
+    { "Quantum", QuantumPixel, UndefinedOptionFlag, MagickFalse },
+    { "Short", ShortPixel, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedResource, UndefinedOptionFlag, MagickFalse }
   },
   StretchOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedStretch, MagickTrue },
-    { "Any", (ssize_t) AnyStretch, MagickFalse },
-    { "Condensed", (ssize_t) CondensedStretch, MagickFalse },
-    { "Expanded", (ssize_t) ExpandedStretch, MagickFalse },
-    { "ExtraCondensed", (ssize_t) ExtraCondensedStretch, MagickFalse },
-    { "ExtraExpanded", (ssize_t) ExtraExpandedStretch, MagickFalse },
-    { "Normal", (ssize_t) NormalStretch, MagickFalse },
-    { "SemiCondensed", (ssize_t) SemiCondensedStretch, MagickFalse },
-    { "SemiExpanded", (ssize_t) SemiExpandedStretch, MagickFalse },
-    { "UltraCondensed", (ssize_t) UltraCondensedStretch, MagickFalse },
-    { "UltraExpanded", (ssize_t) UltraExpandedStretch, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedStretch, MagickFalse }
+    { "Undefined", UndefinedStretch, UndefinedOptionFlag, MagickTrue },
+    { "Any", AnyStretch, UndefinedOptionFlag, MagickFalse },
+    { "Condensed", CondensedStretch, UndefinedOptionFlag, MagickFalse },
+    { "Expanded", ExpandedStretch, UndefinedOptionFlag, MagickFalse },
+    { "ExtraCondensed", ExtraCondensedStretch, UndefinedOptionFlag, MagickFalse },
+    { "ExtraExpanded", ExtraExpandedStretch, UndefinedOptionFlag, MagickFalse },
+    { "Normal", NormalStretch, UndefinedOptionFlag, MagickFalse },
+    { "SemiCondensed", SemiCondensedStretch, UndefinedOptionFlag, MagickFalse },
+    { "SemiExpanded", SemiExpandedStretch, UndefinedOptionFlag, MagickFalse },
+    { "UltraCondensed", UltraCondensedStretch, UndefinedOptionFlag, MagickFalse },
+    { "UltraExpanded", UltraExpandedStretch, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedStretch, UndefinedOptionFlag, MagickFalse }
   },
   StyleOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedStyle, MagickTrue },
-    { "Any", (ssize_t) AnyStyle, MagickFalse },
-    { "Italic", (ssize_t) ItalicStyle, MagickFalse },
-    { "Normal", (ssize_t) NormalStyle, MagickFalse },
-    { "Oblique", (ssize_t) ObliqueStyle, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedStyle, MagickFalse }
+    { "Undefined", UndefinedStyle, UndefinedOptionFlag, MagickTrue },
+    { "Any", AnyStyle, UndefinedOptionFlag, MagickFalse },
+    { "Italic", ItalicStyle, UndefinedOptionFlag, MagickFalse },
+    { "Normal", NormalStyle, UndefinedOptionFlag, MagickFalse },
+    { "Oblique", ObliqueStyle, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedStyle, UndefinedOptionFlag, MagickFalse }
   },
   TypeOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedType, MagickTrue },
-    { "Bilevel", (ssize_t) BilevelType, MagickFalse },
-    { "ColorSeparation", (ssize_t) ColorSeparationType, MagickFalse },
-    { "ColorSeparationMatte", (ssize_t) ColorSeparationMatteType, MagickFalse },
-    { "Grayscale", (ssize_t) GrayscaleType, MagickFalse },
-    { "GrayscaleMatte", (ssize_t) GrayscaleMatteType, MagickFalse },
-    { "Optimize", (ssize_t) OptimizeType, MagickFalse },
-    { "Palette", (ssize_t) PaletteType, MagickFalse },
-    { "PaletteBilevelMatte", (ssize_t) PaletteBilevelMatteType, MagickFalse },
-    { "PaletteMatte", (ssize_t) PaletteMatteType, MagickFalse },
-    { "TrueColorMatte", (ssize_t) TrueColorMatteType, MagickFalse },
-    { "TrueColor", (ssize_t) TrueColorType, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedType, MagickFalse }
+    { "Undefined", UndefinedType, UndefinedOptionFlag, MagickTrue },
+    { "Bilevel", BilevelType, UndefinedOptionFlag, MagickFalse },
+    { "ColorSeparation", ColorSeparationType, UndefinedOptionFlag, MagickFalse },
+    { "ColorSeparationMatte", ColorSeparationMatteType, UndefinedOptionFlag, MagickFalse },
+    { "Grayscale", GrayscaleType, UndefinedOptionFlag, MagickFalse },
+    { "GrayscaleMatte", GrayscaleMatteType, UndefinedOptionFlag, MagickFalse },
+    { "Optimize", OptimizeType, UndefinedOptionFlag, MagickFalse },
+    { "Palette", PaletteType, UndefinedOptionFlag, MagickFalse },
+    { "PaletteBilevelMatte", PaletteBilevelMatteType, UndefinedOptionFlag, MagickFalse },
+    { "PaletteMatte", PaletteMatteType, UndefinedOptionFlag, MagickFalse },
+    { "TrueColorMatte", TrueColorMatteType, UndefinedOptionFlag, MagickFalse },
+    { "TrueColor", TrueColorType, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedType, UndefinedOptionFlag, MagickFalse }
   },
   ValidateOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedValidate, MagickTrue },
-    { "All", (ssize_t) AllValidate, MagickFalse },
-    { "Compare", (ssize_t) CompareValidate, MagickFalse },
-    { "Composite", (ssize_t) CompositeValidate, MagickFalse },
-    { "Convert", (ssize_t) ConvertValidate, MagickFalse },
-    { "FormatsInMemory", (ssize_t) FormatsInMemoryValidate, MagickFalse },
-    { "FormatsOnDisk", (ssize_t) FormatsOnDiskValidate, MagickFalse },
-    { "Identify", (ssize_t) IdentifyValidate, MagickFalse },
-    { "ImportExport", (ssize_t) ImportExportValidate, MagickFalse },
-    { "Montage", (ssize_t) MontageValidate, MagickFalse },
-    { "Stream", (ssize_t) StreamValidate, MagickFalse },
-    { "None", (ssize_t) NoValidate, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedValidate, MagickFalse }
+    { "Undefined", UndefinedValidate, UndefinedOptionFlag, MagickTrue },
+    { "All", AllValidate, UndefinedOptionFlag, MagickFalse },
+    { "Compare", CompareValidate, UndefinedOptionFlag, MagickFalse },
+    { "Composite", CompositeValidate, UndefinedOptionFlag, MagickFalse },
+    { "Convert", ConvertValidate, UndefinedOptionFlag, MagickFalse },
+    { "FormatsInMemory", FormatsInMemoryValidate, UndefinedOptionFlag, MagickFalse },
+    { "FormatsOnDisk", FormatsOnDiskValidate, UndefinedOptionFlag, MagickFalse },
+    { "Identify", IdentifyValidate, UndefinedOptionFlag, MagickFalse },
+    { "ImportExport", ImportExportValidate, UndefinedOptionFlag, MagickFalse },
+    { "Montage", MontageValidate, UndefinedOptionFlag, MagickFalse },
+    { "Stream", StreamValidate, UndefinedOptionFlag, MagickFalse },
+    { "None", NoValidate, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedValidate, UndefinedOptionFlag, MagickFalse }
   },
   VirtualPixelOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedVirtualPixelMethod, MagickTrue },
-    { "Background", (ssize_t) BackgroundVirtualPixelMethod, MagickFalse },
-    { "Black", (ssize_t) BlackVirtualPixelMethod, MagickFalse },
-    { "Constant", (ssize_t) BackgroundVirtualPixelMethod, MagickTrue }, /* deprecated */
-    { "CheckerTile", (ssize_t) CheckerTileVirtualPixelMethod, MagickFalse },
-    { "Dither", (ssize_t) DitherVirtualPixelMethod, MagickFalse },
-    { "Edge", (ssize_t) EdgeVirtualPixelMethod, MagickFalse },
-    { "Gray", (ssize_t) GrayVirtualPixelMethod, MagickFalse },
-    { "HorizontalTile", (ssize_t) HorizontalTileVirtualPixelMethod, MagickFalse },
-    { "HorizontalTileEdge", (ssize_t) HorizontalTileEdgeVirtualPixelMethod, MagickFalse },
-    { "Mirror", (ssize_t) MirrorVirtualPixelMethod, MagickFalse },
-    { "Random", (ssize_t) RandomVirtualPixelMethod, MagickFalse },
-    { "Tile", (ssize_t) TileVirtualPixelMethod, MagickFalse },
-    { "Transparent", (ssize_t) TransparentVirtualPixelMethod, MagickFalse },
-    { "VerticalTile", (ssize_t) VerticalTileVirtualPixelMethod, MagickFalse },
-    { "VerticalTileEdge", (ssize_t) VerticalTileEdgeVirtualPixelMethod, MagickFalse },
-    { "White", (ssize_t) WhiteVirtualPixelMethod, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedVirtualPixelMethod, MagickFalse }
+    { "Undefined", UndefinedVirtualPixelMethod, UndefinedOptionFlag, MagickTrue },
+    { "Background", BackgroundVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Black", BlackVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Constant", BackgroundVirtualPixelMethod, UndefinedOptionFlag, MagickTrue }, /* deprecated */
+    { "CheckerTile", CheckerTileVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Dither", DitherVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Edge", EdgeVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Gray", GrayVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "HorizontalTile", HorizontalTileVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "HorizontalTileEdge", HorizontalTileEdgeVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Mirror", MirrorVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Random", RandomVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Tile", TileVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "Transparent", TransparentVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "VerticalTile", VerticalTileVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "VerticalTileEdge", VerticalTileEdgeVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { "White", WhiteVirtualPixelMethod, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedVirtualPixelMethod, UndefinedOptionFlag, MagickFalse }
   };
 \f
 /*
@@ -1775,25 +1734,32 @@ MagickExport const char *GetImageOption(const ImageInfo *image_info,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   G e t M a g i c k O p t i o n s                                           %
+%   G e t C o m m a n d O p t i o n F l a g s                                 %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GetMagickOptions() returns a list of values.
+%  GetCommandOptionFlags() parses a string and returns an enumerated option
+%  flags(s).  Return a value of -1 if no such option is found.
 %
-%  The format of the GetMagickOptions method is:
+%  The format of the GetCommandOptionFlags method is:
 %
-%      const char **GetMagickOptions(const MagickOption value)
+%      ssize_t GetCommandOptionFlags(const CommandOption option,
+%        const MagickBooleanType list,const char *options)
 %
 %  A description of each parameter follows:
 %
-%    o value: the value.
+%    o option: Index to the option table to lookup
+%
+%    o list: A option other than zero permits more than one option separated by
+%      a comma or pipe.
+%
+%    o options: One or more options separated by commas.
 %
 */
 
-static const OptionInfo *GetOptionInfo(const MagickOption option)
+static const OptionInfo *GetOptionInfo(const CommandOption option)
 {
   switch (option)
   {
@@ -1856,7 +1822,115 @@ static const OptionInfo *GetOptionInfo(const MagickOption option)
   return((const OptionInfo *) NULL);
 }
 
-MagickExport char **GetMagickOptions(const MagickOption value)
+MagickExport ssize_t GetCommandOptionFlags(const CommandOption option,
+  const MagickBooleanType list,const char *options)
+{
+  char
+    token[MaxTextExtent];
+
+  const OptionInfo
+    *option_info;
+
+  int
+    sentinel;
+
+  MagickBooleanType
+    negate;
+
+  register char
+    *q;
+
+  register const char
+    *p;
+
+  register ssize_t
+    i;
+
+  ssize_t
+    option_types;
+
+  option_info=GetOptionInfo(option);
+  if (option_info == (const OptionInfo *) NULL)
+    return(-1);
+  option_types=0;
+  sentinel=',';
+  if (strchr(options,'|') != (char *) NULL)
+    sentinel='|';
+  for (p=options; p != (char *) NULL; p=strchr(p,sentinel))
+  {
+    while (((isspace((int) ((unsigned char) *p)) != 0) || (*p == sentinel)) &&
+           (*p != '\0'))
+      p++;
+    negate=(*p == '!') ? MagickTrue : MagickFalse;
+    if (negate != MagickFalse)
+      p++;
+    q=token;
+    while (((isspace((int) ((unsigned char) *p)) == 0) && (*p != sentinel)) &&
+           (*p != '\0'))
+    {
+      if ((q-token) >= MaxTextExtent)
+        break;
+      *q++=(*p++);
+    }
+    *q='\0';
+    for (i=0; option_info[i].mnemonic != (char *) NULL; i++)
+      if (LocaleCompare(token,option_info[i].mnemonic) == 0)
+        {
+          if (*token == '!')
+            option_types=option_types &~ option_info[i].flags;
+          else
+            option_types=option_types | option_info[i].flags;
+          break;
+        }
+    if ((option_info[i].mnemonic == (char *) NULL) &&
+        ((strchr(token+1,'-') != (char *) NULL) ||
+         (strchr(token+1,'_') != (char *) NULL)))
+      {
+        while ((q=strchr(token+1,'-')) != (char *) NULL)
+          (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+        while ((q=strchr(token+1,'_')) != (char *) NULL)
+          (void) CopyMagickString(q,q+1,MaxTextExtent-strlen(q));
+        for (i=0; option_info[i].mnemonic != (char *) NULL; i++)
+          if (LocaleCompare(token,option_info[i].mnemonic) == 0)
+            {
+              if (*token == '!')
+                option_types=option_types &~ option_info[i].flags;
+              else
+                option_types=option_types | option_info[i].flags;
+              break;
+            }
+      }
+    if (option_info[i].mnemonic == (char *) NULL)
+      return(-1);
+    if (list == MagickFalse)
+      break;
+  }
+  return(option_types);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   G e t C o m m a n d O p t i o n s                                         %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  GetCommandOptions() returns a list of values.
+%
+%  The format of the GetCommandOptions method is:
+%
+%      const char **GetCommandOptions(const CommandOption value)
+%
+%  A description of each parameter follows:
+%
+%    o value: the value.
+%
+*/
+MagickExport char **GetCommandOptions(const CommandOption value)
 {
   char
     **values;
@@ -1919,25 +1993,25 @@ MagickExport char *GetNextImageOption(const ImageInfo *image_info)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%     I s M a g i c k O p t i o n                                             %
+%     I s C o m m a n d O p t i o n                                           %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  IsMagickOption() returns MagickTrue if the option begins with a - or + and
+%  IsCommandOption() returns MagickTrue if the option begins with a - or + and
 %  the first character that follows is alphanumeric.
 %
-%  The format of the IsMagickOption method is:
+%  The format of the IsCommandOption method is:
 %
-%      MagickBooleanType IsMagickOption(const char *option)
+%      MagickBooleanType IsCommandOption(const char *option)
 %
 %  A description of each parameter follows:
 %
 %    o option: the option.
 %
 */
-MagickExport MagickBooleanType IsMagickOption(const char *option)
+MagickExport MagickBooleanType IsCommandOption(const char *option)
 {
   assert(option != (const char *) NULL);
   if ((*option != '-') && (*option != '+'))
@@ -1955,17 +2029,17 @@ MagickExport MagickBooleanType IsMagickOption(const char *option)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   M a g i c k O p t i o n T o M n e m o n i c                               %
+%   C o m m a n d O p t i o n T o M n e m o n i c                             %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  MagickOptionToMnemonic() returns an enumerated value as a mnemonic.
+%  CommandOptionToMnemonic() returns an enumerated value as a mnemonic.
 %
-%  The format of the MagickOptionToMnemonic method is:
+%  The format of the CommandOptionToMnemonic method is:
 %
-%      const char *MagickOptionToMnemonic(const MagickOption option,
+%      const char *CommandOptionToMnemonic(const CommandOption option,
 %        const ssize_t type)
 %
 %  A description of each parameter follows:
@@ -1975,7 +2049,7 @@ MagickExport MagickBooleanType IsMagickOption(const char *option)
 %    o type: one or more values separated by commas.
 %
 */
-MagickExport const char *MagickOptionToMnemonic(const MagickOption option,
+MagickExport const char *CommandOptionToMnemonic(const CommandOption option,
   const ssize_t type)
 {
   const OptionInfo
@@ -2000,17 +2074,17 @@ MagickExport const char *MagickOptionToMnemonic(const MagickOption option,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   L i s t M a g i c k O p t i o n s                                         %
+%   L i s t C o m m a n d O p t i o n s                                       %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  ListMagickOptions() lists the contents of enumerated option type(s).
+%  ListCommandOptions() lists the contents of enumerated option type(s).
 %
-%  The format of the ListMagickOptions method is:
+%  The format of the ListCommandOptions method is:
 %
-%      MagickBooleanType ListMagickOptions(FILE *file,const MagickOption option,
+%      MagickBooleanType ListCommandOptions(FILE *file,const CommandOption option,
 %        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -2022,8 +2096,8 @@ MagickExport const char *MagickOptionToMnemonic(const MagickOption option,
 %    o exception:  return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType ListMagickOptions(FILE *file,
-  const MagickOption option,ExceptionInfo *magick_unused(exception))
+MagickExport MagickBooleanType ListCommandOptions(FILE *file,
+  const CommandOption option,ExceptionInfo *magick_unused(exception))
 {
   const OptionInfo
     *option_info;
@@ -2076,7 +2150,7 @@ MagickExport ssize_t ParseChannelOption(const char *channels)
   ssize_t
     channel;
 
-  channel=ParseMagickOption(MagickChannelOptions,MagickTrue,channels);
+  channel=ParseCommandOption(MagickChannelOptions,MagickTrue,channels);
   if (channel >= 0)
     return(channel);
   channel=0;
@@ -2152,7 +2226,7 @@ MagickExport ssize_t ParseChannelOption(const char *channels)
         /*
           Gather the additional channel flags and merge with shorthand.
         */
-        type=ParseMagickOption(MagickChannelOptions,MagickTrue,channels+i+1);
+        type=ParseCommandOption(MagickChannelOptions,MagickTrue,channels+i+1);
         if (type < 0)
           return(type);
         channel|=type;
@@ -2170,18 +2244,18 @@ MagickExport ssize_t ParseChannelOption(const char *channels)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%   P a r s e M a g i c k O p t i o n                                         %
+%   P a r s e C o m m a n d O p t i o n                                       %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  ParseMagickOption() parses a string and returns an enumerated option
+%  ParseCommandOption() parses a string and returns an enumerated option
 %  type(s).  Return a value of -1 if no such option is found.
 %
-%  The format of the ParseMagickOption method is:
+%  The format of the ParseCommandOption method is:
 %
-%      ssize_t ParseMagickOption(const MagickOption option,
+%      ssize_t ParseCommandOption(const CommandOption option,
 %        const MagickBooleanType list,const char *options)
 %
 %  A description of each parameter follows:
@@ -2194,7 +2268,7 @@ MagickExport ssize_t ParseChannelOption(const char *channels)
 %    o options: One or more options separated by commas.
 %
 */
-MagickExport ssize_t ParseMagickOption(const MagickOption option,
+MagickExport ssize_t ParseCommandOption(const CommandOption option,
   const MagickBooleanType list,const char *options)
 {
   char

diff --git a/magick/option.h b/magick/option.h
index 96a28ce5d8c0bea900f2e15bb5027fb64e7e065b..a381b93f9b669aa183b8397857d1e43d1b8080fa 100644 (file)
--- a/magick/option.h
+++ b/magick/option.h
@@ -55,7 +55,6 @@ typedef enum
   MagickFormatOptions,
   MagickFunctionOptions,
   MagickGravityOptions,
-/*  MagickImageListOptions, */
   MagickIntentOptions,
   MagickInterlaceOptions,
   MagickInterpolateOptions,
@@ -93,7 +92,7 @@ typedef enum
   MagickTypeOptions,
   MagickValidateOptions,
   MagickVirtualPixelOptions
-} MagickOption;
+} CommandOption;
 
 typedef enum
 {
@@ -117,45 +116,50 @@ typedef struct _OptionInfo
     *mnemonic;
 
   ssize_t
-    type;
+    type,
+    flags;
 
   MagickBooleanType
     stealth;
 } OptionInfo;
 
-/* Flags to describe classes of Image Processing Options */
+/*
+  Flags to describe classes of image processing options.
+*/
 typedef enum
 {
-  NumArgsOption = 0x0007,    /* Number of Arguments which follows the option */
-  FireOption = 0x0008,       /* Option Sequence Firing Point */
+  UndefinedOptionFlag = 0x0000,
+  FireOptionFlag = 0x0001,       /* Option sequence firing point */
 #if 0
-  ImageInfoOption = 0x0010,  /* Sets ImageInfo only, no image needed */
-  SimpleOption = 0x0020,     /* Simple Image Processing Option */
-  ImageListOption = 0x0040,  /* Multi-Image List Processing Option */
+  ImageInfoOptionFlag = 0x0002,  /* Sets ImageInfo only, no image needed */
+  SimpleOptionFlag = 0x0004,     /* Simple image processing option */
+  ImageListOptionFlag = 0x0010,  /* Multi-Image list processing option */
 #endif
-  DepreciatedOption = 0x1000 /* Depreciated Option - Give Warning */
+  DeprecatedOptionFlag = 0x1000  /* Depreciated Option - Give Warning */
 } CommandOptionFlags;
 
 extern MagickExport char
-  **GetMagickOptions(const MagickOption),
+  **GetCommandOptions(const CommandOption),
   *GetNextImageOption(const ImageInfo *),
   *RemoveImageOption(ImageInfo *,const char *);
 
 extern MagickExport const char
-  *GetImageOption(const ImageInfo *,const char *),
-  *MagickOptionToMnemonic(const MagickOption,const ssize_t);
+  *CommandOptionToMnemonic(const CommandOption,const ssize_t),
+  *GetImageOption(const ImageInfo *,const char *);
 
 extern MagickExport MagickBooleanType
   CloneImageOptions(ImageInfo *,const ImageInfo *),
   DefineImageOption(ImageInfo *,const char *),
   DeleteImageOption(ImageInfo *,const char *),
-  IsMagickOption(const char *),
-  ListMagickOptions(FILE *,const MagickOption,ExceptionInfo *),
+  IsCommandOption(const char *),
+  ListCommandOptions(FILE *,const CommandOption,ExceptionInfo *),
   SetImageOption(ImageInfo *,const char *,const char *);
 
 extern MagickExport ssize_t
+  GetCommandOptionFlags(const CommandOption,const MagickBooleanType,
+    const char *),
   ParseChannelOption(const char *),
-  ParseMagickOption(const MagickOption,const MagickBooleanType,const char *);
+  ParseCommandOption(const CommandOption,const MagickBooleanType,const char *);
 
 extern MagickExport void
   DestroyImageOptions(ImageInfo *),

diff --git a/magick/policy.c b/magick/policy.c
index 0b5064b63a8009b1d0b52cae6d97d26bf62739b3..9629ba4d6362409ec597cf43ed4543177b588f6a 100644 (file)
--- a/magick/policy.c
+++ b/magick/policy.c
@@ -484,8 +484,8 @@ MagickExport MagickBooleanType IsRightsAuthorized(const PolicyDomain domain,
 
   (void) LogMagickEvent(PolicyEvent,GetMagickModule(),
     "Domain: %s; rights=%s; pattern=\"%s\" ...",
-    MagickOptionToMnemonic(MagickPolicyDomainOptions,domain),
-    MagickOptionToMnemonic(MagickPolicyRightsOptions,rights),pattern);
+    CommandOptionToMnemonic(MagickPolicyDomainOptions,domain),
+    CommandOptionToMnemonic(MagickPolicyRightsOptions,rights),pattern);
   exception=AcquireExceptionInfo();
   policy_info=GetPolicyInfo("*",exception);
   exception=DestroyExceptionInfo(exception);
@@ -574,7 +574,7 @@ MagickExport MagickBooleanType ListPolicyInfo(FILE *file,
          (policy_info[i]->path != (char *) NULL))
       (void) fprintf(file,"\nPath: %s\n",policy_info[i]->path);
     path=policy_info[i]->path;
-    domain=MagickOptionToMnemonic(MagickPolicyDomainOptions,
+    domain=CommandOptionToMnemonic(MagickPolicyDomainOptions,
       policy_info[i]->domain);
     (void) fprintf(file,"  Policy: %s\n",domain);
     if ((policy_info[i]->domain == ResourcePolicyDomain) ||
@@ -779,7 +779,7 @@ static MagickBooleanType LoadPolicyList(const char *xml,const char *filename,
       {
         if (LocaleCompare((char *) keyword,"domain") == 0)
           {
-            policy_info->domain=(PolicyDomain) ParseMagickOption(
+            policy_info->domain=(PolicyDomain) ParseCommandOption(
               MagickPolicyDomainOptions,MagickTrue,token);
             break;
           }
@@ -810,7 +810,7 @@ static MagickBooleanType LoadPolicyList(const char *xml,const char *filename,
       {
         if (LocaleCompare((char *) keyword,"rights") == 0)
           {
-            policy_info->rights=(PolicyRights) ParseMagickOption(
+            policy_info->rights=(PolicyRights) ParseCommandOption(
               MagickPolicyRightsOptions,MagickTrue,token);
             break;
           }

diff --git a/magick/property.c b/magick/property.c
index cdce576e43470d5d85dbe3dd0d930f06da0f328b..49dc1cdd7360b19a41ade621ca3fc605f8a56a00 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -2184,7 +2184,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
             Image channels.
           */
           (void) FormatMagickString(value,MaxTextExtent,"%s",
-            MagickOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
+            CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
             image->colorspace));
           LocaleLower(value);
           if (image->matte != MagickFalse)
@@ -2203,7 +2203,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
           if (IsGrayImage(image,&image->exception) != MagickFalse)
             colorspace=GRAYColorspace;
           (void) FormatMagickString(value,MaxTextExtent,"%s",
-            MagickOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
+            CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
             colorspace));
           break;
         }
@@ -2845,9 +2845,9 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         colorspace=image->colorspace;
         if (IsGrayImage(image,&image->exception) != MagickFalse)
           colorspace=GRAYColorspace;
-        q+=FormatMagickString(q,extent,"%s%s%s",MagickOptionToMnemonic(
+        q+=FormatMagickString(q,extent,"%s%s%s",CommandOptionToMnemonic(
           MagickClassOptions,(ssize_t) image->storage_class),
-          MagickOptionToMnemonic(MagickColorspaceOptions,(ssize_t) colorspace),
+          CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t) colorspace),
           image->matte != MagickFalse ? "Matte" : "");
         break;
       }
@@ -2886,7 +2886,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
           Image horizontal resolution.
         */
         q+=FormatMagickString(q,extent,"%g %s",image->x_resolution,
-          MagickOptionToMnemonic(MagickResolutionOptions,(ssize_t)
+          CommandOptionToMnemonic(MagickResolutionOptions,(ssize_t)
             image->units));
         break;
       }
@@ -2896,7 +2896,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
           Image vertical resolution.
         */
         q+=FormatMagickString(q,extent,"%g %s",image->y_resolution,
-          MagickOptionToMnemonic(MagickResolutionOptions,(ssize_t)
+          CommandOptionToMnemonic(MagickResolutionOptions,(ssize_t)
           image->units));
         break;
       }
@@ -2913,7 +2913,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         /*
           Image alpha channel.
         */
-        q+=FormatMagickString(q,extent,"%s",MagickOptionToMnemonic(
+        q+=FormatMagickString(q,extent,"%s",CommandOptionToMnemonic(
           MagickBooleanOptions,(ssize_t) image->matte));
         break;
       }
@@ -2922,7 +2922,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         /*
           Image compression method.
         */
-        q+=FormatMagickString(q,extent,"%s",MagickOptionToMnemonic(
+        q+=FormatMagickString(q,extent,"%s",CommandOptionToMnemonic(
           MagickCompressOptions,(ssize_t) image->compression));
         break;
       }
@@ -2931,7 +2931,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         /*
           Image dispose method.
         */
-        q+=FormatMagickString(q,extent,"%s",MagickOptionToMnemonic(
+        q+=FormatMagickString(q,extent,"%s",CommandOptionToMnemonic(
           MagickDisposeOptions,(ssize_t) image->dispose));
         break;
       }
@@ -3325,7 +3325,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             colorspace;
 
-          colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
+          colorspace=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
             value);
           if (colorspace < 0)
             break;
@@ -3337,7 +3337,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             compose;
 
-          compose=ParseMagickOption(MagickComposeOptions,MagickFalse,value);
+          compose=ParseCommandOption(MagickComposeOptions,MagickFalse,value);
           if (compose < 0)
             break;
           image->compose=(CompositeOperator) compose;
@@ -3348,7 +3348,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             compression;
 
-          compression=ParseMagickOption(MagickCompressOptions,MagickFalse,
+          compression=ParseCommandOption(MagickCompressOptions,MagickFalse,
             value);
           if (compression < 0)
             break;
@@ -3407,7 +3407,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             dispose;
 
-          dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,value);
+          dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,value);
           if (dispose < 0)
             break;
           image->dispose=(DisposeType) dispose;
@@ -3425,7 +3425,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             gravity;
 
-          gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,value);
+          gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,value);
           if (gravity < 0)
             break;
           image->gravity=(GravityType) gravity;
@@ -3443,7 +3443,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             rendering_intent;
 
-          rendering_intent=ParseMagickOption(MagickIntentOptions,MagickFalse,
+          rendering_intent=ParseCommandOption(MagickIntentOptions,MagickFalse,
             value);
           if (rendering_intent < 0)
             break;
@@ -3455,7 +3455,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             interpolate;
 
-          interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+          interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
             value);
           if (interpolate < 0)
             break;
@@ -3520,7 +3520,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             rendering_intent;
 
-          rendering_intent=ParseMagickOption(MagickIntentOptions,MagickFalse,
+          rendering_intent=ParseCommandOption(MagickIntentOptions,MagickFalse,
             value);
           if (rendering_intent < 0)
             break;
@@ -3556,7 +3556,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
           ssize_t
             units;
 
-          units=ParseMagickOption(MagickResolutionOptions,MagickFalse,value);
+          units=ParseCommandOption(MagickResolutionOptions,MagickFalse,value);
           if (units < 0)
             break;
           image->units=(ResolutionType) units;

diff --git a/magick/quantize.c b/magick/quantize.c
index 8754664611002477edaa5a772d0467b63428d0f8..a21a8607833fe93bd5d76871f116f50022e1cba2 100644 (file)
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -379,7 +379,7 @@ MagickExport QuantizeInfo *AcquireQuantizeInfo(const ImageInfo *image_info)
       quantize_info->dither=image_info->dither;
       option=GetImageOption(image_info,"dither");
       if (option != (const char *) NULL)
-        quantize_info->dither_method=(DitherMethod) ParseMagickOption(
+        quantize_info->dither_method=(DitherMethod) ParseCommandOption(
           MagickDitherOptions,MagickFalse,option);
       quantize_info->measure_error=image_info->verbose;
     }

diff --git a/magick/quantum.c b/magick/quantum.c
index 7a2e670103643d8a2b54d78cbf15d29e4db938f6..3b8754b5a3f2168794caab15504021d372675ea9 100644 (file)
--- a/magick/quantum.c
+++ b/magick/quantum.c
@@ -368,7 +368,7 @@ MagickExport void GetQuantumInfo(const ImageInfo *image_info,
     return;
   option=GetImageOption(image_info,"quantum:format");
   if (option != (char *) NULL)
-    quantum_info->format=(QuantumFormatType) ParseMagickOption(
+    quantum_info->format=(QuantumFormatType) ParseCommandOption(
       MagickQuantumFormatOptions,MagickFalse,option);
   option=GetImageOption(image_info,"quantum:minimum");
   if (option != (char *) NULL)

diff --git a/magick/resize.c b/magick/resize.c
index 834bd0aac9de119a429ed89f66a54cc118557e7d..9546935df4fae7a6a094232e979c334ee8e3e287 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -840,7 +840,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
       ssize_t
         option;
 
-      option=ParseMagickOption(MagickFilterOptions,MagickFalse,artifact);
+      option=ParseCommandOption(MagickFilterOptions,MagickFalse,artifact);
       if ((UndefinedFilter < option) && (option < SentinelFilter))
         { /* Raw filter request - no window function. */
           filter_type=(FilterTypes) option;
@@ -850,7 +850,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
       artifact=GetImageArtifact(image,"filter:window");
       if (artifact != (const char *) NULL)
         {
-          option=ParseMagickOption(MagickFilterOptions,MagickFalse,artifact);
+          option=ParseCommandOption(MagickFilterOptions,MagickFalse,artifact);
           if ((UndefinedFilter < option) && (option < SentinelFilter))
             window_type=(FilterTypes) option;
         }
@@ -864,7 +864,7 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
           ssize_t
             option;
 
-          option=ParseMagickOption(MagickFilterOptions,MagickFalse,
+          option=ParseCommandOption(MagickFilterOptions,MagickFalse,
             artifact);
           if ((UndefinedFilter < option) && (option < SentinelFilter))
             {
@@ -1058,9 +1058,9 @@ MagickExport ResizeFilter *AcquireResizeFilter(const Image *image,
         support=GetResizeFilterSupport(resize_filter); /* practical_support */
         (void) fprintf(stdout,"# Resize Filter (for graphing)\n#\n");
         (void) fprintf(stdout,"# filter = %s\n",
-             MagickOptionToMnemonic(MagickFilterOptions,filter_type));
+             CommandOptionToMnemonic(MagickFilterOptions,filter_type));
         (void) fprintf(stdout,"# window = %s\n",
-             MagickOptionToMnemonic(MagickFilterOptions, window_type));
+             CommandOptionToMnemonic(MagickFilterOptions, window_type));
         (void) fprintf(stdout,"# support = %.*g\n",
              GetMagickPrecision(),(double) resize_filter->support);
         (void) fprintf(stdout,"# win-support = %.*g\n",

diff --git a/magick/resource.c b/magick/resource.c
index d7a65d06e84c5369622edd2783d1a035efb12744..02877390deec36de6f137daf008983e3e6051108 100644 (file)
--- a/magick/resource.c
+++ b/magick/resource.c
@@ -260,7 +260,7 @@ MagickExport MagickBooleanType AcquireMagickResource(const ResourceType type,
   }
   UnlockSemaphoreInfo(resource_semaphore);
   (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s: %s/%s/%s",
-    MagickOptionToMnemonic(MagickResourceOptions,(ssize_t) type),
+    CommandOptionToMnemonic(MagickResourceOptions,(ssize_t) type),
     resource_request,resource_current,resource_limit);
   return(status);
 }
@@ -808,7 +808,7 @@ MagickExport void RelinquishMagickResource(const ResourceType type,
   }
   UnlockSemaphoreInfo(resource_semaphore);
   (void) LogMagickEvent(ResourceEvent,GetMagickModule(),"%s: %s/%s/%s",
-    MagickOptionToMnemonic(MagickResourceOptions,(ssize_t) type),
+    CommandOptionToMnemonic(MagickResourceOptions,(ssize_t) type),
       resource_request,resource_current,resource_limit);
 }
 \f

diff --git a/magick/type.c b/magick/type.c
index 5477265012faea456c68c798ba20506f0345b36c..5a08ae312819ac5ae1ab27d5b560bfd138196507 100644 (file)
--- a/magick/type.c
+++ b/magick/type.c
@@ -861,8 +861,8 @@ MagickExport MagickBooleanType ListTypeInfo(FILE *file,ExceptionInfo *exception)
     family="unknown";
     if (type_info[i]->family != (char *) NULL)
       family=type_info[i]->family;
-    style=MagickOptionToMnemonic(MagickStyleOptions,type_info[i]->style);
-    stretch=MagickOptionToMnemonic(MagickStretchOptions,type_info[i]->stretch);
+    style=CommandOptionToMnemonic(MagickStyleOptions,type_info[i]->style);
+    stretch=CommandOptionToMnemonic(MagickStretchOptions,type_info[i]->stretch);
     glyphs="unknown";
     if (type_info[i]->glyphs != (char *) NULL)
       glyphs=type_info[i]->glyphs;
@@ -1214,13 +1214,13 @@ static MagickBooleanType LoadTypeList(const char *xml,const char *filename,
           }
         if (LocaleCompare((char *) keyword,"stretch") == 0)
           {
-            type_info->stretch=(StretchType) ParseMagickOption(
+            type_info->stretch=(StretchType) ParseCommandOption(
               MagickStretchOptions,MagickFalse,token);
             break;
           }
         if (LocaleCompare((char *) keyword,"style") == 0)
           {
-            type_info->style=(StyleType) ParseMagickOption(MagickStyleOptions,
+            type_info->style=(StyleType) ParseCommandOption(MagickStyleOptions,
               MagickFalse,token);
             break;
           }

diff --git a/magick/utility.c b/magick/utility.c
index a898ae8336526f60dba26ae3d7b575ae63247a89..d28c6f72c4cfe3ba6357cb0bbbb4d482d9900157 100644 (file)
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -741,13 +741,12 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
     *subimage='\0';
     vector[count++]=ConstantString(option);
     destroy=MagickTrue;
-    parameters=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    parameters=ParseCommandOption(MagickCommandOptions,MagickFalse,option);
     if (parameters > 0)
       {
         /*
           Do not expand command option parameters.
         */
-        parameters &= NumArgsOption;
         for (j=0; j < parameters; j++)
         {
           i++;
@@ -832,7 +831,7 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
     for (j=0; j < (ssize_t) number_files; j++)
     {
       option=filelist[j];
-      parameters=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+      parameters=ParseCommandOption(MagickCommandOptions,MagickFalse,option);
       if (parameters > 0)
         {
           ssize_t
@@ -841,7 +840,6 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
           /*
             Do not expand command option parameters.
           */
-          parameters &= NumArgsOption;
           vector[count++]=ConstantString(option);
           for (k=0; k < parameters; k++)
           {

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 58c9d9b7b1671f8cb4dd1bcb8d02643f02e2e226..9b9ec896423651b798cf0187502dfa3ae1a049e6 100644 (file)
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -3528,7 +3528,7 @@ MagickExport void XGetResourceInfo(const ImageInfo *image_info,
     client_name,"geometry",(char *) NULL));
   resource_value=XGetResourceClass(database,client_name,"gravity",
     (char *) "Center");
-  resource_info->gravity=(GravityType) ParseMagickOption(MagickGravityOptions,
+  resource_info->gravity=(GravityType) ParseCommandOption(MagickGravityOptions,
     MagickFalse,resource_value);
   directory=getcwd(resource_info->home_directory,MaxTextExtent);
   (void) directory;

diff --git a/tests/validate.c b/tests/validate.c
index 85469820249ed012f59d7349be02626ed403ee61..a090a2b08373eef4bf838b4f0f988c1c0031fa23 100644 (file)
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -491,9 +491,9 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
       */
       CatchException(exception);
       (void) fprintf(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",(double)
-        (test++),reference_formats[i].magick,MagickOptionToMnemonic(
+        (test++),reference_formats[i].magick,CommandOptionToMnemonic(
         MagickCompressOptions,reference_formats[i].compression),
-        MagickOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
+        CommandOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
         (double) reference_types[j].depth);
       (void) CopyMagickString(image_info->filename,reference_filename,
         MaxTextExtent);
@@ -702,9 +702,9 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
       */
       CatchException(exception);
       (void) fprintf(stdout,"  test %.20g: %s/%s/%s/%.20g-bits",(double)
-        (test++),reference_formats[i].magick,MagickOptionToMnemonic(
+        (test++),reference_formats[i].magick,CommandOptionToMnemonic(
         MagickCompressOptions,reference_formats[i].compression),
-        MagickOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
+        CommandOptionToMnemonic(MagickTypeOptions,reference_types[j].type),
         (double) reference_types[j].depth);
       (void) CopyMagickString(image_info->filename,reference_filename,
         MaxTextExtent);
@@ -905,7 +905,7 @@ static size_t ValidateImportExportPixels(ImageInfo *image_info,
       */
       CatchException(exception);
       (void) fprintf(stdout,"  test %.20g: %s/%s",(double) (test++),
-        reference_map[i],MagickOptionToMnemonic(MagickStorageOptions,
+        reference_map[i],CommandOptionToMnemonic(MagickStorageOptions,
         reference_storage[j].type));
       (void) CopyMagickString(image_info->filename,reference_filename,
         MaxTextExtent);
@@ -1298,7 +1298,7 @@ int main(int argc,char **argv)
   for (i=1; i < (ssize_t) argc; i++)
   {
     option=argv[i];
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         (void) CopyMagickString(image_info->filename,option,MaxTextExtent);
         continue;
@@ -1363,7 +1363,7 @@ int main(int argc,char **argv)
             i++;
             if (i == (ssize_t) argc)
               ThrowValidateException(OptionError,"MissingArgument",option);
-            validate=ParseMagickOption(MagickValidateOptions,MagickFalse,
+            validate=ParseCommandOption(MagickValidateOptions,MagickFalse,
               argv[i]);
             if (validate < 0)
               ThrowValidateException(OptionError,"UnrecognizedValidateType",
@@ -1415,7 +1415,7 @@ int main(int argc,char **argv)
           (void) fprintf(stdout,"Copyright: %s\n\n",
             GetMagickCopyright());
           (void) fprintf(stdout,"ImageMagick Validation Suite (%s)\n\n",
-            MagickOptionToMnemonic(MagickValidateOptions,(ssize_t) type));
+            CommandOptionToMnemonic(MagickValidateOptions,(ssize_t) type));
           if ((type & CompareValidate) != 0)
             tests+=ValidateCompareCommand(image_info,reference_filename,
               output_filename,&fail,exception);

diff --git a/wand/animate.c b/wand/animate.c
index 19262074843cb80d334ba41242906418e551f64f..1403ba758b74e13527f77209d3ce056edcdf32ab 100644 (file)
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -379,7 +379,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
   resource_value=XGetResourceInstance(resource_database,GetClientName(),
     "interlace","none");
   image_info->interlace=(InterlaceType)
-    ParseMagickOption(MagickInterlaceOptions,MagickFalse,resource_value);
+    ParseCommandOption(MagickInterlaceOptions,MagickFalse,resource_value);
   resource_value=XGetResourceInstance(resource_database,GetClientName(),
     "verbose","False");
   image_info->verbose=IsMagickTrue(resource_value);
@@ -430,7 +430,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         const char
           *filename;
@@ -475,7 +475,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowAnimateException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -632,7 +632,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowAnimateException(OptionError,"UnrecognizedColorspace",
@@ -666,7 +666,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowAnimateException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -751,7 +751,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowAnimateException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -768,7 +768,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowAnimateException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -816,7 +816,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowAnimateException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -890,7 +890,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
               argv[i]);
             if (gravity < 0)
               ThrowAnimateException(OptionError,"UnrecognizedGravityType",
@@ -943,7 +943,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowAnimateException(OptionError,"UnrecognizedInterlaceType",
@@ -960,7 +960,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowAnimateException(OptionError,"UnrecognizedInterpolateMethod",
@@ -996,7 +996,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowAnimateException(OptionError,"UnrecognizedResourceType",
@@ -1020,7 +1020,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowAnimateException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -1151,7 +1151,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowAnimateException(OptionError,"UnrecognizedColorspace",
@@ -1383,7 +1383,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowAnimateException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowAnimateException(OptionError,
@@ -1423,8 +1423,8 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
       default:
         ThrowAnimateException(OptionError,"UnrecognizedOption",option);
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }

diff --git a/wand/compare.c b/wand/compare.c
index 2a554a93767ea3c3d4d92d6f69ec168856f0026f..adf6ff2853d1373af48bcb1fb45bf47a4731e8d8 100644 (file)
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -315,7 +315,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         Image
           *images;
@@ -351,7 +351,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowCompareException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -408,7 +408,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowCompareException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
               argv[i]);
             if (colorspace < 0)
               ThrowCompareException(OptionError,"UnrecognizedColorspace",
@@ -425,7 +425,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            compose=ParseMagickOption(MagickComposeOptions,MagickFalse,
+            compose=ParseCommandOption(MagickComposeOptions,MagickFalse,
               argv[i]);
             if (compose < 0)
               ThrowCompareException(OptionError,"UnrecognizedComposeOperator",
@@ -442,7 +442,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowCompareException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowCompareException(OptionError,"UnrecognizedImageCompression",
@@ -626,7 +626,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowCompareException(OptionError,"UnrecognizedInterlaceType",
@@ -653,7 +653,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowCompareException(OptionError,"UnrecognizedResourceType",
@@ -677,7 +677,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowCompareException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -719,7 +719,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickMetricOptions,MagickTrue,argv[i]);
+            type=ParseCommandOption(MagickMetricOptions,MagickTrue,argv[i]);
             if (type < 0)
               ThrowCompareException(OptionError,"UnrecognizedMetricType",
                 argv[i]);
@@ -773,7 +773,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowCompareException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowCompareException(OptionError,"UnrecognizedColorspace",
@@ -879,7 +879,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompareException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickTypeOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowCompareException(OptionError,"UnrecognizedImageType",
                 argv[i]);
@@ -910,7 +910,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowCompareException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowCompareException(OptionError,
@@ -924,8 +924,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
       default:
         ThrowCompareException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickTrue,MagickTrue,MagickTrue);
   }
@@ -1055,7 +1055,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
             (void) fprintf(stderr,"Offset: %.20g,%.20g\n",(double)
               difference_image->page.x,(double) difference_image->page.y);
           (void) fprintf(stderr,"  Channel distortion: %s\n",
-            MagickOptionToMnemonic(MagickMetricOptions,(ssize_t) metric));
+            CommandOptionToMnemonic(MagickMetricOptions,(ssize_t) metric));
           switch (metric)
           {
             case FuzzErrorMetric:

diff --git a/wand/composite.c b/wand/composite.c
index 96d17695748890c298b3448b30eceabcbb6bae35..c75d3fe122f5985de3b45aa89e89bcc7f0c70181 100644 (file)
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -504,7 +504,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         Image
           *images;
@@ -551,7 +551,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowCompositeException(OptionError,
                 "UnrecognizedAlphaChannelType",argv[i]);
@@ -694,7 +694,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowCompositeException(OptionError,"UnrecognizedColorspace",
@@ -721,7 +721,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            compose=ParseMagickOption(MagickComposeOptions,MagickFalse,
+            compose=ParseCommandOption(MagickComposeOptions,MagickFalse,
               argv[i]);
             if (compose < 0)
               ThrowCompositeException(OptionError,"UnrecognizedComposeOperator",
@@ -739,7 +739,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowCompositeException(OptionError,
@@ -762,7 +762,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowCompositeException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -850,7 +850,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowCompositeException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -894,7 +894,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowCompositeException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -943,7 +943,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
               argv[i]);
             if (endian < 0)
               ThrowCompositeException(OptionError,"UnrecognizedEndianType",
@@ -975,7 +975,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowCompositeException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -1028,7 +1028,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
               argv[i]);
             if (gravity < 0)
               ThrowCompositeException(OptionError,"UnrecognizedGravityType",
@@ -1070,7 +1070,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowCompositeException(OptionError,
@@ -1087,7 +1087,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowCompositeException(OptionError,
@@ -1123,7 +1123,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowCompositeException(OptionError,"UnrecognizedResourceType",
@@ -1147,7 +1147,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowCompositeException(OptionError,"UnrecognizedListType",
                 argv[i]);
@@ -1248,7 +1248,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowCompositeException(OptionError,"UnrecognizedColorspace",
@@ -1487,7 +1487,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickTypeOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowCompositeException(OptionError,"UnrecognizedImageType",
                 argv[i]);
@@ -1507,7 +1507,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+            units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
               argv[i]);
             if (units < 0)
               ThrowCompositeException(OptionError,"UnrecognizedUnitsType",
@@ -1553,7 +1553,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowCompositeException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowCompositeException(OptionError,
@@ -1603,8 +1603,8 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
       default:
         ThrowCompositeException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }

diff --git a/wand/conjure.c b/wand/conjure.c
index decb6f206c1537b6804bc08dfaab5b437b40fc5c..bb9db5cb34beb891bb2a3ebbffaf77c69fc3830b 100644 (file)
--- a/wand/conjure.c
+++ b/wand/conjure.c
@@ -193,7 +193,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
   for (i=1; i < (ssize_t) argc; i++)
   {
     option=argv[i];
-    if (IsMagickOption(option) != MagickFalse)
+    if (IsCommandOption(option) != MagickFalse)
       {
         if (LocaleCompare("concurrent",option+1) == 0)
           break;
@@ -207,7 +207,7 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConjureException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowConjureException(OptionError,"UnrecognizedEventType",
                 argv[i]);

diff --git a/wand/convert.c b/wand/convert.c
index f1765ed432171287dd85b797b2f792f83b7d4e07..302fb86ccba3a00a85b489559d11913dbe1c29b6 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -572,7 +572,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         Image
           *images;
@@ -649,7 +649,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowConvertException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -989,7 +989,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowConvertException(OptionError,"UnrecognizedColorspace",
@@ -1017,7 +1017,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            compose=ParseMagickOption(MagickComposeOptions,MagickFalse,
+            compose=ParseCommandOption(MagickComposeOptions,MagickFalse,
               argv[i]);
             if (compose < 0)
               ThrowConvertException(OptionError,"UnrecognizedComposeOperator",
@@ -1036,7 +1036,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowConvertException(OptionError,"UnrecognizedImageCompression",
@@ -1119,7 +1119,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowConvertException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -1210,7 +1210,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            direction=ParseMagickOption(MagickDirectionOptions,MagickFalse,
+            direction=ParseCommandOption(MagickDirectionOptions,MagickFalse,
               argv[i]);
             if (direction < 0)
               ThrowConvertException(OptionError,"UnrecognizedDirectionType",
@@ -1236,7 +1236,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowConvertException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -1250,7 +1250,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickDistortOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickDistortOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedDistortMethod",
                 argv[i]);
@@ -1269,7 +1269,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowConvertException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -1360,7 +1360,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
               argv[i]);
             if (endian < 0)
               ThrowConvertException(OptionError,"UnrecognizedEndianType",
@@ -1381,7 +1381,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickEvaluateOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickEvaluateOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedEvaluateOperator",
                 argv[i]);
@@ -1402,7 +1402,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickEvaluateOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickEvaluateOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedEvaluateOperator",
                 argv[i]);
@@ -1464,7 +1464,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowConvertException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -1530,7 +1530,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickFunctionOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickFunctionOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedFunction",argv[i]);
              i++;
@@ -1602,7 +1602,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
               argv[i]);
             if (gravity < 0)
               ThrowConvertException(OptionError,"UnrecognizedGravityType",
@@ -1669,7 +1669,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            intent=ParseMagickOption(MagickIntentOptions,MagickFalse,
+            intent=ParseCommandOption(MagickIntentOptions,MagickFalse,
               argv[i]);
             if (intent < 0)
               ThrowConvertException(OptionError,"UnrecognizedIntentType",
@@ -1686,7 +1686,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowConvertException(OptionError,"UnrecognizedInterlaceType",
@@ -1714,7 +1714,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowConvertException(OptionError,"UnrecognizedInterpolateMethod",
@@ -1781,7 +1781,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickLayerOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickLayerOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowConvertException(OptionError,"UnrecognizedLayerMethod",
                 argv[i]);
@@ -1839,7 +1839,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowConvertException(OptionError,"UnrecognizedResourceType",
@@ -1872,7 +1872,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowConvertException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -2001,7 +2001,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
             GetMagickToken(argv[i],NULL,token);
-            op=ParseMagickOption(MagickMorphologyOptions,MagickFalse,token);
+            op=ParseCommandOption(MagickMorphologyOptions,MagickFalse,token);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedMorphologyMethod",
                 token);
@@ -2043,7 +2043,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
                 ssize_t
                   noise;
 
-                noise=ParseMagickOption(MagickNoiseOptions,MagickFalse,argv[i]);
+                noise=ParseCommandOption(MagickNoiseOptions,MagickFalse,argv[i]);
                 if (noise < 0)
                   ThrowConvertException(OptionError,"UnrecognizedNoiseType",
                     argv[i]);
@@ -2087,7 +2087,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            orientation=ParseMagickOption(MagickOrientationOptions,
+            orientation=ParseCommandOption(MagickOrientationOptions,
               MagickFalse,argv[i]);
             if (orientation < 0)
               ThrowConvertException(OptionError,"UnrecognizedImageOrientation",
@@ -2174,7 +2174,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            preview=ParseMagickOption(MagickPreviewOptions,MagickFalse,
+            preview=ParseCommandOption(MagickPreviewOptions,MagickFalse,
               argv[i]);
             if (preview < 0)
               ThrowConvertException(OptionError,"UnrecognizedPreviewType",
@@ -2231,7 +2231,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowConvertException(OptionError,"UnrecognizedColorspace",
@@ -2591,7 +2591,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickSparseColorOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickSparseColorOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedSparseColorMethod",
                 argv[i]);
@@ -2631,7 +2631,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowConvertException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickStatisticOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickStatisticOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowConvertException(OptionError,"UnrecognizedStatisticType",
                 argv[i]);
@@ -2652,7 +2652,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            stretch=ParseMagickOption(MagickStretchOptions,MagickFalse,
+            stretch=ParseCommandOption(MagickStretchOptions,MagickFalse,
               argv[i]);
             if (stretch < 0)
               ThrowConvertException(OptionError,"UnrecognizedStyleType",
@@ -2691,7 +2691,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            style=ParseMagickOption(MagickStyleOptions,MagickFalse,argv[i]);
+            style=ParseCommandOption(MagickStyleOptions,MagickFalse,argv[i]);
             if (style < 0)
               ThrowConvertException(OptionError,"UnrecognizedStyleType",
                 argv[i]);
@@ -2839,7 +2839,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickTypeOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowConvertException(OptionError,"UnrecognizedImageType",
                 argv[i]);
@@ -2870,7 +2870,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+            units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
               argv[i]);
             if (units < 0)
               ThrowConvertException(OptionError,"UnrecognizedUnitsType",
@@ -2933,7 +2933,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowConvertException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowConvertException(OptionError,
@@ -2998,8 +2998,8 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
       default:
         ThrowConvertException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickTrue,MagickTrue,MagickTrue);
   }

diff --git a/wand/display.c b/wand/display.c
index 2e0cd51312941644b28cfd4e49064d3289b01c30..a466c946902772bf610800e5617c0aced5ba0f5b 100644 (file)
--- a/wand/display.c
+++ b/wand/display.c
@@ -436,7 +436,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
   resource_value=XGetResourceInstance(resource_database,GetClientName(),
     "interlace","none");
   image_info->interlace=(InterlaceType)
-    ParseMagickOption(MagickInterlaceOptions,MagickFalse,resource_value);
+    ParseCommandOption(MagickInterlaceOptions,MagickFalse,resource_value);
   image_info->page=XGetResourceInstance(resource_database,GetClientName(),
     "pageGeometry",(char *) NULL);
   resource_value=XGetResourceInstance(resource_database,GetClientName(),
@@ -493,7 +493,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         const char
           *filename;
@@ -682,7 +682,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowDisplayException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -838,7 +838,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowDisplayException(OptionError,"UnrecognizedColorspace",
@@ -864,7 +864,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowDisplayException(OptionError,"UnrecognizedImageCompression",
@@ -900,7 +900,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowDisplayException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -998,7 +998,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowDisplayException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -1015,7 +1015,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowDisplayException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -1059,7 +1059,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
               argv[i]);
             if (endian < 0)
               ThrowDisplayException(OptionError,"UnrecognizedEndianType",
@@ -1095,7 +1095,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowDisplayException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -1196,7 +1196,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
               argv[i]);
             if (gravity < 0)
               ThrowDisplayException(OptionError,"UnrecognizedGravityType",
@@ -1249,7 +1249,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowDisplayException(OptionError,"UnrecognizedInterlaceType",
@@ -1266,7 +1266,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowDisplayException(OptionError,"UnrecognizedInterpolateMethod",
@@ -1302,7 +1302,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowDisplayException(OptionError,"UnrecognizedResourceType",
@@ -1326,7 +1326,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowDisplayException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -1475,7 +1475,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowDisplayException(OptionError,"UnrecognizedColorspace",
@@ -1814,7 +1814,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowDisplayException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowDisplayException(OptionError,
@@ -1879,8 +1879,8 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
       default:
         ThrowDisplayException(OptionError,"UnrecognizedOption",option);
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }

diff --git a/wand/drawing-wand.c b/wand/drawing-wand.c
index 9172c12e4dcaec143f3b9360ee80e42557e6defb..8bab181e946218daedacdcad6939921c2daabc86 100644 (file)
--- a/wand/drawing-wand.c
+++ b/wand/drawing-wand.c
@@ -1043,7 +1043,7 @@ WandExport MagickBooleanType DrawComposite(DrawingWand *wand,
         wand->name);
       return(MagickFalse);
     }
-  mode=MagickOptionToMnemonic(MagickComposeOptions,(ssize_t) compose);
+  mode=CommandOptionToMnemonic(MagickComposeOptions,(ssize_t) compose);
   media_type=MagickToMime(image->magick);
   (void) MvgPrintf(wand,"image %s %g,%g %g,%g 'data:%s;base64,\n",
     mode,x,y,width,height,media_type);
@@ -1104,7 +1104,7 @@ WandExport void DrawColor(DrawingWand *wand,const double x,const double y,
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  (void) MvgPrintf(wand,"color %g,%g '%s'\n",x,y,MagickOptionToMnemonic(
+  (void) MvgPrintf(wand,"color %g,%g '%s'\n",x,y,CommandOptionToMnemonic(
     MagickMethodOptions,(ssize_t) paint_method));
 }
 \f
@@ -2459,14 +2459,14 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
   child=AddChildToXMLTree(xml_info,"clip-units",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(
+      (void) CopyMagickString(value,CommandOptionToMnemonic(
         MagickClipPathOptions,(ssize_t) CurrentContext->clip_units),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
   child=AddChildToXMLTree(xml_info,"decorate",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(
+      (void) CopyMagickString(value,CommandOptionToMnemonic(
         MagickDecorateOptions,(ssize_t) CurrentContext->decorate),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
@@ -2494,7 +2494,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
   child=AddChildToXMLTree(xml_info,"fill-rule",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(
+      (void) CopyMagickString(value,CommandOptionToMnemonic(
         MagickFillRuleOptions,(ssize_t) CurrentContext->fill_rule),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
@@ -2514,14 +2514,14 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
   child=AddChildToXMLTree(xml_info,"font-stretch",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(
+      (void) CopyMagickString(value,CommandOptionToMnemonic(
         MagickStretchOptions,(ssize_t) CurrentContext->stretch),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
   child=AddChildToXMLTree(xml_info,"font-style",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(
+      (void) CopyMagickString(value,CommandOptionToMnemonic(
         MagickStyleOptions,(ssize_t) CurrentContext->style),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
@@ -2535,7 +2535,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
   child=AddChildToXMLTree(xml_info,"gravity",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(MagickGravityOptions,
+      (void) CopyMagickString(value,CommandOptionToMnemonic(MagickGravityOptions,
         (ssize_t) CurrentContext->gravity),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
@@ -2586,14 +2586,14 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
   child=AddChildToXMLTree(xml_info,"stroke-linecap",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(MagickLineCapOptions,
+      (void) CopyMagickString(value,CommandOptionToMnemonic(MagickLineCapOptions,
         (ssize_t) CurrentContext->linecap),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
   child=AddChildToXMLTree(xml_info,"stroke-linejoin",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(
+      (void) CopyMagickString(value,CommandOptionToMnemonic(
         MagickLineJoinOptions,(ssize_t) CurrentContext->linejoin),
         MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
@@ -2622,7 +2622,7 @@ WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
   child=AddChildToXMLTree(xml_info,"text-align",0);
   if (child != (XMLTreeInfo *) NULL)
     {
-      (void) CopyMagickString(value,MagickOptionToMnemonic(MagickAlignOptions,
+      (void) CopyMagickString(value,CommandOptionToMnemonic(MagickAlignOptions,
         (ssize_t) CurrentContext->align),MaxTextExtent);
       (void) SetXMLTreeContent(child,value);
     }
@@ -2777,7 +2777,7 @@ WandExport void DrawMatte(DrawingWand *wand,const double x,const double y,
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  (void) MvgPrintf(wand,"matte %g,%g '%s'\n",x,y,MagickOptionToMnemonic(
+  (void) MvgPrintf(wand,"matte %g,%g '%s'\n",x,y,CommandOptionToMnemonic(
     MagickMethodOptions,(ssize_t) paint_method));
 }
 \f
@@ -4623,7 +4623,7 @@ WandExport void DrawSetClipRule(DrawingWand *wand,const FillRule fill_rule)
       (CurrentContext->fill_rule != fill_rule))
     {
       CurrentContext->fill_rule=fill_rule;
-      (void) MvgPrintf(wand, "clip-rule '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand, "clip-rule '%s'\n",CommandOptionToMnemonic(
         MagickFillRuleOptions,(ssize_t) fill_rule));
     }
 }
@@ -4677,7 +4677,7 @@ WandExport void DrawSetClipUnits(DrawingWand *wand,
           affine.ty=CurrentContext->bounds.y1;
           AdjustAffine(wand,&affine);
         }
-      (void) MvgPrintf(wand, "clip-units '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand, "clip-units '%s'\n",CommandOptionToMnemonic(
         MagickClipPathOptions,(ssize_t) clip_units));
     }
 }
@@ -4958,7 +4958,7 @@ WandExport void DrawSetFillRule(DrawingWand *wand,const FillRule fill_rule)
       (CurrentContext->fill_rule != fill_rule))
     {
       CurrentContext->fill_rule=fill_rule;
-      (void) MvgPrintf(wand, "fill-rule '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand, "fill-rule '%s'\n",CommandOptionToMnemonic(
         MagickFillRuleOptions,(ssize_t) fill_rule));
     }
 }
@@ -5127,7 +5127,7 @@ WandExport void DrawSetFontStretch(DrawingWand *wand,
       (CurrentContext->stretch != font_stretch))
     {
       CurrentContext->stretch=font_stretch;
-      (void) MvgPrintf(wand, "font-stretch '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand, "font-stretch '%s'\n",CommandOptionToMnemonic(
         MagickStretchOptions,(ssize_t) font_stretch));
     }
 }
@@ -5167,7 +5167,7 @@ WandExport void DrawSetFontStyle(DrawingWand *wand,const StyleType style)
       (CurrentContext->style != style))
     {
       CurrentContext->style=style;
-      (void) MvgPrintf(wand, "font-style '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand, "font-style '%s'\n",CommandOptionToMnemonic(
         MagickStyleOptions,(ssize_t) style));
     }
 }
@@ -5250,7 +5250,7 @@ WandExport void DrawSetGravity(DrawingWand *wand,const GravityType gravity)
       (CurrentContext->gravity != gravity) || (gravity != ForgetGravity))
     {
       CurrentContext->gravity=gravity;
-      (void) MvgPrintf(wand,"gravity '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand,"gravity '%s'\n",CommandOptionToMnemonic(
         MagickGravityOptions,(ssize_t) gravity));
     }
 }
@@ -5607,7 +5607,7 @@ WandExport void DrawSetStrokeLineCap(DrawingWand *wand,const LineCap linecap)
       (CurrentContext->linecap != linecap))
     {
       CurrentContext->linecap=linecap;
-      (void) MvgPrintf(wand,"stroke-linecap '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand,"stroke-linecap '%s'\n",CommandOptionToMnemonic(
         MagickLineCapOptions,(ssize_t) linecap));
     }
 }
@@ -5649,7 +5649,7 @@ WandExport void DrawSetStrokeLineJoin(DrawingWand *wand,const LineJoin linejoin)
       (CurrentContext->linejoin != linejoin))
     {
       CurrentContext->linejoin=linejoin;
-      (void) MvgPrintf(wand, "stroke-linejoin '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand, "stroke-linejoin '%s'\n",CommandOptionToMnemonic(
         MagickLineJoinOptions,(ssize_t) linejoin));
     }
 }
@@ -5818,7 +5818,7 @@ WandExport void DrawSetTextAlignment(DrawingWand *wand,
       (CurrentContext->align != alignment))
     {
       CurrentContext->align=alignment;
-      (void) MvgPrintf(wand,"text-align '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand,"text-align '%s'\n",CommandOptionToMnemonic(
         MagickAlignOptions,(ssize_t) alignment));
     }
 }
@@ -5903,7 +5903,7 @@ WandExport void DrawSetTextDecoration(DrawingWand *wand,
       (CurrentContext->decorate != decoration))
     {
       CurrentContext->decorate=decoration;
-      (void) MvgPrintf(wand,"decorate '%s'\n",MagickOptionToMnemonic(
+      (void) MvgPrintf(wand,"decorate '%s'\n",CommandOptionToMnemonic(
         MagickDecorateOptions,(ssize_t) decoration));
     }
 }
@@ -6192,7 +6192,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->clip_units=(ClipPathUnits) ParseMagickOption(
+        CurrentContext->clip_units=(ClipPathUnits) ParseCommandOption(
           MagickClipPathOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"decorate");
@@ -6200,7 +6200,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->decorate=(DecorationType) ParseMagickOption(
+        CurrentContext->decorate=(DecorationType) ParseCommandOption(
           MagickDecorateOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"encoding");
@@ -6226,7 +6226,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->fill_rule=(FillRule) ParseMagickOption(
+        CurrentContext->fill_rule=(FillRule) ParseCommandOption(
           MagickFillRuleOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"font");
@@ -6247,7 +6247,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->stretch=(StretchType) ParseMagickOption(
+        CurrentContext->stretch=(StretchType) ParseCommandOption(
           MagickStretchOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"font-style");
@@ -6255,7 +6255,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->style=(StyleType) ParseMagickOption(MagickStyleOptions,
+        CurrentContext->style=(StyleType) ParseCommandOption(MagickStyleOptions,
           MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"font-weight");
@@ -6270,7 +6270,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->gravity=(GravityType) ParseMagickOption(
+        CurrentContext->gravity=(GravityType) ParseCommandOption(
           MagickGravityOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"stroke");
@@ -6358,7 +6358,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->linecap=(LineCap) ParseMagickOption(
+        CurrentContext->linecap=(LineCap) ParseCommandOption(
           MagickLineCapOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"stroke-linejoin");
@@ -6366,7 +6366,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->linejoin=(LineJoin) ParseMagickOption(
+        CurrentContext->linejoin=(LineJoin) ParseCommandOption(
           MagickLineJoinOptions,MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"stroke-miterlimit");
@@ -6396,7 +6396,7 @@ WandExport MagickBooleanType DrawSetVectorGraphics(DrawingWand *wand,
     {
       value=GetXMLTreeContent(child);
       if (value != (const char *) NULL)
-        CurrentContext->align=(AlignType) ParseMagickOption(MagickAlignOptions,
+        CurrentContext->align=(AlignType) ParseCommandOption(MagickAlignOptions,
           MagickFalse,value);
     }
   child=GetXMLTreeChild(xml_info,"text-antialias");

diff --git a/wand/identify.c b/wand/identify.c
index e30004cb274ebcf0237dabcd6e8d807bee948f86..2a00157820f1a62e7ebec160a733002bd2aeca96 100644 (file)
--- a/wand/identify.c
+++ b/wand/identify.c
@@ -290,7 +290,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         char
           *filename;
@@ -364,7 +364,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -422,7 +422,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedColorspace",
@@ -457,7 +457,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -585,7 +585,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowIdentifyException(OptionError,
@@ -602,7 +602,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowIdentifyException(OptionError,
@@ -629,7 +629,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedResourceType",
@@ -653,7 +653,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedListType",
                 argv[i]);
@@ -787,7 +787,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+            units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
               argv[i]);
             if (units < 0)
               ThrowIdentifyException(OptionError,"UnrecognizedUnitsType",
@@ -810,7 +810,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowIdentifyException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowIdentifyException(OptionError,
@@ -824,8 +824,8 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
       default:
         ThrowIdentifyException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }

diff --git a/wand/import.c b/wand/import.c
index 9052e3dd43eb3e13dd28a9b8199a387a0db4f43e..f453c3904c5aa529250c25c690e2babcf56e93a8 100644 (file)
--- a/wand/import.c
+++ b/wand/import.c
@@ -444,7 +444,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         Image
           *images;
@@ -569,7 +569,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
               argv[i]);
             if (colorspace < 0)
               ThrowImportException(OptionError,"UnrecognizedColorspace",
@@ -598,7 +598,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowImportException(OptionError,"UnrecognizedImageCompression",
@@ -632,7 +632,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowImportException(OptionError,"UnrecognizedEventType",argv[i]);
             (void) SetLogEventMask(argv[i]);
@@ -715,7 +715,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowImportException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -732,7 +732,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowImportException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -783,7 +783,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
               argv[i]);
             if (endian < 0)
               ThrowImportException(OptionError,"UnrecognizedEndianType",
@@ -804,7 +804,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowImportException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowImportException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -850,7 +850,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,argv[i]);
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,argv[i]);
             if (gravity < 0)
               ThrowImportException(OptionError,"UnrecognizedGravityType",
                 argv[i]);
@@ -878,7 +878,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowImportException(OptionError,"UnrecognizedInterlaceType",
@@ -895,7 +895,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowImportException(OptionError,"UnrecognizedInterpolateMethod",
@@ -934,7 +934,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowImportException(OptionError,"UnrecognizedResourceType",
@@ -958,7 +958,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowImportException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -1062,7 +1062,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowImportException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowImportException(OptionError,"UnrecognizedColorspace",
@@ -1250,7 +1250,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowImportException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickTypeOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowImportException(OptionError,"UnrecognizedImageType",argv[i]);
             break;
@@ -1285,8 +1285,8 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
       default:
         ThrowImportException(OptionError,"UnrecognizedOption",option);
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }

diff --git a/wand/magick-property.c b/wand/magick-property.c
index 4bacb563517d9ec66deec214e7dbfb708f538c8e..77d105d06a70c8e38dd5440ac3db0628b85a2f0e 100644 (file)
--- a/wand/magick-property.c
+++ b/wand/magick-property.c
@@ -496,7 +496,7 @@ WandExport GravityType MagickGetGravity(MagickWand *wand)
   option=GetImageOption(wand->image_info,"gravity");
   if (option == (const char *) NULL)
     return(UndefinedGravity);
-  type=(GravityType) ParseMagickOption(MagickGravityOptions,MagickFalse,option);
+  type=(GravityType) ParseCommandOption(MagickGravityOptions,MagickFalse,option);
   return(type);
 }
 \f
@@ -1017,7 +1017,7 @@ WandExport InterpolatePixelMethod MagickGetInterpolateMethod(MagickWand *wand)
   option=GetImageOption(wand->image_info,"interpolate");
   if (option == (const char *) NULL)
     return(UndefinedInterpolatePixel);
-  method=(InterpolatePixelMethod) ParseMagickOption(MagickInterpolateOptions,
+  method=(InterpolatePixelMethod) ParseCommandOption(MagickInterpolateOptions,
     MagickFalse,option);
   return(method);
 }
@@ -2211,7 +2211,7 @@ WandExport MagickBooleanType MagickSetGravity(MagickWand *wand,
   assert(wand->signature == WandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
-  status=SetImageOption(wand->image_info,"gravity",MagickOptionToMnemonic(
+  status=SetImageOption(wand->image_info,"gravity",CommandOptionToMnemonic(
     MagickGravityOptions,(ssize_t) type));
   return(status);
 }
@@ -2435,7 +2435,7 @@ WandExport MagickBooleanType MagickSetInterpolateMethod(MagickWand *wand,
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   status=SetImageOption(wand->image_info,"interpolate",
-    MagickOptionToMnemonic(MagickInterpolateOptions,(ssize_t) method));
+    CommandOptionToMnemonic(MagickInterpolateOptions,(ssize_t) method));
   return(status);
 }
 \f

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 33100c1de827221a1f57f0921c3baebb5b99c165..47f19edeb975eb92d24b010b03d08230975b6680 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -680,11 +680,10 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
       count;
 
     option=argv[i];
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       continue;
-    count=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    count=ParseCommandOption(MagickCommandOptions,MagickFalse,option);
     count=MagickMax(count,0L);
-    count&=NumArgsOption;
     if ((i+count) >= (ssize_t) argc)
       break;
     status=MogrifyImageInfo(mogrify_info,(int) count+1,argv+i,exception);
@@ -749,7 +748,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               alpha_type;
 
             (void) SyncImageSettings(mogrify_info,*image);
-            alpha_type=(AlphaChannelType) ParseMagickOption(MagickAlphaOptions,
+            alpha_type=(AlphaChannelType) ParseCommandOption(MagickAlphaOptions,
               MagickFalse,argv[i+1]);
             (void) SetImageAlphaChannel(*image,alpha_type);
             InheritException(exception,&(*image)->exception);
@@ -1155,7 +1154,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 InheritException(exception,&(*image)->exception);
                 break;
               }
-            colorspace=(ColorspaceType) ParseMagickOption(
+            colorspace=(ColorspaceType) ParseCommandOption(
               MagickColorspaceOptions,MagickFalse,argv[i+1]);
             (void) TransformImageColorspace(*image,colorspace);
             InheritException(exception,&(*image)->exception);
@@ -1350,7 +1349,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               Distort image.
             */
             (void) SyncImageSettings(mogrify_info,*image);
-            method=(DistortImageMethod) ParseMagickOption(MagickDistortOptions,
+            method=(DistortImageMethod) ParseCommandOption(MagickDistortOptions,
               MagickFalse,argv[i+1]);
             if ( method == ResizeDistortion )
               {
@@ -1408,7 +1407,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 break;
               }
             quantize_info->dither=MagickTrue;
-            quantize_info->dither_method=(DitherMethod) ParseMagickOption(
+            quantize_info->dither_method=(DitherMethod) ParseCommandOption(
               MagickDitherOptions,MagickFalse,argv[i+1]);
             if (quantize_info->dither_method == NoDitherMethod)
               quantize_info->dither=MagickFalse;
@@ -1504,7 +1503,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               op;
 
             (void) SyncImageSettings(mogrify_info,*image);
-            op=(MagickEvaluateOperator) ParseMagickOption(MagickEvaluateOptions,
+            op=(MagickEvaluateOperator) ParseCommandOption(MagickEvaluateOptions,
               MagickFalse,argv[i+1]);
             constant=SiPrefixToDouble(argv[i+2],QuantumRange);
             (void) EvaluateImageChannel(*image,channel,op,constant,exception);
@@ -1670,7 +1669,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               Function Modify Image Values
             */
             (void) SyncImageSettings(mogrify_info,*image);
-            function=(MagickFunction) ParseMagickOption(MagickFunctionOptions,
+            function=(MagickFunction) ParseCommandOption(MagickFunctionOptions,
               MagickFalse,argv[i+1]);
             arguments=InterpretImageProperties(mogrify_info,*image,argv[i+2]);
             InheritException(exception,&(*image)->exception);
@@ -1769,7 +1768,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 draw_info->gravity=UndefinedGravity;
                 break;
               }
-            draw_info->gravity=(GravityType) ParseMagickOption(
+            draw_info->gravity=(GravityType) ParseCommandOption(
               MagickGravityOptions,MagickFalse,argv[i+1]);
             break;
           }
@@ -2118,7 +2117,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             (void) SyncImageSettings(mogrify_info,*image);
             p=argv[i+1];
             GetMagickToken(p,&p,token);
-            method=(MorphologyMethod) ParseMagickOption(MagickMorphologyOptions,
+            method=(MorphologyMethod) ParseCommandOption(MagickMorphologyOptions,
               MagickFalse,token);
             iterations=1L;
             GetMagickToken(p,&p,token);
@@ -2179,7 +2178,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 NoiseType
                   noise;
 
-                noise=(NoiseType) ParseMagickOption(MagickNoiseOptions,
+                noise=(NoiseType) ParseCommandOption(MagickNoiseOptions,
                   MagickFalse,argv[i+1]);
                 mogrify_image=AddNoiseImageChannel(*image,channel,noise,
                   exception);
@@ -2302,7 +2301,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             if (*option == '+')
               preview_type=UndefinedPreview;
             else
-              preview_type=(PreviewType) ParseMagickOption(MagickPreviewOptions,
+              preview_type=(PreviewType) ParseCommandOption(MagickPreviewOptions,
                 MagickFalse,argv[i+1]);
             mogrify_image=PreviewImage(*image,preview_type,exception);
             break;
@@ -2384,7 +2383,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 quantize_info->colorspace=UndefinedColorspace;
                 break;
               }
-            quantize_info->colorspace=(ColorspaceType) ParseMagickOption(
+            quantize_info->colorspace=(ColorspaceType) ParseCommandOption(
               MagickColorspaceOptions,MagickFalse,argv[i+1]);
             break;
           }
@@ -2802,7 +2801,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               Sparse Color Interpolated Gradient
             */
             (void) SyncImageSettings(mogrify_info,*image);
-            method=(SparseColorMethod) ParseMagickOption(
+            method=(SparseColorMethod) ParseCommandOption(
               MagickSparseColorOptions,MagickFalse,argv[i+1]);
             arguments=InterpretImageProperties(mogrify_info,*image,argv[i+2]);
             InheritException(exception,&(*image)->exception);
@@ -2839,7 +2838,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               type;
 
             (void) SyncImageSettings(mogrify_info,*image);
-            type=(StatisticType) ParseMagickOption(MagickStatisticOptions,
+            type=(StatisticType) ParseCommandOption(MagickStatisticOptions,
               MagickFalse,argv[i+1]);
             (void) ParseGeometry(argv[i+2],&geometry_info);
             mogrify_image=StatisticImageChannel(*image,channel,type,(size_t)
@@ -2853,7 +2852,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 draw_info->stretch=UndefinedStretch;
                 break;
               }
-            draw_info->stretch=(StretchType) ParseMagickOption(
+            draw_info->stretch=(StretchType) ParseCommandOption(
               MagickStretchOptions,MagickFalse,argv[i+1]);
             break;
           }
@@ -2900,7 +2899,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 draw_info->style=UndefinedStyle;
                 break;
               }
-            draw_info->style=(StyleType) ParseMagickOption(MagickStyleOptions,
+            draw_info->style=(StyleType) ParseCommandOption(MagickStyleOptions,
               MagickFalse,argv[i+1]);
             break;
           }
@@ -3030,7 +3029,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             if (*option == '+')
               type=UndefinedType;
             else
-              type=(ImageType) ParseMagickOption(MagickTypeOptions,MagickFalse,
+              type=(ImageType) ParseCommandOption(MagickTypeOptions,MagickFalse,
                 argv[i+1]);
             (*image)->type=UndefinedType;
             (void) SetImageType(*image,type);
@@ -3122,7 +3121,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
                 break;
               }
             (void) SetImageVirtualPixelMethod(*image,(VirtualPixelMethod)
-              ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+              ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i+1]));
             break;
           }
@@ -3687,7 +3686,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         char
           backup_filename[MaxTextExtent],
@@ -3814,7 +3813,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -4106,7 +4105,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
               argv[i]);
             if (colorspace < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedColorspace",
@@ -4136,7 +4135,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedImageCompression",
@@ -4219,7 +4218,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -4312,7 +4311,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            direction=ParseMagickOption(MagickDirectionOptions,MagickFalse,
+            direction=ParseCommandOption(MagickDirectionOptions,MagickFalse,
               argv[i]);
             if (direction < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedDirectionType",
@@ -4338,7 +4337,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -4352,7 +4351,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickDistortOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickDistortOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedDistortMethod",
                 argv[i]);
@@ -4371,7 +4370,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -4462,7 +4461,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            endian=ParseMagickOption(MagickEndianOptions,MagickFalse,argv[i]);
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,argv[i]);
             if (endian < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedEndianType",
                 argv[i]);
@@ -4482,7 +4481,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickEvaluateOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickEvaluateOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedEvaluateOperator",
                 argv[i]);
@@ -4503,7 +4502,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickEvaluateOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickEvaluateOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedEvaluateOperator",
                 argv[i]);
@@ -4563,7 +4562,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -4638,7 +4637,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickFunctionOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickFunctionOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedFunction",argv[i]);
              i++;
@@ -4710,7 +4709,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,argv[i]);
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,argv[i]);
             if (gravity < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedGravityType",
                 argv[i]);
@@ -4765,7 +4764,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            intent=ParseMagickOption(MagickIntentOptions,MagickFalse,argv[i]);
+            intent=ParseCommandOption(MagickIntentOptions,MagickFalse,argv[i]);
             if (intent < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedIntentType",
                 argv[i]);
@@ -4781,7 +4780,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedInterlaceType",
@@ -4809,7 +4808,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedInterpolateMethod",
@@ -4875,7 +4874,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickLayerOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickLayerOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedLayerMethod",
                 argv[i]);
@@ -4924,7 +4923,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedResourceType",
@@ -4957,7 +4956,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -5086,7 +5085,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             GetMagickToken(argv[i],NULL,token);
-            op=ParseMagickOption(MagickMorphologyOptions,MagickFalse,token);
+            op=ParseCommandOption(MagickMorphologyOptions,MagickFalse,token);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedMorphologyMethod",
                 token);
@@ -5128,7 +5127,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
                 ssize_t
                   noise;
 
-                noise=ParseMagickOption(MagickNoiseOptions,MagickFalse,argv[i]);
+                noise=ParseCommandOption(MagickNoiseOptions,MagickFalse,argv[i]);
                 if (noise < 0)
                   ThrowMogrifyException(OptionError,"UnrecognizedNoiseType",
                     argv[i]);
@@ -5173,7 +5172,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            orientation=ParseMagickOption(MagickOrientationOptions,MagickFalse,
+            orientation=ParseCommandOption(MagickOrientationOptions,MagickFalse,
               argv[i]);
             if (orientation < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedImageOrientation",
@@ -5309,7 +5308,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
               argv[i]);
             if (colorspace < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedColorspace",
@@ -5669,7 +5668,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickSparseColorOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickSparseColorOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedSparseColorMethod",
                 argv[i]);
@@ -5699,7 +5698,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            op=ParseMagickOption(MagickStatisticOptions,MagickFalse,argv[i]);
+            op=ParseCommandOption(MagickStatisticOptions,MagickFalse,argv[i]);
             if (op < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedStatisticType",
                 argv[i]);
@@ -5720,7 +5719,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            stretch=ParseMagickOption(MagickStretchOptions,MagickFalse,argv[i]);
+            stretch=ParseCommandOption(MagickStretchOptions,MagickFalse,argv[i]);
             if (stretch < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedStyleType",
                 argv[i]);
@@ -5758,7 +5757,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            style=ParseMagickOption(MagickStyleOptions,MagickFalse,argv[i]);
+            style=ParseCommandOption(MagickStyleOptions,MagickFalse,argv[i]);
             if (style < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedStyleType",
                 argv[i]);
@@ -5901,7 +5900,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickTypeOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedImageType",
                 argv[i]);
@@ -5932,7 +5931,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+            units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
               argv[i]);
             if (units < 0)
               ThrowMogrifyException(OptionError,"UnrecognizedUnitsType",
@@ -5996,7 +5995,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMogrifyException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowMogrifyException(OptionError,
@@ -6061,8 +6060,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
       default:
         ThrowMogrifyException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }
@@ -6137,11 +6136,10 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
   for (i=0; i < (ssize_t) argc; i++)
   {
     option=argv[i];
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       continue;
-    count=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    count=ParseCommandOption(MagickCommandOptions,MagickFalse,option);
     count=MagickMax(count,0L);
-    count&=NumArgsOption;
     if ((i+count) >= (ssize_t) argc)
       break;
     switch (*(option+1))
@@ -6297,7 +6295,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->colorspace=(ColorspaceType) ParseMagickOption(
+            image_info->colorspace=(ColorspaceType) ParseCommandOption(
               MagickColorspaceOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -6310,7 +6308,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->compression=(CompressionType) ParseMagickOption(
+            image_info->compression=(CompressionType) ParseCommandOption(
               MagickCompressOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -6343,7 +6341,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->compression=(CompressionType) ParseMagickOption(
+            image_info->compression=(CompressionType) ParseCommandOption(
               MagickCompressOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -6482,7 +6480,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->endian=(EndianType) ParseMagickOption(
+            image_info->endian=(EndianType) ParseCommandOption(
               MagickEndianOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -6606,7 +6604,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->interlace=(InterlaceType) ParseMagickOption(
+            image_info->interlace=(InterlaceType) ParseCommandOption(
               MagickInterlaceOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -6679,7 +6677,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
 
             if (*option == '+')
               break;
-            type=(ResourceType) ParseMagickOption(MagickResourceOptions,
+            type=(ResourceType) ParseCommandOption(MagickResourceOptions,
               MagickFalse,argv[i+1]);
             limit=MagickResourceInfinity;
             if (LocaleCompare("unlimited",argv[i+2]) != 0)
@@ -6695,7 +6693,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             /*
               Display configuration list.
             */
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i+1]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i+1]);
             switch (list)
             {
               case MagickCoderOptions:
@@ -6770,7 +6768,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
               }
               default:
               {
-                (void) ListMagickOptions((FILE *) NULL,(MagickOption) list,
+                (void) ListCommandOptions((FILE *) NULL,(CommandOption) list,
                   exception);
                 break;
               }
@@ -6845,7 +6843,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->orientation=(OrientationType) ParseMagickOption(
+            image_info->orientation=(OrientationType) ParseCommandOption(
               MagickOrientationOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -6930,7 +6928,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 image_info->preview_type=UndefinedPreview;
                 break;
               }
-            image_info->preview_type=(PreviewType) ParseMagickOption(
+            image_info->preview_type=(PreviewType) ParseCommandOption(
               MagickPreviewOptions,MagickFalse,argv[i+1]);
             break;
           }
@@ -7132,7 +7130,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->type=(ImageType) ParseMagickOption(MagickTypeOptions,
+            image_info->type=(ImageType) ParseCommandOption(MagickTypeOptions,
               MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -7159,7 +7157,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }
-            image_info->units=(ResolutionType) ParseMagickOption(
+            image_info->units=(ResolutionType) ParseCommandOption(
               MagickResolutionOptions,MagickFalse,argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -7199,7 +7197,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
                 break;
               }
             image_info->virtual_pixel_method=(VirtualPixelMethod)
-              ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+              ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i+1]);
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
@@ -7309,11 +7307,10 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
     if (*images == (Image *) NULL)
       break;
     option=argv[i];
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       continue;
-    count=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    count=ParseCommandOption(MagickCommandOptions,MagickFalse,option);
     count=MagickMax(count,0L);
-    count&=NumArgsOption;
     if ((i+count) >= (ssize_t) argc)
       break;
     status=MogrifyImageInfo(mogrify_info,(int) count+1,argv+i,exception);
@@ -7553,7 +7550,7 @@ This has been merged completely into MogrifyImage()
                 break;
               }
             quantize_info->dither=MagickTrue;
-            quantize_info->dither_method=(DitherMethod) ParseMagickOption(
+            quantize_info->dither_method=(DitherMethod) ParseCommandOption(
               MagickDitherOptions,MagickFalse,argv[i+1]);
             break;
           }
@@ -7598,7 +7595,7 @@ This has been merged completely into MogrifyImage()
               op;
 
             (void) SyncImageSettings(mogrify_info,*images);
-            op=(MagickEvaluateOperator) ParseMagickOption(MagickEvaluateOptions,
+            op=(MagickEvaluateOperator) ParseCommandOption(MagickEvaluateOptions,
               MagickFalse,argv[i+1]);
             evaluate_image=EvaluateImages(*images,op,exception);
             if (evaluate_image == (Image *) NULL)
@@ -7769,7 +7766,7 @@ This has been merged completely into MogrifyImage()
 
             (void) SyncImagesSettings(mogrify_info,*images);
             layers=(Image *) NULL;
-            method=(ImageLayerMethod) ParseMagickOption(MagickLayerOptions,
+            method=(ImageLayerMethod) ParseCommandOption(MagickLayerOptions,
               MagickFalse,argv[i+1]);
             switch (method)
             {
@@ -7912,7 +7909,7 @@ This has been merged completely into MogrifyImage()
                 compose=OverCompositeOp;
                 option=GetImageOption(mogrify_info,"compose");
                 if (option != (const char *) NULL)
-                  compose=(CompositeOperator) ParseMagickOption(
+                  compose=(CompositeOperator) ParseCommandOption(
                     MagickComposeOptions,MagickFalse,option);
                 CompositeLayers(*images,compose,source,geometry.x,geometry.y,
                   exception);

diff --git a/wand/montage.c b/wand/montage.c
index 00e693006db0ef18cbcc9d77a72a26e5510c84c0..48b5cabc3fd9cea37d5598c3592b49f63fd322d1 100644 (file)
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -385,7 +385,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         Image
           *images;
@@ -466,7 +466,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickAlphaOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickAlphaOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowMontageException(OptionError,"UnrecognizedAlphaChannelType",
                 argv[i]);
@@ -666,7 +666,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowMontageException(OptionError,"UnrecognizedColorspace",
@@ -692,7 +692,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            compose=ParseMagickOption(MagickComposeOptions,MagickFalse,argv[i]);
+            compose=ParseCommandOption(MagickComposeOptions,MagickFalse,argv[i]);
             if (compose < 0)
               ThrowMontageException(OptionError,"UnrecognizedComposeOperator",
                 argv[i]);
@@ -710,7 +710,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowMontageException(OptionError,"UnrecognizedCompressType",
@@ -744,7 +744,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowMontageException(OptionError,"UnrecognizedEventType",
                 argv[i]);
@@ -809,7 +809,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            dispose=ParseMagickOption(MagickDisposeOptions,MagickFalse,argv[i]);
+            dispose=ParseCommandOption(MagickDisposeOptions,MagickFalse,argv[i]);
             if (dispose < 0)
               ThrowMontageException(OptionError,"UnrecognizedDisposeMethod",
                 argv[i]);
@@ -825,7 +825,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickDitherOptions,MagickFalse,argv[i]);
+            method=ParseCommandOption(MagickDitherOptions,MagickFalse,argv[i]);
             if (method < 0)
               ThrowMontageException(OptionError,"UnrecognizedDitherMethod",
                 argv[i]);
@@ -885,7 +885,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            endian=ParseMagickOption(MagickEndianOptions,MagickFalse,
+            endian=ParseCommandOption(MagickEndianOptions,MagickFalse,
               argv[i]);
             if (endian < 0)
               ThrowMontageException(OptionError,"UnrecognizedEndianType",
@@ -929,7 +929,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            filter=ParseMagickOption(MagickFilterOptions,MagickFalse,argv[i]);
+            filter=ParseCommandOption(MagickFilterOptions,MagickFalse,argv[i]);
             if (filter < 0)
               ThrowMontageException(OptionError,"UnrecognizedImageFilter",
                 argv[i]);
@@ -1016,7 +1016,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            gravity=ParseMagickOption(MagickGravityOptions,MagickFalse,
+            gravity=ParseCommandOption(MagickGravityOptions,MagickFalse,
               argv[i]);
             if (gravity < 0)
               ThrowMontageException(OptionError,"UnrecognizedGravityType",
@@ -1058,7 +1058,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowMontageException(OptionError,"UnrecognizedInterlaceType",
@@ -1075,7 +1075,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowMontageException(OptionError,"UnrecognizedInterpolateMethod",
@@ -1126,7 +1126,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowMontageException(OptionError,"UnrecognizedResourceType",
@@ -1150,7 +1150,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowMontageException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -1325,7 +1325,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMontageException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowMontageException(OptionError,"UnrecognizedColorspace",
@@ -1639,7 +1639,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickTypeOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickTypeOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowMontageException(OptionError,"UnrecognizedImageType",
                 argv[i]);
@@ -1659,7 +1659,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowMontageException(OptionError,"MissingArgument",option);
-            units=ParseMagickOption(MagickResolutionOptions,MagickFalse,
+            units=ParseCommandOption(MagickResolutionOptions,MagickFalse,
               argv[i]);
             if (units < 0)
               ThrowMontageException(OptionError,"UnrecognizedUnitsType",
@@ -1704,7 +1704,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowMontageException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowMontageException(OptionError,
@@ -1733,8 +1733,8 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
       default:
         ThrowMontageException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickTrue,MagickTrue,MagickTrue);
   }

diff --git a/wand/stream.c b/wand/stream.c
index 162e4befd211385fd3ef84f8690d6ac93fa0b848..1f4c490beaedc19a3294c06daf25a56185df75e3 100644 (file)
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -283,7 +283,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
         PopImageStack();
         continue;
       }
-    if (IsMagickOption(option) == MagickFalse)
+    if (IsCommandOption(option) == MagickFalse)
       {
         Image
           *images;
@@ -359,7 +359,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowStreamException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,MagickFalse,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
               argv[i]);
             if (colorspace < 0)
               ThrowStreamException(OptionError,"UnrecognizedColorspace",
@@ -376,7 +376,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowStreamException(OptionError,"MissingArgument",option);
-            compress=ParseMagickOption(MagickCompressOptions,MagickFalse,
+            compress=ParseCommandOption(MagickCompressOptions,MagickFalse,
               argv[i]);
             if (compress < 0)
               ThrowStreamException(OptionError,"UnrecognizedImageCompression",
@@ -399,7 +399,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowStreamException(OptionError,"MissingArgument",option);
-            event=ParseMagickOption(MagickLogEventOptions,MagickFalse,argv[i]);
+            event=ParseCommandOption(MagickLogEventOptions,MagickFalse,argv[i]);
             if (event < 0)
               ThrowStreamException(OptionError,"UnrecognizedEventType",argv[i]);
             (void) SetLogEventMask(argv[i]);
@@ -493,7 +493,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowStreamException(OptionError,"MissingArgument",option);
-            interlace=ParseMagickOption(MagickInterlaceOptions,MagickFalse,
+            interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse,
               argv[i]);
             if (interlace < 0)
               ThrowStreamException(OptionError,"UnrecognizedInterlaceType",
@@ -510,7 +510,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowStreamException(OptionError,"MissingArgument",option);
-            interpolate=ParseMagickOption(MagickInterpolateOptions,MagickFalse,
+            interpolate=ParseCommandOption(MagickInterpolateOptions,MagickFalse,
               argv[i]);
             if (interpolate < 0)
               ThrowStreamException(OptionError,"UnrecognizedInterpolateMethod",
@@ -537,7 +537,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowStreamException(OptionError,"MissingArgument",option);
-            resource=ParseMagickOption(MagickResourceOptions,MagickFalse,
+            resource=ParseCommandOption(MagickResourceOptions,MagickFalse,
               argv[i]);
             if (resource < 0)
               ThrowStreamException(OptionError,"UnrecognizedResourceType",
@@ -561,7 +561,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) argc)
               ThrowStreamException(OptionError,"MissingArgument",option);
-            list=ParseMagickOption(MagickListOptions,MagickFalse,argv[i]);
+            list=ParseCommandOption(MagickListOptions,MagickFalse,argv[i]);
             if (list < 0)
               ThrowStreamException(OptionError,"UnrecognizedListType",argv[i]);
             status=MogrifyImageInfo(image_info,(int) (i-j+1),(const char **)
@@ -607,7 +607,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowStreamException(OptionError,"MissingArgument",option);
-            colorspace=ParseMagickOption(MagickColorspaceOptions,
+            colorspace=ParseCommandOption(MagickColorspaceOptions,
               MagickFalse,argv[i]);
             if (colorspace < 0)
               ThrowStreamException(OptionError,"UnrecognizedColorspace",
@@ -686,7 +686,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowStreamException(OptionError,"MissingArgument",option);
-            type=ParseMagickOption(MagickStorageOptions,MagickFalse,argv[i]);
+            type=ParseCommandOption(MagickStorageOptions,MagickFalse,argv[i]);
             if (type < 0)
               ThrowStreamException(OptionError,"UnrecognizedStorageType",
                 argv[i]);
@@ -735,7 +735,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
             i++;
             if (i == (ssize_t) (argc-1))
               ThrowStreamException(OptionError,"MissingArgument",option);
-            method=ParseMagickOption(MagickVirtualPixelOptions,MagickFalse,
+            method=ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
               argv[i]);
             if (method < 0)
               ThrowStreamException(OptionError,
@@ -749,8 +749,8 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
       default:
         ThrowStreamException(OptionError,"UnrecognizedOption",option)
     }
-    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
-            &FireOption) == 0 ?  MagickFalse : MagickTrue;
+    fire=(GetCommandOptionFlags(MagickCommandOptions,MagickFalse,option) &
+      FireOptionFlag) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }