(no commit message)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 8af8015e86e71b5e5e0ca1802d75ab3420debe2f..db22bf3a69f6cab6bcce671fad0f108552969314 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -4344,7 +4344,7 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha,
   border_image=DestroyImage(border_image);
   if (shadow_image == (Image *) NULL)
     return((Image *) NULL);
-  (void) SetPixelChannelMask(shadow_image,channel_mask);
+  SetPixelChannelMask(shadow_image,channel_mask);
   if (shadow_image->page.width == 0)
     shadow_image->page.width=shadow_image->columns;
   if (shadow_image->page.height == 0)
@@ -4632,7 +4632,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
       {
         PixelChannel channel=GetPixelChannelChannel(image,i);
         PixelTrait traits=GetPixelChannelTraits(image,channel);
-        if ((traits == UndefinedPixelTrait) || ((traits & CopyPixelTrait) != 0))
+        if ((traits & UpdatePixelTrait) == 0)
           continue;
         if ((double) q[i] > threshold)
           q[i]=QuantumRange-q[i];

diff --git a/MagickCore/image.c b/MagickCore/image.c
index d38834344325bdc4393d3fed09a7377b12f3c2be..90fc91d90d22c611d974bff58046c909339af93c 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -3483,9 +3483,6 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
   if (option != (const char *) NULL)
     (void) QueryColorCompliance(option,AllCompliance,&image->border_color,
       exception);
-  option=GetImageOption(image_info,"channel");
-  if (option != (const char *) NULL)
-    (void) SetPixelChannelMask(image,(ChannelType) ParseChannelOption(option));
   /* FUTURE: do not sync compose to per-image compose setting here */
   option=GetImageOption(image_info,"compose");
   if (option != (const char *) NULL)

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 792c41e306a34f7245419b861e478dc7a7070970..4f0141dd27936967cff9653f90e2a980692ee05a 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -277,8 +277,8 @@ static const OptionInfo
     { "-caption", 1L, ImageInfoOptionFlag | NeverInterpretArgsFlag, MagickFalse },
     { "+cdl", 1L, DeprecateOptionFlag, MagickTrue },
     { "-cdl", 1L, SimpleOperatorFlag | NeverInterpretArgsFlag, MagickFalse },
-    { "+channel", 0L, ImageInfoOptionFlag, MagickFalse },
-    { "-channel", 1L, ImageInfoOptionFlag, MagickFalse },
+    { "+channel", 0L, SimpleOperatorFlag, MagickFalse },
+    { "-channel", 1L, SimpleOperatorFlag, MagickFalse },
     { "-channel-fx", 1L, ListOperatorFlag | FireOptionFlag, MagickFalse },
     { "+charcoal", 1L, DeprecateOptionFlag, MagickTrue },
     { "-charcoal", 1L, SimpleOperatorFlag, MagickFalse },
@@ -443,8 +443,8 @@ static const OptionInfo
     { "-geometry", 1L, SimpleOperatorFlag, MagickFalse },
     { "+gravity", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse },
     { "-gravity", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse },
-    { "-grayscale", 1L, SimpleOperatorFlag, MagickFalse },
     { "+grayscale", 1L, SimpleOperatorFlag, MagickTrue },
+    { "-grayscale", 1L, SimpleOperatorFlag, MagickFalse },
     { "+green-primary", 0L, ImageInfoOptionFlag, MagickFalse },
     { "-green-primary", 1L, ImageInfoOptionFlag, MagickFalse },
     { "+hald-clut", 0L, DeprecateOptionFlag | FireOptionFlag, MagickTrue },
@@ -549,8 +549,8 @@ static const OptionInfo
     { "-motion-blur", 1L, SimpleOperatorFlag, MagickFalse },
     { "+name", 0L, NonMagickOptionFlag, MagickFalse },
     { "-name", 1L, NonMagickOptionFlag, MagickFalse },
-    { "-negate", 0L, SimpleOperatorFlag, MagickFalse },
     { "+negate", 0L, SimpleOperatorFlag, MagickFalse },
+    { "-negate", 0L, SimpleOperatorFlag, MagickFalse },
     { "-noise", 1L, ReplacedOptionFlag | SimpleOperatorFlag, MagickFalse },
     { "+noise", 1L, SimpleOperatorFlag, MagickFalse },
     { "-noop", 0L, NoImageOperatorFlag, MagickFalse },

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 5b3e55142dfaea8ef33b4c0ce5c3f29b0c8c9723..b6b3e262733e97707d1d5a01aa9b99ee2afd94b8 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4348,7 +4348,7 @@ MagickExport void InitializePixelChannelMap(Image *image)
   image->number_channels=(size_t) n;
   if (image->debug != MagickFalse)
     LogPixelChannels(image);
-  (void) SetImageChannelMask(image,image->channel_mask);
+  SetImageChannelMask(image,image->channel_mask);
 }
 \f
 /*

diff --git a/MagickWand/animate.c b/MagickWand/animate.c
index 50c8d6eddffc3df86f3310e3773ca093ad9ef965..eb3b2a4aca886e4bd700f70b0a31cfbc51c6cd4f 100644 (file)
--- a/MagickWand/animate.c
+++ b/MagickWand/animate.c
@@ -112,6 +112,7 @@ static MagickBooleanType AnimateUsage(void)
     },
     *operators[]=
     {
+      "-channel mask        set the image channel mask",
       "-colors value        preferred number of colors in the image",
       "-crop geometry       preferred size and location of the cropped image",
       "-extract geometry    extract area from image",
@@ -132,7 +133,6 @@ static MagickBooleanType AnimateUsage(void)
       "-authenticate password",
       "                     decipher image with this password",
       "-backdrop            display image centered on a backdrop",
-      "-channel type        apply option to select image channels",
       "-colormap type       Shared or Private",
       "-colorspace type     alternate image colorspace",
       "-decipher filename   convert cipher pixels to plain pixels",

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 1d9238aecd262f450ee432767148895980fb9dc3..4c48e430a904d3a718d3e2eebd13191b197b3d28 100644 (file)
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -88,6 +88,7 @@ static MagickBooleanType CompareUsage(void)
   static const char
     *miscellaneous[]=
     {
+      "-channel mask        set the image channel mask",
       "-debug events        display copious debugging information",
       "-help                print program options",
       "-list type           print a list of supported option arguments",
@@ -100,7 +101,6 @@ static MagickBooleanType CompareUsage(void)
       "                     transparent, extract, background, or shape",
       "-authenticate password",
       "                     decipher image with this password",
-      "-channel type        apply option to select image channels",
       "-colorspace type     alternate image colorspace",
       "-compose operator    set image composite operator",
       "-compress type       type of pixel compression when writing the image",

diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index cfcdd4d8199a2cb2016438a30a42307715c28960..3cce15fe895ce8d8472f62416f4a88157bff857c 100644 (file)
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -245,6 +245,7 @@ static MagickBooleanType CompositeUsage(void)
       "-blend geometry      blend images",
       "-border geometry     surround image with a border of color",
       "-bordercolor color   border color",
+      "-channel mask        set the image channel mask",
       "-colors value        preferred number of colors in the image",
       "-decipher filename    convert cipher pixels to plain pixels",
       "-displace geometry   shift lookup according to a relative displacement map",
@@ -282,7 +283,6 @@ static MagickBooleanType CompositeUsage(void)
       "-authenticate password",
       "                     decipher image with this password",
       "-blue-primary point  chromaticity blue primary point",
-      "-channel type        apply option to select image channels",
       "-colorspace type     alternate image colorspace",
       "-comment string      annotate image with comment",
       "-compose operator    composite operator",

diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index 4db2fbaf6fd67619674780b4b39ac8a60e32f04f..15328b6a63bd6d279446c5400f77e8e6a56125c3 100644 (file)
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -182,6 +182,7 @@ static MagickBooleanType ConvertUsage(void)
       "                     improve brightness / contrast of the image",
       "-canny geometry      detect edges in the image",
       "-cdl filename        color correct with a color decision list",
+      "-channel mask        set the image channel mask",
       "-charcoal radius     simulate a charcoal drawing",
       "-chop geometry       remove pixels from the image interior",
       "-clamp               keep pixel values in range (0-QuantumRange)",
@@ -362,7 +363,6 @@ static MagickBooleanType ConvertUsage(void)
       "-blue-primary point  chromaticity blue primary point",
       "-bordercolor color   border color",
       "-caption string      assign a caption to an image",
-      "-channel type        apply option to select image channels",
       "-clip                clip along the first path from the 8BIM profile",
       "-clip-mask filename  associate a clip mask with the image",
       "-clip-path id        clip along a named path from the 8BIM profile",

diff --git a/MagickWand/identify.c b/MagickWand/identify.c
index 63367337db719d99228d1171a3cae7cc53ef4bb6..8afeb7c080cc328a74a51ac5407abcc398f3104c 100644 (file)
--- a/MagickWand/identify.c
+++ b/MagickWand/identify.c
@@ -107,6 +107,7 @@ static MagickBooleanType IdentifyUsage(void)
     },
     *operators[]=
     {
+      "-channel mask        set the image channel mask",
       "-grayscale method    convert image to grayscale",
       "-negate              replace every pixel with its complementary color ",
       (char *) NULL
@@ -118,7 +119,6 @@ static MagickBooleanType IdentifyUsage(void)
       "-antialias           remove pixel-aliasing",
       "-authenticate password",
       "                     decipher image with this password",
-      "-channel type        apply option to select image channels",
       "-clip                clip along the first path from the 8BIM profile",
       "-clip-mask filename  associate a clip mask with the image",
       "-clip-path id        clip along a named path from the 8BIM profile",

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 2430f4ab16ecf7197c21d69e8aec8849622ecdc3..25814b9667bd5053c0e01313b24be2ea99fbcf4d 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1019,6 +1019,21 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               exception);
             break;
           }
+        if (LocaleCompare("channel",option+1) == 0)
+          {
+            ChannelType
+              channel;
+
+            (void) SyncImageSettings(mogrify_info,*image,exception);
+            if (*option == '+')
+              {
+                SetPixelChannelMask(*image,DefaultChannels);
+                break;
+              }
+            channel=(ChannelType) ParseChannelOption(argv[i+1]);
+            SetPixelChannelMask(*image,channel);
+            break;
+          }
         if (LocaleCompare("charcoal",option+1) == 0)
           {
             /*
@@ -1044,16 +1059,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             mogrify_image=ChopImage(*image,&geometry,exception);
             break;
           }
-        if (LocaleCompare("perceptible",option+1) == 0)
-          {
-            /*
-              Perceptible image.
-            */
-            (void) SyncImageSettings(mogrify_info,*image,exception);
-            (void) PerceptibleImage(*image,StringToDouble(argv[i+1],
-              (char **) NULL),exception);
-            break;
-          }
         if (LocaleCompare("clip",option+1) == 0)
           {
             (void) SyncImageSettings(mogrify_info,*image,exception);
@@ -2324,6 +2329,16 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               geometry_info.sigma,exception);
             break;
           }
