From 6a917d9720d680799e5ac0165befa086b64b49cb Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 6 Oct 2009 19:23:54 +0000 Subject: [PATCH] --- wand/animate.c | 2 +- wand/compare.c | 2 +- wand/deprecate.c | 2 +- wand/drawing-wand.c | 6 +++--- wand/drawtest.c | 38 +++++++++++++++++++------------------- wand/identify.c | 2 +- wand/import.c | 2 +- wand/magick-image.c | 2 +- wand/mogrify.c | 2 +- wand/montage.c | 2 +- wand/stream.c | 2 +- wand/wandtest.c | 6 +++--- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/wand/animate.c b/wand/animate.c index 463965181..d276d5cc5 100644 --- a/wand/animate.c +++ b/wand/animate.c @@ -1401,7 +1401,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info, default: ThrowAnimateException(OptionError,"UnrecognizedOption",option); } - fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? + fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? MagickFalse : MagickTrue; if (fire != MagickFalse) FireImageStack(MagickFalse,MagickTrue,MagickTrue); diff --git a/wand/compare.c b/wand/compare.c index fe96b4cac..fe1803c8e 100644 --- a/wand/compare.c +++ b/wand/compare.c @@ -34,7 +34,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Use the compare program to mathematically and visually annotate the -% difference between an image and its reconstruction. +% difference between an image and its reconstruction. % */ diff --git a/wand/deprecate.c b/wand/deprecate.c index 48083757c..9a57b2343 100644 --- a/wand/deprecate.c +++ b/wand/deprecate.c @@ -975,7 +975,7 @@ WandExport MagickBooleanType MagickOpaqueImage(MagickWand *wand, % A description of each parameter follows: % % o wand: the magick wand. -% +% % o channel: the channel(s). % % o fill: the floodfill color pixel wand. diff --git a/wand/drawing-wand.c b/wand/drawing-wand.c index b74dd0bde..d7ef69293 100644 --- a/wand/drawing-wand.c +++ b/wand/drawing-wand.c @@ -5894,7 +5894,7 @@ WandExport void DrawSetTextKerning(DrawingWand *wand,const double kerning) if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - if ((wand->filter_off != MagickFalse) && + if ((wand->filter_off != MagickFalse) && (CurrentContext->kerning != kerning)) { CurrentContext->kerning=kerning; @@ -5935,7 +5935,7 @@ WandExport void DrawSetTextInterlineSpacing(DrawingWand *wand, if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - if ((wand->filter_off != MagickFalse) && + if ((wand->filter_off != MagickFalse) && (CurrentContext->interline_spacing != interline_spacing)) { CurrentContext->interline_spacing=interline_spacing; @@ -5976,7 +5976,7 @@ WandExport void DrawSetTextInterwordSpacing(DrawingWand *wand, if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - if ((wand->filter_off != MagickFalse) && + if ((wand->filter_off != MagickFalse) && (CurrentContext->interword_spacing != interword_spacing)) { CurrentContext->interword_spacing=interword_spacing; diff --git a/wand/drawtest.c b/wand/drawtest.c index 9b0499fab..2c0a57790 100644 --- a/wand/drawtest.c +++ b/wand/drawtest.c @@ -65,11 +65,11 @@ static void ScribbleImage (MagickWand *canvas) DrawPopClipPath(picasso); } DrawPopDefs(picasso); - + (void) PushDrawingWand(picasso); { (void) DrawSetClipPath(picasso, "url(#clip_1)"); - + (void) PushDrawingWand(picasso); { DrawSetStrokeAntialias(picasso,MagickTrue); @@ -85,7 +85,7 @@ static void ScribbleImage (MagickWand *canvas) DrawRectangle(picasso,72,72,144,144); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { DrawSetStrokeAntialias(picasso,MagickTrue); @@ -101,7 +101,7 @@ static void ScribbleImage (MagickWand *canvas) DrawRoundRectangle(picasso,72,216,360,432,9,9); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { const PointInfo points[37] = @@ -117,7 +117,7 @@ static void ScribbleImage (MagickWand *canvas) { 346,114.8 }, { 347.1,111.5 }, { 348.9,108.5 }, { 351.4,105.8 }, { 378.1,81.72 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,2.016); DrawSetStrokeLineCap(picasso,RoundCap); @@ -131,7 +131,7 @@ static void ScribbleImage (MagickWand *canvas) DrawPolygon(picasso,37,points); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { DrawSetStrokeAntialias(picasso,MagickTrue); @@ -147,7 +147,7 @@ static void ScribbleImage (MagickWand *canvas) DrawEllipse(picasso,489.6,424.8,72,129.6,0,360); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { const PointInfo points[48] = @@ -165,7 +165,7 @@ static void ScribbleImage (MagickWand *canvas) { 204,55.3 }, { 204.3,44.35 }, { 204.9,39.6 }, { 205.9,35.42 }, { 207.4,31.82 }, { 209.2,28.87 }, { 211.3,26.64}, { 213.8,25.13 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,3.024); DrawSetStrokeLineCap(picasso,RoundCap); @@ -179,7 +179,7 @@ static void ScribbleImage (MagickWand *canvas) DrawPolygon(picasso,48,points); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { DrawSetStrokeAntialias(picasso,MagickTrue); @@ -218,7 +218,7 @@ static void ScribbleImage (MagickWand *canvas) { 180,504 }, { 282.7,578.6 }, { 243.5,699.4 }, { 116.5,699.4 }, { 77.26,578.6 }, { 180,504 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,9); DrawSetStrokeLineCap(picasso,RoundCap); @@ -232,7 +232,7 @@ static void ScribbleImage (MagickWand *canvas) DrawPolygon(picasso,6,points); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { const PointInfo points[11] = @@ -241,7 +241,7 @@ static void ScribbleImage (MagickWand *canvas) { 243.5,699.4 }, { 180,666 }, { 116.5,699.4 }, { 128.7,628.7 }, { 77.26,578.6 }, { 148.2,568.3 }, { 180,504 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,9); DrawSetStrokeLineCap(picasso,RoundCap); @@ -255,7 +255,7 @@ static void ScribbleImage (MagickWand *canvas) DrawPolygon(picasso,11,points); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { const PointInfo points[15] = @@ -265,7 +265,7 @@ static void ScribbleImage (MagickWand *canvas) { 525.6,93.6 }, { 496.8,158.4 }, { 532.8,136.8 }, { 518.4,180 }, { 540,172.8 }, { 540,223.2 }, { 540,288 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,5.976); DrawSetStrokeLineCap(picasso,RoundCap); @@ -279,7 +279,7 @@ static void ScribbleImage (MagickWand *canvas) DrawPolygon(picasso,15,points); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { const PointInfo points[7] = @@ -287,7 +287,7 @@ static void ScribbleImage (MagickWand *canvas) { 57.6,640.8 }, { 57.6,784.8 }, { 194.4,799.2 }, { 259.2,777.6 }, { 151.2,756 }, { 86.4,748.8 }, { 57.6,640.8 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,5.976); DrawSetStrokeLineCap(picasso,RoundCap); @@ -301,7 +301,7 @@ static void ScribbleImage (MagickWand *canvas) DrawPolygon(picasso,7,points); } (void) PopDrawingWand(picasso); - + (void) PushDrawingWand(picasso); { const PointInfo points[193] = @@ -320,7 +320,7 @@ static void ScribbleImage (MagickWand *canvas) { 428,531.2 }, { 434.6,532.9 }, { 436.7,533.8 }, { 437.8,534.9 }, { 437.8,536.2 }, { 436.8,537.8 }, { 434.5,539.6 }, { 430.9,541.8 }, { 419.3,547.6 }, { 401.3,555.2 }, { 342.4,577.9 }, {325.2,584.9 }, - { 311,591.3 }, { 300,597.3 }, { 291.6,602.8 }, { 285.8,607.8 }, + { 311,591.3 }, { 300,597.3 }, { 291.6,602.8 }, { 285.8,607.8 }, { 282.3,612.3 }, { 281.4,614.4 }, { 280.9,616.2 }, { 281.2,619.6 }, { 282.1,621.2 }, { 283.3,622.6 }, { 286.8,624.9 }, { 291.5,626.6 }, { 297.1,627.8 }, { 303.6,628.3 }, { 310.5,628.3 }, { 317.9,627.6 }, @@ -356,7 +356,7 @@ static void ScribbleImage (MagickWand *canvas) { 27.86,597.4 }, { 27.29,595.2 }, { 26.64,588.7 }, { 26.86,578.8 }, { 27.86,565.3 } }; - + DrawSetStrokeAntialias(picasso,MagickTrue); DrawSetStrokeWidth(picasso,5.904); DrawSetStrokeLineCap(picasso,RoundCap); diff --git a/wand/identify.c b/wand/identify.c index 15acdad3a..12d985d1b 100644 --- a/wand/identify.c +++ b/wand/identify.c @@ -780,7 +780,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, default: ThrowIdentifyException(OptionError,"UnrecognizedOption",option) } - fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? + fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? MagickFalse : MagickTrue; if (fire != MagickFalse) FireImageStack(MagickFalse,MagickTrue,MagickTrue); diff --git a/wand/import.c b/wand/import.c index 2cf4ef4dc..53eae150f 100644 --- a/wand/import.c +++ b/wand/import.c @@ -1259,7 +1259,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info, default: ThrowImportException(OptionError,"UnrecognizedOption",option); } - fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? + fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? MagickFalse : MagickTrue; if (fire != MagickFalse) FireImageStack(MagickFalse,MagickTrue,MagickTrue); diff --git a/wand/magick-image.c b/wand/magick-image.c index 0c2ece2cc..37648df11 100644 --- a/wand/magick-image.c +++ b/wand/magick-image.c @@ -8945,7 +8945,7 @@ MagickExport MagickBooleanType MagickSegmentImage(MagickWand *wand, % o sigma: the standard deviation of the gaussian, in pixels. % % o threshold: only pixels within this contrast threshold are included -% in the blur operation +% in the blur operation. % */ diff --git a/wand/mogrify.c b/wand/mogrify.c index 0b1538cb0..3f69d0540 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -37,7 +37,7 @@ % draw on, flip, join, re-sample, and much more. This tool is similiar to % convert except that the original image file is overwritten (unless you % change the file suffix with the -format option) with any changes you -% request. +% request. % */ diff --git a/wand/montage.c b/wand/montage.c index 42ceb4e15..86329b38d 100644 --- a/wand/montage.c +++ b/wand/montage.c @@ -1654,7 +1654,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info, default: ThrowMontageException(OptionError,"UnrecognizedOption",option) } - fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? + fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? MagickFalse : MagickTrue; if (fire != MagickFalse) FireImageStack(MagickTrue,MagickTrue,MagickTrue); diff --git a/wand/stream.c b/wand/stream.c index 321b73d2c..2eaca1523 100644 --- a/wand/stream.c +++ b/wand/stream.c @@ -728,7 +728,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info, default: ThrowStreamException(OptionError,"UnrecognizedOption",option) } - fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? + fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ? MagickFalse : MagickTrue; if (fire != MagickFalse) FireImageStack(MagickFalse,MagickTrue,MagickTrue); diff --git a/wand/wandtest.c b/wand/wandtest.c index 170b9e56f..c50525a96 100644 --- a/wand/wandtest.c +++ b/wand/wandtest.c @@ -387,7 +387,7 @@ int main(int argc,char **argv) MagickWand *clone_wand, *magick_wand; - + PixelIterator *iterator; @@ -403,7 +403,7 @@ int main(int argc,char **argv) size_t length; - unsigned char + unsigned char *profile; unsigned int @@ -685,5 +685,5 @@ int main(int argc,char **argv) profile=(unsigned char *) MagickRelinquishMemory(profile); magick_wand=DestroyMagickWand(magick_wand); (void) fprintf(stdout,"Wand tests pass.\n"); - return(0); + return(0); } -- 2.50.1