(no commit message)

diff --git a/MagickCore/display.c b/MagickCore/display.c
index e188efdce280384b583cd0063f80ac980bc510c3..263f605b4b28370ecf437f7d2aa10c968038f161 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -10184,6 +10184,7 @@ static MagickBooleanType XMatteEditImage(Display *display,
               (DrawInfo *) NULL);
             draw_info->fill.alpha=ClampToQuantum(StringToDouble(matte,
               (char **) NULL));
+            (void) SetImageAlphaChannel(*image,OpaqueAlphaChannel,exception);
             channel_mask=SetPixelChannelMask(*image,AlphaChannel); 
             (void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t)
               x_offset,(ssize_t) y_offset,method == FloodfillMethod ?

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 575fcd1df0f418e4370b9f4672fc34bf40562ed0..4d303efcbc33fb2d4c579f6d17932a22ac7ebec0 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -138,11 +138,9 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
     status;
 
   PixelInfo
+    fill_color,
     pixel;
 
-  PixelInfo
-    fill_color;
-
   register SegmentInfo
     *s;
 
@@ -235,7 +233,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
     q+=x1*GetPixelChannels(floodplane_image);
     for (x=x1; x >= 0; x--)
     {
-      if (GetPixelAlpha(image,q) == TransparentAlpha)
+      if (GetPixelAlpha(floodplane_image,q) == TransparentAlpha)
         break;
       GetPixelInfoPixel(image,p,&pixel);
       if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
@@ -262,13 +260,13 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
             {
               p=GetCacheViewVirtualPixels(image_view,x,y,image->columns-x,1,
                 exception);
-              q=GetCacheViewAuthenticPixels(floodplane_view,x,y,
-                image->columns-x,1,exception);
+              q=GetCacheViewAuthenticPixels(floodplane_view,x,y,image->columns-
+                x,1,exception);
               if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
                 break;
               for ( ; x < (ssize_t) image->columns; x++)
               {
-                if (GetPixelAlpha(image,q) == TransparentAlpha)
+                if (GetPixelAlpha(floodplane_image,q) == TransparentAlpha)
                   break;
                 GetPixelInfoPixel(image,p,&pixel);
                 if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
@@ -297,7 +295,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
             break;
           for ( ; x <= x2; x++)
           {
-            if (GetPixelAlpha(image,q) == TransparentAlpha)
+            if (GetPixelAlpha(floodplane_image,q) == TransparentAlpha)
               break;
             GetPixelInfoPixel(image,p,&pixel);
             if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 4c9a7422f7e74efe2ccbbbf0053102f4265a57da..8a76ca3f3310b3796f59b588d331814bd72c68e8 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-12-22"
+#define MagickReleaseDate  "2011-12-26"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/config/configure.xml b/config/configure.xml
index d05f325402a55463f48c49224cd6e1e32ed03b7b..f99365e7874fa5e4538dd904f8ff3af06a31e5f4 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="6244" />
-  <configure name="RELEASE_DATE" value="2011-12-22"/>
+  <configure name="RELEASE_DATE" value="2011-12-26"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/utilities/convert.1 b/utilities/convert.1
index d1a976bf1e7b4482f52f766202ff0017fe4266f3..6042671ea15382fbbf10c14dba02e93aff3f6b3a 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -261,6 +261,8 @@ Miscellaneous Options:
   \-list type           print a list of supported option arguments
   \-version             print version information
 
+Use any setting or operator as an \fIoutput-option\fP.  Only a limited number of setting are  \fIinput-option\fP. They include: \-antialias, \-caption, \-density, \-define, \-encoding, \-font, \-pointsize, \-size, and \-texture as well as any of the miscellaneous options.
+
 By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
 .SH SEE ALSO
 ImageMagick(1)

diff --git a/www/parallel.html b/www/parallel.html
new file mode 100644 (file)
index 0000000..e69de29