+        if (LocaleCompare("perceptible",option+1) == 0)
+          {
+            /*
+              Perceptible image.
+            */
+            (void) SyncImageSettings(mogrify_info,*image,exception);
+            (void) PerceptibleImage(*image,StringToDouble(argv[i+1],
+              (char **) NULL),exception);
+            break;
+          }
         if (LocaleCompare("pointsize",option+1) == 0)
           {
             if (*option == '+')
@@ -3362,6 +3377,7 @@ static MagickBooleanType MogrifyUsage(void)
       "                     improve brightness / contrast of the image",
       "-canny geometry      detect edges in the image",
       "-cdl filename        color correct with a color decision list",
+      "-channel mask        set the image channel mask",
       "-charcoal geometry   simulate a charcoal drawing",
       "-chop geometry       remove pixels from the image interior",
       "-clamp               keep pixel values in range (0-QuantumRange)",
@@ -3548,7 +3564,6 @@ static MagickBooleanType MogrifyUsage(void)
       "-blue-primary point  chromaticity blue primary point",
       "-bordercolor color   border color",
       "-caption string      assign a caption to an image",
-      "-channel type        apply option to select image channels",
       "-colors value        preferred number of colors in the image",
       "-colorspace type     alternate image colorspace",
       "-comment string      annotate image with comment",
@@ -6523,18 +6538,6 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
             (void) SetImageOption(image_info,option+1,argv[i+1]);
             break;
           }
