From fdcc0185fe19084d4009bfc6e2fead8d86c67e64 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 26 Dec 2011 19:33:56 +0000 Subject: [PATCH] --- MagickCore/display.c | 1 + MagickCore/paint.c | 14 ++++++-------- MagickCore/version.h | 2 +- config/configure.xml | 2 +- utilities/convert.1 | 2 ++ www/parallel.html | 0 6 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 www/parallel.html diff --git a/MagickCore/display.c b/MagickCore/display.c index e188efdce..263f605b4 100644 --- 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 575fcd1df..4d303efcb 100644 --- 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 4c9a7422f..8a76ca3f3 100644 --- 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 d05f32540..f99365e78 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + diff --git a/utilities/convert.1 b/utilities/convert.1 index d1a976bf1..6042671ea 100644 --- 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 index 000000000..e69de29bb -- 2.40.0