commit d42d995b9cb2a16e13221e665554417a5b7ec7fb
author cristy <urban-warrior@git.imagemagick.org> Fri Jul 08 14:21:50 2011 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Jul 08 14:21:50 2011 +0000
tree a86d3b1cafb240650ac6a7cdf85141e1501f8807
parent 130206720ba69f6ad1a981900a035e2c33714759

coders/histogram.c

diff --git a/coders/histogram.c b/coders/histogram.c
index 7e0f11b..3ff651c 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -180,9 +180,6 @@
 {
 #define HistogramDensity  "256x200"
 
-  ChannelType
-    channel;
-
   char
     filename[MaxTextExtent];
 
@@ -262,7 +259,6 @@
   /*
     Initialize histogram count arrays.
   */
-  channel=image_info->channel;
   (void) ResetMagickMemory(histogram,0,length*sizeof(*histogram));
   for (y=0; y < (ssize_t) image->rows; y++)
   {

coders/msl.c

diff --git a/coders/msl.c b/coders/msl.c
index 78f38a0..c10a29b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1714,9 +1714,9 @@
                 }
               }
             }
-          (void) FloodfillPaintImage(msl_info->image[n],DefaultChannels,
-            draw_info,&target,geometry.x,geometry.y,
-            paint_method == FloodfillMethod ? MagickFalse : MagickTrue);
+          (void) FloodfillPaintImage(msl_info->image[n],draw_info,&target,
+            geometry.x,geometry.y,paint_method == FloodfillMethod ?
+            MagickFalse : MagickTrue);
           draw_info=DestroyDrawInfo(draw_info);
           break;
         }
@@ -3735,9 +3735,11 @@
           draw_info=CloneDrawInfo(msl_info->image_info[n],
             msl_info->draw_info[n]);
           draw_info->fill.alpha=ClampToQuantum(opacity);
-          (void) FloodfillPaintImage(msl_info->image[n],OpacityChannel,
-            draw_info,&target,geometry.x,geometry.y,
-            paint_method == FloodfillMethod ? MagickFalse : MagickTrue);
+          PushPixelComponentMap(msl_info->image[n],AlphaChannel);
+          (void) FloodfillPaintImage(msl_info->image[n],draw_info,&target,
+            geometry.x,geometry.y,paint_method == FloodfillMethod ?
+            MagickFalse : MagickTrue);
+          PopPixelComponentMap(msl_info->image[n]);
           draw_info=DestroyDrawInfo(draw_info);
           break;
         }
@@ -4224,8 +4226,10 @@
                 }
               }
             }
-          (void) OpaquePaintImageChannel(msl_info->image[n],channel,
-            &target,&fill_color,MagickFalse);
+          PushPixelComponentMap(msl_info->image[n],channel);
+          (void) OpaquePaintImage(msl_info->image[n],&target,&fill_color,
+            MagickFalse);
+          PopPixelComponentMap(msl_info->image[n]);
           break;
         }
       ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);

coders/xtrn.c

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 262ccc7..30f2f93 100644
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -422,8 +422,7 @@
 %
 %  The format of the WriteXTRNImage method is:
 %
-%      MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,
-%        Image *image)
+%      MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image)
 %
 %  A description of each parameter follows.
 %