-        if (LocaleCompare("channel",option+1) == 0)
-          {
-            if (*option == '+')
-              {
-                image_info->channel=DefaultChannels;
-                (void) SetImageOption(image_info,option+1,"default");
-                break;
-              }
-            image_info->channel=(ChannelType) ParseChannelOption(argv[i+1]);
-            (void) SetImageOption(image_info,option+1,argv[i+1]);
-            break;
-          }
         if (LocaleCompare("colorspace",option+1) == 0)
           {
             if (*option == '+')

diff --git a/MagickWand/montage.c b/MagickWand/montage.c
index 88aed69fed89eb4e57c85283bdb5c0278c890259..ee1c96603c94ec80a53fe280506edb30d878a46c 100644 (file)
--- a/MagickWand/montage.c
+++ b/MagickWand/montage.c
@@ -105,6 +105,7 @@ static MagickBooleanType MontageUsage(void)
       "-auto-orient         automagically orient image",
       "-blur geometry      reduce image noise and reduce detail levels",
       "-border geometry     surround image with a border of color",
+      "-channel mask        set the image channel mask",
       "-crop geometry       preferred size and location of the cropped image",
       "-extent geometry     set the image size",
       "-flatten             flatten a sequence of images",
@@ -135,7 +136,6 @@ static MagickBooleanType MontageUsage(void)
       "-blue-primary point  chromaticity blue primary point",
       "-bordercolor color   border color",
       "-caption string      assign a caption to an image",
-      "-channel type        apply option to select image channels",
       "-colors value        preferred number of colors in the image",
       "-colorspace type     alternate image colorsapce",
       "-comment string      annotate image with comment",

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index cda04fe005129c6b5d1dcd9085e8deff349a839d..b418c0478096cf9269261612248bbe2e647531fa 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -604,27 +604,17 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand,
           (void) SetImageOption(_image_info,option+1,ArgOption(NULL));
           break;
         }
