commit ed2315769b26818ed9d0c1291dc0457f0d8da0a4
author cristy <urban-warrior@git.imagemagick.org> Thu Jul 14 02:18:59 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Jul 14 02:18:59 2011 +0000
tree d64ec3aca4fae940b9429472d1855ee5510e2641
parent b7e8bb553c8dfffc9de8498bc05d9e4670c324cc

MagickWand/mogrify.c

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index e6d1ec5..d879a9a 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -423,16 +423,16 @@
     Limit channels according to image - and add up number of color channel.
   */
   number_colors=0;
-  if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+  if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
     number_colors++;
-  if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+  if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
     number_colors++;
-  if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+  if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
     number_colors++;
-  if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+  if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
       (image->colorspace == CMYKColorspace))
     number_colors++;
-  if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+  if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
       (image->matte != MagickFalse))
     number_colors++;
 
@@ -526,23 +526,23 @@
       if ( isalpha((int) token[0]) || token[0] == '#' ) {
         /* Color string given */
         (void) QueryMagickColor(token,&color,exception);
-        if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+        if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
           sparse_arguments[x++] = QuantumScale*color.red;
-        if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+        if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
           sparse_arguments[x++] = QuantumScale*color.green;
-        if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+        if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
           sparse_arguments[x++] = QuantumScale*color.blue;
-        if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+        if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
             (image->colorspace == CMYKColorspace))
           sparse_arguments[x++] = QuantumScale*color.black;
-        if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+        if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
             (image->matte != MagickFalse))
           sparse_arguments[x++] = QuantumScale*color.alpha;
       }
       else {
         /* Colors given as a set of floating point values - experimental */
         /* NB: token contains the first floating point value to use! */
-        if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+        if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
           {
           while ( token[0] == ',' ) GetMagickToken(p,&p,token);
           if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
@@ -550,7 +550,7 @@
           sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
           token[0] = ','; /* used this token - get another */
         }
-        if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+        if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
           {
           while ( token[0] == ',' ) GetMagickToken(p,&p,token);
           if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
@@ -558,7 +558,7 @@
           sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
           token[0] = ','; /* used this token - get another */
         }
-        if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+        if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
           {
           while ( token[0] == ',' ) GetMagickToken(p,&p,token);
           if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
@@ -566,7 +566,7 @@
           sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
           token[0] = ','; /* used this token - get another */
         }
-        if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+        if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
             (image->colorspace == CMYKColorspace))
           {
           while ( token[0] == ',' ) GetMagickToken(p,&p,token);
@@ -575,7 +575,7 @@
           sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
           token[0] = ','; /* used this token - get another */
         }
-        if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+        if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
             (image->matte != MagickFalse))
           {
           while ( token[0] == ',' ) GetMagickToken(p,&p,token);
@@ -979,7 +979,7 @@
               channel=DefaultChannels;
             else
               channel=(ChannelType) ParseChannelOption(argv[i+1]);
-            SetPixelComponentMap(*image,channel);
+            SetPixelChannelMap(*image,channel);
             break;
           }
         if (LocaleCompare("charcoal",option+1) == 0)
@@ -1078,7 +1078,7 @@
                 SetPixelRed(mask_image,GetPixelAlpha(mask_image,q),q);
                 SetPixelGreen(mask_image,GetPixelAlpha(mask_image,q),q);
                 SetPixelBlue(mask_image,GetPixelAlpha(mask_image,q),q);
-                q+=GetPixelComponents(mask_image);
+                q+=GetPixelChannels(mask_image);
               }
               if (SyncCacheViewAuthenticPixels(mask_view,exception) == MagickFalse)
                 break;
@@ -7344,7 +7344,7 @@
                 break;
               }
             channel=(ChannelType) ParseChannelOption(argv[i+1]);
-            SetPixelComponentMap(*images,channel);
+            SetPixelChannelMap(*images,channel);
             break;
           }
         if (LocaleCompare("clut",option+1) == 0)