From: anthony Date: Sun, 1 May 2011 13:48:16 +0000 (+0000) Subject: missed -paint in the mogrify list modification X-Git-Tag: 7.0.1-0~7591 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d2f486dd1e9c98d1a49d8e527eba1f229e8400a;p=imagemagick missed -paint in the mogrify list modification --- diff --git a/wand/mogrify.c b/wand/mogrify.c index f6cd818ed..972645841 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -381,11 +381,11 @@ static MagickBooleanType MonitorProgress(const char *text, } /* -** SparseColorOption() parse the complex -sparse-color argument into an -** an array of floating point values than call SparseColorImage(). +** SparseColorOption() parses the complex -sparse-color argument into an +** an array of floating point values then calls SparseColorImage(). ** Argument is a complex mix of floating-point pixel coodinates, and color ** specifications (or direct floating point numbers). The number of floats -** needed to represent a color varies depending on teh current channel +** needed to represent a color varies depending on the current channel ** setting. */ static Image *SparseColorOption(const Image *image,const ChannelType channel, @@ -1581,15 +1581,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, mogrify_image=FlipImage(*image,exception); break; } - if (LocaleCompare("flop",option+1) == 0) - { - /* - Flop image scanlines. - */ - (void) SyncImageSettings(mogrify_info,*image); - mogrify_image=FlopImage(*image,exception); - break; - } if (LocaleCompare("floodfill",option+1) == 0) { MagickPixelPacket @@ -1606,6 +1597,15 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, InheritException(exception,&(*image)->exception); break; } + if (LocaleCompare("flop",option+1) == 0) + { + /* + Flop image scanlines. + */ + (void) SyncImageSettings(mogrify_info,*image); + mogrify_image=FlopImage(*image,exception); + break; + } if (LocaleCompare("font",option+1) == 0) { if (*option == '+') @@ -2229,11 +2229,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, */ (void) SyncImageSettings(mogrify_info,*image); (void) ParseGeometry(argv[i+1],&geometry_info); - paint_image=OilPaintImage(*image,geometry_info.rho,exception); - if (paint_image == (Image *) NULL) - break; - *image=DestroyImage(*image); - *image=paint_image; + mogrify_image=OilPaintImage(*image,geometry_info.rho,exception); break; } if (LocaleCompare("pen",option+1) == 0)