-      if (LocaleCompare("channel",option+1) == 0)
-        {
-          parse=ParseChannelOption(ArgOption("Default"));
-          if (parse < 0)
-            CLIWandExceptArgBreak(OptionError,"UnrecognizedChannelType",
-                 option,arg1);
-          _image_info->channel=(ChannelType) parse;
-          (void) SetImageOption(_image_info,option+1,arg1);
-          break;
-        }
       if (LocaleCompare("colorspace",option+1) == 0)
         {
           /* Setting used for new images via AquireImage()
              But also used as a SimpleImageOperator
              Undefined colorspace means don't modify images on
              read or as a operation */
-          parse = ParseCommandOption(MagickColorspaceOptions,MagickFalse,
-                        ArgOption("undefined"));
+          parse=ParseCommandOption(MagickColorspaceOptions,MagickFalse,
+             ArgOption("undefined"));
           if (parse < 0)
-            CLIWandExceptArgBreak(OptionError,"UnrecognizedColorspace",
-                                    option,arg1);
+            CLIWandExceptArgBreak(OptionError,"UnrecognizedColorspace",option,
+              arg1);
           _image_info->colorspace=(ColorspaceType) parse;
           break;
         }
@@ -1951,6 +1941,20 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
             _exception);
           break;
         }
+      if (LocaleCompare("channel",option+1) == 0)
+        {
+          if (IfPlusOp)
+            {
+              SetPixelChannelMask(_image,DefaultChannels);
+              break;
+            }
+          parse=ParseChannelOption(arg1);
+          if (parse < 0)
+            CLIWandExceptArgBreak(OptionError,"UnrecognizedIntensityMethod",
+              option,arg1);
+          SetPixelChannelMask(_image,(ChannelType) parse);
+          break;
+        }
       if (LocaleCompare("charcoal",option+1) == 0)
         {
           flags=ParseGeometry(arg1,&geometry_info);

diff --git a/MagickWand/stream.c b/MagickWand/stream.c
index 495e9d22ecd6f87095fc2b654012eef418f14f94..6b764c65640f39cf1646c2207ca6f5b17daad38f 100644 (file)
--- a/MagickWand/stream.c
+++ b/MagickWand/stream.c
@@ -92,6 +92,7 @@ static MagickBooleanType StreamUsage(void)
   static const char
     *miscellaneous[]=
     {
+      "-channel mask        set the image channel mask",
       "-debug events        display copious debugging information",
       "-help                print program options",
       "-list type           print a list of supported option arguments",
@@ -103,7 +104,6 @@ static MagickBooleanType StreamUsage(void)
     {
       "-authenticate password",
       "                     decipher image with this password",
-      "-channel type        apply option to select image channels",
       "-colorspace type     alternate image colorspace",
       "-compress type       type of pixel compression when writing the image",
       "-define format:option",

diff --git a/utilities/animate.1 b/utilities/animate.1
index ae11cc49b616d1e18453bdc323c2ef36304e4a88..ffbdf0ee2b6dd2e582d005e21daf2f1f452d78b4 100644 (file)
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -14,7 +14,6 @@ Image Settings:
                         transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
   \-backdrop            display image centered on a backdrop
-  \-channel type        apply option to select image channels
   \-colormap type       Shared or Private
   \-colorspace type     alternate image colorspace
   \-decipher filename   convert cipher pixels to plain pixels
@@ -64,6 +63,7 @@ Image Settings:
   \-window id           display image to background of this window
 
 Image Operators:
+  \-channel mask        set the image channel mask
   \-colors value        preferred number of colors in the image
   \-crop geometry       preferred size and location of the cropped image
   \-extract geometry    extract area from image

diff --git a/utilities/animate.1.in b/utilities/animate.1.in
index 4a8d6b49aace85c342607c008561eb4e6172c636..2f78b83d381e605bc7d0d13c77cec66a9ad7ca2c 100644 (file)
--- a/utilities/animate.1.in
+++ b/utilities/animate.1.in
@@ -14,7 +14,6 @@ Image Settings:
                         transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
   \-backdrop            display image centered on a backdrop
-  \-channel type        apply option to select image channels
   \-colormap type       Shared or Private
   \-colorspace type     alternate image colorspace
   \-decipher filename   convert cipher pixels to plain pixels
@@ -64,6 +63,7 @@ Image Settings:
   \-window id           display image to background of this window
 
 Image Operators:
+  \-channel mask        set the image channel mask
   \-colors value        preferred number of colors in the image
   \-crop geometry       preferred size and location of the cropped image
   \-extract geometry    extract area from image

diff --git a/utilities/compare.1 b/utilities/compare.1
index dc9e27a069dbd582ae54a42ddf39d77adde0ae1a..71c571ee012c33eb3ec9eefcd2d30d8fd7b1ae82 100644 (file)
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -13,7 +13,6 @@ Image Settings:
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
   \                     transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
-  \-channel type        apply option to select image channels
   \-colorspace type     alternate image colorspace
   \-compose operator    set image composite operator
   \-compress type       type of pixel compression when writing the image
@@ -61,6 +60,7 @@ Image Settings:
                        virtual pixel access method
 
 Miscellaneous Options:
+  \-channel mask        set the image channel mask
   \-debug events        display copious debugging information
   \-help                print program options
   \-log format          format of debugging information

diff --git a/utilities/compare.1.in b/utilities/compare.1.in
index 886c587e04090a7f0c57804d30cffa489cc1bdae..7433e85f1d65121e8a9c42af4f3064fad5949318 100644 (file)
--- a/utilities/compare.1.in
+++ b/utilities/compare.1.in
@@ -13,7 +13,6 @@ Image Settings:
   \-alpha option        on, activate, off, deactivate, set, opaque, copy
   \                     transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
-  \-channel type        apply option to select image channels
   \-colorspace type     alternate image colorspace
   \-compose operator    set image composite operator
   \-compress type       type of pixel compression when writing the image
@@ -61,6 +60,7 @@ Image Settings:
                        virtual pixel access method
 
 Miscellaneous Options:
+  \-channel mask        set the image channel mask
   \-debug events        display copious debugging information
   \-help                print program options
   \-log format          format of debugging information

diff --git a/utilities/composite.1.in b/utilities/composite.1.in
index fde52a4425a474cd81868f5250907b6096b84bd3..5c621e3db17187791b475fb189eb34115a0059a1 100644 (file)
--- a/utilities/composite.1.in
+++ b/utilities/composite.1.in
@@ -15,7 +15,6 @@ Image Settings:
   \                     transparent, extract, background, or shape
   \-authenticate value  decrypt image with this password
   \-blue-primary point  chromaticity blue primary point
-  \-channel type        apply option to select image channels
   \-colorspace type     alternate image colorspace
   \-comment string      annotate image with comment
   \-compose operator    composite operator
@@ -71,6 +70,7 @@ Image Operators:
   \-blend geometry      blend images
   \-border geometry     surround image with a border of color
   \-bordercolor color   border color
+  \-channel mask        set the image channel mask
   \-colors value        preferred number of colors in the image
   \-displace geometry   shift image pixels defined by a displacement map
   \-dissolve value      dissolve the two images a given percent

diff --git a/utilities/convert.1.in b/utilities/convert.1.in
index 04a30851ead1d14d58b44cbce652a5fc9f09c6f5..be28747aeba503186dc4b84edb9f60ffa70cfde7 100644 (file)
--- a/utilities/convert.1.in
+++ b/utilities/convert.1.in
@@ -24,7 +24,6 @@ Image Settings:
   \-bordercolor color   border color
   \-caption string      assign a caption to an image
   \-cdl filename        color correct with a color decision list
-  \-channel type        apply option to select image channels
   \-clip                clip along the first path from the 8BIM profile
   \-clip-mask filename  associate a clip mask with the image
   \-clip-path id        clip along a named path from the 8BIM profile
@@ -136,6 +135,7 @@ Image Operators:
   \-brightness-contrast geometry
   \                     improve brightness / contrast of the image
   \-canny geometry      detect edges in the image
+  \-channel mask        set the image channel mask
   \-charcoal radius     simulate a charcoal drawing
   \-chop geometry       remove pixels from the image interior
   \-clamp               keep pixel values in range (0-QuantumRange)

diff --git a/utilities/display.1.in b/utilities/display.1.in
index d012c018a903c950b5d2a0196f6929ee283d7fe4..37d45e1fc048d530deb966d213d2a96fb5b360c7 100644 (file)
--- a/utilities/display.1.in
+++ b/utilities/display.1.in
@@ -15,7 +15,6 @@ Image Settings:
   \-antialias           remove pixel-aliasing
   \-authenticate value  decrypt image with this password
   \-backdrop            display image centered on a backdrop
-  \-channel type        apply option to select image channels
   \-colormap type       Shared or Private
   \-colorspace type     alternate image colorspace
   \-comment string      annotate image with comment
@@ -79,6 +78,7 @@ Image Settings:
 Image Operators:
   \-auto-orient         automatically orient image
   \-border geometry     surround image with a border of color
+  \-channel mask        set the image channel mask
   \-clip                clip along the first path from the 8BIM profile
   \-clip-path id        clip along a named path from the 8BIM profile
   \-colors value        preferred number of colors in the image

diff --git a/utilities/identify.1.in b/utilities/identify.1.in
index 6aba2ef6723fb0dce43a16fdd51f733045d51951..5000b5e7c4d63ed337b68675dedb0548fb261e56 100644 (file)
--- a/utilities/identify.1.in
+++ b/utilities/identify.1.in
@@ -14,7 +14,6 @@ Image Settings:
                        transparent, extract, background, or shape
   \-antialias           remove pixel-aliasing
   \-authenticate value  decrypt image with this password
-  \-channel type        apply option to select image channels
   \-clip                clip along the first path from the 8BIM profile
   \-clip-mask filename  associate a clip mask with the image
   \-clip-path id        clip along a named path from the 8BIM profile
@@ -58,6 +57,7 @@ Image Settings:
                        virtual pixel access method
 
 Image Operators:
+  \-channel mask        set the image channel mask
   \-grayscale method    convert image to grayscale
   \-negate              replace each pixel with its complementary color 
 

diff --git a/utilities/import.1.in b/utilities/import.1.in
index b0d08ca725bcbeb7538ad6e914d2c0ec51fd70bf..2d21cfe754cfa4847733c3223b2f783c3c3c0d1f 100644 (file)
--- a/utilities/import.1.in
+++ b/utilities/import.1.in
@@ -12,7 +12,6 @@ For more information about the import command, point your browser to file://@DOC
 Image Settings:
   \-adjoin              join images into a single multi-image file
   \-border              include window border in the output image
-  \-channel type        apply option to select image channels
   \-colorspace type     alternate image colorspace
   \-comment string      annotate image with comment
   \-compress type       type of pixel compression when writing the image
@@ -67,6 +66,7 @@ Image Settings:
 Image Operators:
   \-annotate geometry text
                        annotate the image with text
+  \-channel mask        set the image channel mask
   \-colors value        preferred number of colors in the image
   \-crop geometry       preferred size and location of the cropped image
   \-geometry geometry   preferred size or location of the image

diff --git a/utilities/magick-script.1.in b/utilities/magick-script.1.in
index 2a29b839e27d16b7d3fccd979973b7dc67db4772..ed9e90793821686f9342bca2bf614358c5e5b240 100644 (file)
--- a/utilities/magick-script.1.in
+++ b/utilities/magick-script.1.in
@@ -22,7 +22,6 @@ Image Settings:
   \-bordercolor color   border color
   \-caption string      assign a caption to an image
   \-cdl filename        color correct with a color decision list
-  \-channel type        apply option to select image channels
   \-colors value        preferred number of colors in the image
   \-colorspace type     alternate image colorspace
   \-comment string      annotate image with comment
@@ -114,6 +113,7 @@ Image Operators:
                        force all pixels below the threshold into black
   \-blur geometry       reduce image noise and reduce detail levels
   \-border geometry     surround image with a border of color
+  \-channel mask        set the image channel mask
   \-charcoal radius     simulate a charcoal drawing
   \-chop geometry       remove pixels from the image interior
   \-clip                clip along the first path from the 8BIM profile

diff --git a/utilities/magick.1.in b/utilities/magick.1.in
index 2a29b839e27d16b7d3fccd979973b7dc67db4772..ed9e90793821686f9342bca2bf614358c5e5b240 100644 (file)
--- a/utilities/magick.1.in
+++ b/utilities/magick.1.in
@@ -22,7 +22,6 @@ Image Settings:
   \-bordercolor color   border color
   \-caption string      assign a caption to an image
   \-cdl filename        color correct with a color decision list
-  \-channel type        apply option to select image channels
   \-colors value        preferred number of colors in the image
   \-colorspace type     alternate image colorspace
   \-comment string      annotate image with comment
@@ -114,6 +113,7 @@ Image Operators:
                        force all pixels below the threshold into black
   \-blur geometry       reduce image noise and reduce detail levels
   \-border geometry     surround image with a border of color
+  \-channel mask        set the image channel mask
   \-charcoal radius     simulate a charcoal drawing
   \-chop geometry       remove pixels from the image interior
   \-clip                clip along the first path from the 8BIM profile

diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in
index 3f63480b42e766ad722186103eebb52a6b1824b7..33f4ace5aa2b9dba7651181055fa600d0dcadf10 100644 (file)
--- a/utilities/mogrify.1.in
+++ b/utilities/mogrify.1.in
@@ -23,7 +23,6 @@ Image Settings:
   \-bordercolor color   border color
   \-caption string      assign a caption to an image
   \-cdl filename        color correct with a color decision list
-  \-channel type        apply option to select image channels
   \-colors value        preferred number of colors in the image
   \-colorspace type     alternate image colorspace
   \-comment string      annotate image with comment
@@ -134,6 +133,7 @@ Image Operators:
   \-brightness-contrast geometry
                        improve brightness / contrast of the image
   \-canny geometry      detect edges in the image
+  \-channel mask        set the image channel mask
   \-charcoal radius     simulate a charcoal drawing
   \-chop geometry       remove pixels from the image interior
   \-clamp               keep pixel values in range (0-QuantumRange)

diff --git a/utilities/montage.1.in b/utilities/montage.1.in
index 1f5c8d31c0621bdb5d065276e7e651cf45695acf..9d10e77846c7eb4da13c10b3fcbf5a6290e98f46 100644 (file)
--- a/utilities/montage.1.in
+++ b/utilities/montage.1.in
@@ -18,7 +18,6 @@ Image Settings:
   \-blue-primary point  chromaticity blue primary point
   \-bordercolor color   border color
   \-caption string      assign a caption to an image
-  \-channel type        apply option to select image channels
   \-colors value        preferred number of colors in the image
   \-colorspace type     alternate image colorsapce
   \-comment string      annotate image with comment
@@ -95,6 +94,7 @@ Image Operators:
   \-auto-orient         automagically orient image
   \-blur geometry      reduce image noise and reduce detail levels
   \-border geometry     surround image with a border of color
+  \-channel mask        set the image channel mask
   \-crop geometry       preferred size and location of the cropped image
   \-extent geometry     set the image size
   \-flatten             flatten a sequence of images

diff --git a/utilities/stream.1.in b/utilities/stream.1.in
index 6b8ca3f2da16a3f5fbcde6fa318d37486c244c9b..3d49cbc9cb7b42133093a380f6b36a44cef71342 100644 (file)
--- a/utilities/stream.1.in
+++ b/utilities/stream.1.in
@@ -11,7 +11,6 @@ For more information about the stream command, point your browser to file://@DOC
 .SH DESCRIPTION
 Image Settings:
   \-authenticate value  decrypt image with this password
-  \-channel type        apply option to select image channels
   \-colorspace type     alternate image colorspace
   \-compress type       type of pixel compression when writing the image
   \-define format:option
@@ -44,6 +43,7 @@ Image Settings:
                        virtual pixel access method
 
 Miscellaneous Options:
+  \-channel mask        set the image channel mask
   \-debug events        display copious debugging information
   \-help                print program options
   \-log format          format of debugging information