(no commit message)

diff --git a/MagickCore/option.c b/MagickCore/option.c
index c185270e6ef7086e8e966aa69ea2b0712b9b6702..df485560058aed893698628804d029b164f648a2 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1264,6 +1264,7 @@ static const OptionInfo
     { "Orientation", MagickOrientationOptions, UndefinedOptionFlag, MagickFalse },
     { "PixelChannel", MagickPixelChannelOptions, UndefinedOptionFlag, MagickFalse },
     { "PixelIntensity", MagickPixelIntensityOptions, UndefinedOptionFlag, MagickFalse },
+    { "PixelMask", MagickPixelMaskOptions, UndefinedOptionFlag, MagickFalse },
     { "PixelTrait", MagickPixelTraitOptions, UndefinedOptionFlag, MagickFalse },
     { "Policy", MagickPolicyOptions, UndefinedOptionFlag, MagickFalse },
     { "PolicyDomain", MagickPolicyDomainOptions, UndefinedOptionFlag, MagickFalse },
@@ -1444,6 +1445,15 @@ static const OptionInfo
     { "RMS", RMSPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
     { (char *) NULL, UndefinedPixelIntensityMethod, UndefinedOptionFlag, MagickFalse }
   },
+  PixelMaskOptions[] =
+  {
+    { "Undefined", UndefinedPixelMask, UndefinedOptionFlag, MagickTrue },
+    { "R", ReadPixelMask, UndefinedOptionFlag, MagickFalse },
+    { "Read", ReadPixelMask, UndefinedOptionFlag, MagickFalse },
+    { "W", WritePixelMask, UndefinedOptionFlag, MagickFalse },
+    { "Write", WritePixelMask, UndefinedOptionFlag, MagickFalse },
+    { (char *) NULL, UndefinedPixelMask, UndefinedOptionFlag, MagickFalse }
+  },
   PixelTraitOptions[] =
   {
     { "Undefined", UndefinedPixelTrait, UndefinedOptionFlag, MagickTrue },
@@ -1718,6 +1728,7 @@ static const OptionInfo *GetOptionInfo(const CommandOption option)
     case MagickOrientationOptions: return(OrientationOptions);
     case MagickPixelChannelOptions: return(PixelChannelOptions);
     case MagickPixelIntensityOptions: return(PixelIntensityOptions);
+    case MagickPixelMaskOptions: return(PixelMaskOptions);
     case MagickPixelTraitOptions: return(PixelTraitOptions);
     case MagickPolicyDomainOptions: return(PolicyDomainOptions);
     case MagickPolicyRightsOptions: return(PolicyRightsOptions);

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 53a3995317865fbb4bf1f72efd13432e1052cd8e..4cfacadc2a0442da57d633c4b1c06965fda352df 100644 (file)
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -78,6 +78,7 @@ typedef enum
   MagickOrientationOptions,
   MagickPixelChannelOptions,
   MagickPixelIntensityOptions,
+  MagickPixelMaskOptions,
   MagickPixelTraitOptions,
   MagickPolicyOptions,
   MagickPolicyDomainOptions,