From 9f96fe801a5df298de2c5b1aa5ef773fa8a92cef Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Wed, 23 Nov 2022 11:40:06 -0500 Subject: [PATCH] Spelling wand (#5792) --- MagickWand/ChangeLog | 8 +- MagickWand/compare.c | 2 +- MagickWand/drawing-wand.c | 8 +- MagickWand/magick-cli.c | 26 +++--- MagickWand/magick-image.c | 86 +++++++++---------- MagickWand/magick-property.c | 8 +- MagickWand/mogrify.c | 4 +- MagickWand/montage.c | 2 +- MagickWand/operation.c | 42 ++++----- MagickWand/pixel-wand-private.h | 2 +- MagickWand/pixel-wand.c | 2 +- MagickWand/script-token.c | 14 +-- MagickWand/tests/add_first.c | 2 +- MagickWand/tests/add_first_lists.c | 2 +- MagickWand/tests/add_index.c | 2 +- MagickWand/tests/add_last.c | 2 +- MagickWand/tests/add_last_lists.c | 2 +- MagickWand/tests/add_mixed.c | 2 +- MagickWand/tests/add_mixed_lists.c | 2 +- MagickWand/tests/add_norm.c | 2 +- MagickWand/tests/add_norm_lists.c | 2 +- MagickWand/tests/script-token-test-data.txt | 4 +- .../tests/script-token-test-results.txt | 2 +- MagickWand/tests/script-token-test.c | 6 +- MagickWand/wand-view.c | 2 +- MagickWand/wand-view.h | 2 +- MagickWand/wandcli-private.h | 6 +- MagickWand/wandcli.c | 16 ++-- 28 files changed, 130 insertions(+), 130 deletions(-) diff --git a/MagickWand/ChangeLog b/MagickWand/ChangeLog index e6fc55ca0d..65f3519017 100644 --- a/MagickWand/ChangeLog +++ b/MagickWand/ChangeLog @@ -97,7 +97,7 @@ MagickGetInterpolateMethod(), and MagickSetInterpolateMethod(). 2007-01-08 6.3.1-7 Cristy - * MagickOrtderedPosterizeImage() performs an ordered dither based on a number + * MagickOrderedPosterizeImage() performs an ordered dither based on a number of pre-defined dithering threshold maps, but over multiple intensity levels, which can be different for different channels, according to the input arguments. @@ -157,7 +157,7 @@ 2005-09-10 Cristy * Added MagickGetImageTicksPerSecond() and MagickSetImageTicksPerSecond(). * Added MagickGetMagickResource(). - * Added MagickThumbnaiImage(). + * Added MagickThumbnailImage(). 2005-09-01 Cristy * DrawSetStrokeDashArray() no longer faults for an array of one element @@ -297,7 +297,7 @@ previously GetLastImageInList(). 2004-10-28 Cristy - * MagickTrimImage() was not properly trimmming the image. + * MagickTrimImage() was not properly trimming the image. 2004-10-27 Cristy * Added DrawSetTextAlignment() and DrawGetTextAlignment() methods (suggested @@ -320,7 +320,7 @@ persist the vector graphics state. 2004-09-30 Cristy - * Add new MagickQueryConfigureOption() method to return a valur associated + * Add new MagickQueryConfigureOption() method to return a value associated with a particular option. 2004-09-29 Cristy diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 382f2eec84..e6878c9d9c 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -128,7 +128,7 @@ static MagickBooleanType CompareUsage(void) " -fuzz distance colors within this distance are considered equal\n" " -gravity type horizontal and vertical text placement\n" " -highlight-color color\n" - " empasize pixel differences with this color\n" + " emphasize pixel differences with this color\n" " -identify identify the format and characteristics of the image\n" " -interlace type type of image interlacing scheme\n" " -limit type value pixel cache resource limit\n" diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 9a87b97aab..158f35917f 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -1526,7 +1526,7 @@ WandExport FillRule DrawGetFillRule(const DrawingWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% DrawGetFont() returns a null-terminaged string specifying the font used +% DrawGetFont() returns a null-terminated string specifying the font used % when annotating with text. The value returned must be freed by the user % when no longer needed. % @@ -3012,7 +3012,7 @@ WandExport void DrawPathCurveToRelative(DrawingWand *wand,const double x1, % The format of the DrawPathCurveToQuadraticBezierAbsolute method is: % % void DrawPathCurveToQuadraticBezierAbsolute(DrawingWand *wand, -% const double x1,const double y1,onst double x,const double y) +% const double x1,const double y1,const double x,const double y) % % A description of each parameter follows: % @@ -4457,7 +4457,7 @@ WandExport void DrawRotate(DrawingWand *wand,const double degrees) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% DrawRoundRectangle() draws a rounted rectangle given two coordinates, +% DrawRoundRectangle() draws a rounded rectangle given two coordinates, % x & y corner radiuses and using the current stroke, stroke width, % and fill settings. % @@ -5060,7 +5060,7 @@ WandExport void DrawSetFillRule(DrawingWand *wand,const FillRule fill_rule) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% DrawSetFont() sets the fully-sepecified font to use when annotating with +% DrawSetFont() sets the fully-specified font to use when annotating with % text. % % The format of the DrawSetFont method is: diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c index 11ef2e3e38..0434367506 100644 --- a/MagickWand/magick-cli.c +++ b/MagickWand/magick-cli.c @@ -336,7 +336,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, % % o argv: A text array containing the command line arguments. (optional) % -% o index: offset of next argment in argv (script arguments) (optional) +% o index: offset of next argument in argv (script arguments) (optional) % */ WandExport void ProcessScriptOptions(MagickCLI *cli_wand,const char *filename, @@ -374,7 +374,7 @@ WandExport void ProcessScriptOptions(MagickCLI *cli_wand,const char *filename, } /* define the error location string for use in exceptions - order of localtion format escapes: filename, line, column */ + order of location format escapes: filename, line, column */ cli_wand->location="in \"%s\" at line %u,column %u"; if ( LocaleCompare("-", filename) == 0 ) cli_wand->filename="stdin"; @@ -582,7 +582,7 @@ loop_exit: % o index: index in the argv array to start processing from % % The function returns the index ot the next option to be processed. This -% is really only releven if process_flags contains a ProcessOneOptionOnly +% is really only relevant if process_flags contains a ProcessOneOptionOnly % flag. % */ @@ -610,7 +610,7 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand,int argc,char **argv, assert(cli_wand->signature == MagickWandSignature); /* define the error location string for use in exceptions - order of localtion format escapes: filename, line, column */ + order of location format escapes: filename, line, column */ cli_wand->location="at %s arg %u"; cli_wand->filename="CLI"; cli_wand->line=index; /* note first argument we will process */ @@ -620,8 +620,8 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand,int argc,char **argv, "- Starting (\"%s\")", argv[index]); end = argc; - if ( (cli_wand->process_flags & ProcessImplictWrite) != 0 ) - end--; /* the last arument is an implied write, do not process directly */ + if ( (cli_wand->process_flags & ProcessImplicitWrite) != 0 ) + end--; /* the last argument is an implied write, do not process directly */ for (i=index; i < end; i += count +1) { /* Finished processing one option? */ @@ -649,7 +649,7 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand,int argc,char **argv, i, option); #endif if (IsCommandOption(option) == MagickFalse) { - if ( (cli_wand->process_flags & ProcessImplictRead) != 0 ) { + if ( (cli_wand->process_flags & ProcessImplicitRead) != 0 ) { /* non-option -- treat as a image read */ cli_wand->command=(const OptionInfo *) NULL; CLIOption(cli_wand,"-read",option); @@ -664,7 +664,7 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand,int argc,char **argv, ((cli_wand->process_flags & ProcessScriptOption) != 0) && (LocaleCompare(option,"-script") == 0) ) { /* Call Script from CLI, with a filename as a zeroth argument. - NOTE: -script may need to use the 'implict write filename' argument + NOTE: -script may need to use the 'implicit write filename' argument so it must be handled specially to prevent a 'missing argument' error. */ if ( (i+count) >= argc ) @@ -720,7 +720,7 @@ RestoreMSCWarning } assert(i==end); - if ( (cli_wand->process_flags & ProcessImplictWrite) == 0 ) + if ( (cli_wand->process_flags & ProcessImplicitWrite) == 0 ) return(end); /* no implied write -- just return to caller */ assert(end==argc-1); /* end should not include last argument */ @@ -775,7 +775,7 @@ RestoreMSCWarning % MagickImageCommand() Handle special use CLI arguments and prepare a % CLI MagickCLI to process the command line or directly specified script. % -% This is essentualy interface function between the MagickCore library +% This is essentially interface function between the MagickCore library % initialization function MagickCommandGenesis(), and the option MagickCLI % processing functions ProcessCommandOptions() or ProcessScriptOptions() % @@ -787,14 +787,14 @@ RestoreMSCWarning % A description of each parameter follows: % % o image_info: the starting image_info structure -% (for compatibilty with MagickCommandGenisis()) +% (for compatibility with MagickCommandGenisis()) % % o argc: the number of elements in the argument vector. % % o argv: A text array containing the command line arguments. % % o metadata: any metadata (for VBS) is returned here. -% (for compatibilty with MagickCommandGenisis()) +% (for compatibility with MagickCommandGenisis()) % % o exception: return any errors or warnings in this structure. % @@ -862,7 +862,7 @@ static void MagickUsage(MagickBooleanType verbose) } /* - Concatanate given file arguments to the given output argument. + Concatenate given file arguments to the given output argument. Used for a special -concatenate option used for specific 'delegates'. The option is not formally documented. diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index 0c5e247968..8cba6d3c27 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -723,7 +723,7 @@ WandExport MagickWand *MagickAppendImages(MagickWand *wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickAutoGammaImage() extracts the 'mean' from the image and adjust the -% image to try make set its gamma appropriatally. +% image to try make set its gamma appropriately. % % The format of the MagickAutoGammaImage method is: % @@ -909,9 +909,9 @@ WandExport MagickBooleanType MagickAutoThresholdImage(MagickWand *wand, % % o spatial_sigma: sigma in the coordinate space. A larger value means that % farther pixels influence each other as long as their colors are close -% enough (see intensity_sigma ). When the neigborhood diameter is greater +% enough (see intensity_sigma ). When the neighborhood diameter is greater % than zero, it specifies the neighborhood size regardless of -% spatial_sigma. Otherwise, the neigborhood diameter is proportional to +% spatial_sigma. Otherwise, the neighborhood diameter is proportional to % spatial_sigma. % */ @@ -1151,7 +1151,7 @@ WandExport MagickBooleanType MagickBorderImage(MagickWand *wand, % % Use MagickBrightnessContrastImage() to change the brightness and/or contrast % of an image. It converts the brightness and contrast parameters into slope -% and intercept and calls a polynomical function to apply to the image. +% and intercept and calls a polynomial function to apply to the image. % % The format of the MagickBrightnessContrastImage method is: @@ -1904,7 +1904,7 @@ WandExport MagickBooleanType MagickColorThresholdImage(MagickWand *wand, % % MagickCombineImages() combines one or more images into a single image. The % grayscale value of the pixels of each image in the sequence is assigned in -% order to the specified hannels of the combined image. The typical +% order to the specified channels of the combined image. The typical % ordering would be image 1 => Red, 2 => Green, 3 => Blue, etc. % % The format of the MagickCombineImages method is: @@ -2152,7 +2152,7 @@ WandExport MagickWand *MagickComplexImages(MagickWand *wand, % % o compose: This operator affects how the composite is applied to the % image. The default is Over. These are some of the compose methods -% availble. +% available. % % OverCompositeOp InCompositeOp OutCompositeOp % AtopCompositeOp XorCompositeOp PlusCompositeOp @@ -2214,7 +2214,7 @@ WandExport MagickBooleanType MagickCompositeImage(MagickWand *wand, % % o compose: This operator affects how the composite is applied to the % image. The default is Over. These are some of the compose methods -% availble. +% available. % % OverCompositeOp InCompositeOp OutCompositeOp % AtopCompositeOp XorCompositeOp PlusCompositeOp @@ -2275,13 +2275,13 @@ WandExport MagickBooleanType MagickCompositeImageGravity(MagickWand *wand, % % Composition uses given x and y offsets, as the 'origin' location of the % source images virtual canvas (not the real image) allowing you to compose a -% list of 'layer images' into the destiantioni images. This makes it well -% sutiable for directly composing 'Clears Frame Animations' or 'Coaleased -% Animations' onto a static or other 'Coaleased Animation' destination image +% list of 'layer images' into the destination images. This makes it well +% suitable for directly composing 'Clears Frame Animations' or 'Coalesced +% Animations' onto a static or other 'Coalesced Animation' destination image % list. GIF disposal handling is not looked at. % % Special case:- If one of the image sequences is the last image (just a -% single image remaining), that image is repeatally composed with all the +% single image remaining), that image is repeatedly composed with all the % images in the other image list. Either the source or destination lists may % be the single image, for this situation. % @@ -2289,7 +2289,7 @@ WandExport MagickBooleanType MagickCompositeImageGravity(MagickWand *wand, % will ve cloned to match the number of images remaining in the source image % list. % -% This is equivelent to the "-layer Composite" Shell API operator. +% This is equivalent to the "-layer Composite" Shell API operator. % % The format of the MagickCompositeLayers method is: % @@ -2299,7 +2299,7 @@ WandExport MagickBooleanType MagickCompositeImageGravity(MagickWand *wand, % % A description of each parameter follows: % -% o wand: the magick wand holding destaintion images +% o wand: the magick wand holding destination images % % o source_wand: the wand holding the source images % @@ -2819,7 +2819,7 @@ WandExport MagickBooleanType MagickDeskewImage(MagickWand *wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickDespeckleImage() reduces the speckle noise in an image while -% perserving the edges of the original image. +% preserving the edges of the original image. % % The format of the MagickDespeckleImage method is: % @@ -2978,7 +2978,7 @@ WandExport MagickBooleanType MagickDisplayImages(MagickWand *wand, % % MagickDistortImage() distorts an image using various distortion methods, by % mapping color lookups of the source image to a new destination image -% usally of the same size as the source image, unless 'bestfit' is set to +% usually of the same size as the source image, unless 'bestfit' is set to % true. % % If 'bestfit' is enabled, and distortion allows it, the destination image is @@ -3013,7 +3013,7 @@ WandExport MagickBooleanType MagickDisplayImages(MagickWand *wand, % Perspective, and Bilinear, falls back to a Affine distortion when less % that 4 control point pairs are provided. While Affine distortions let % you use any number of control point pairs, that is Zero pairs is a -% no-Op (viewport only) distrotion, one pair is a translation and two +% no-Op (viewport only) distortion, one pair is a translation and two % pairs of control points do a scale-rotate-translate, without any % shearing. % @@ -3326,7 +3326,7 @@ WandExport MagickBooleanType MagickEqualizeImage(MagickWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickEvaluateImage() applys an arithmetic, relational, or logical +% MagickEvaluateImage() applies an arithmetic, relational, or logical % expression to an image. Use these operators to lighten or darken an image, % to increase or decrease contrast in an image, or to produce the "negative" % of an image. @@ -3798,7 +3798,7 @@ WandExport MagickBooleanType MagickFrameImage(MagickWand *wand, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickFunctionImage() applys an arithmetic, relational, or logical +% MagickFunctionImage() applies an arithmetic, relational, or logical % expression to an image. Use these operators to lighten or darken an image, % to increase or decrease contrast in an image, or to produce the "negative" % of an image. @@ -4252,7 +4252,7 @@ WandExport unsigned char *MagickGetImagesBlob(MagickWand *wand,size_t *length) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickGetImageBluePrimary() returns the chromaticy blue primary point for the +% MagickGetImageBluePrimary() returns the chromaticity blue primary point for the % image. % % The format of the MagickGetImageBluePrimary method is: @@ -4339,7 +4339,7 @@ WandExport MagickBooleanType MagickGetImageBorderColor(MagickWand *wand, % image in each of four directions (horizontal, vertical, left and right % diagonals) for the specified distance. The features include the angular % second moment, contrast, correlation, sum of squares: variance, inverse -% difference moment, sum average, sum varience, sum entropy, entropy, +% difference moment, sum average, sum variance, sum entropy, entropy, % difference variance, difference entropy, information measures of % correlation 1, information measures of correlation 2, and maximum % correlation coefficient. You can access the red channel contrast, for @@ -5229,7 +5229,7 @@ WandExport GravityType MagickGetImageGravity(MagickWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickGetImageGreenPrimary() returns the chromaticy green primary point. +% MagickGetImageGreenPrimary() returns the chromaticity green primary point. % % The format of the MagickGetImageGreenPrimary method is: % @@ -5406,7 +5406,7 @@ WandExport InterlaceType MagickGetImageInterlaceScheme(MagickWand *wand) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickGetImageInterpolateMethod() returns the interpolation method for the -% sepcified image. +% specified image. % % The format of the MagickGetImageInterpolateMethod method is: % @@ -5691,7 +5691,7 @@ WandExport MagickBooleanType MagickGetImagePixelColor(MagickWand *wand, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickGetImageRedPrimary() returns the chromaticy red primary point. +% MagickGetImageRedPrimary() returns the chromaticity red primary point. % % The format of the MagickGetImageRedPrimary method is: % @@ -6067,7 +6067,7 @@ WandExport ResolutionType MagickGetImageUnits(MagickWand *wand) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickGetImageVirtualPixelMethod() returns the virtual pixel method for the -% sepcified image. +% specified image. % % The format of the MagickGetImageVirtualPixelMethod method is: % @@ -6104,7 +6104,7 @@ WandExport VirtualPixelMethod MagickGetImageVirtualPixelMethod(MagickWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickGetImageWhitePoint() returns the chromaticy white point. +% MagickGetImageWhitePoint() returns the chromaticity white point. % % The format of the MagickGetImageWhitePoint method is: % @@ -7244,7 +7244,7 @@ WandExport MagickBooleanType MagickMagnifyImage(MagickWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickMeanShiftImage() elineate arbitrarily shaped clusters in the image. For +% MagickMeanShiftImage() delineate arbitrarily shaped clusters in the image. For % each pixel, it visits all the pixels in the neighborhood specified by % the window centered at the pixel and excludes those that are outside the % radius=(window-1)/2 surrounding the pixel. From those pixels, it finds those @@ -7306,7 +7306,7 @@ WandExport MagickBooleanType MagickMeanShiftImage(MagickWand *wand, % % The inital canvas's size depends on the given LayerMethod, and is % initialized using the first images background color. The images -% are then compositied onto that image in sequence using the given +% are then composited onto that image in sequence using the given % composition that has been assigned to each individual image. % % The format of the MagickMergeImageLayers method is: @@ -7421,7 +7421,7 @@ WandExport MagickBooleanType MagickMinifyImage(MagickWand *wand) % % o wand: the magick wand. % -% o brightness: the percent change in brighness. +% o brightness: the percent change in brightness. % % o saturation: the percent change in saturation. % @@ -7619,7 +7619,7 @@ WandExport MagickWand *MagickMorphImages(MagickWand *wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickMorphologyImage() applies a user supplied kernel to the image -% according to the given mophology method. +% according to the given morphology method. % % The format of the MagickMorphologyImage method is: % @@ -7834,9 +7834,9 @@ WandExport MagickBooleanType MagickNewImage(MagickWand *wand,const size_t width, % image. % % When the above condition (end of image list) is reached, the iterator is -% automaticall set so that you can start using MagickPreviousImage() to +% automatically set so that you can start using MagickPreviousImage() to % again iterate over the images in the reverse direction, starting with the -% last image (again). You can jump to this condition immeditally using +% last image (again). You can jump to this condition immediately using % MagickSetLastIterator(). % % The format of the MagickNextImage method is: @@ -8147,7 +8147,7 @@ WandExport MagickBooleanType MagickOptimizeImageTransparency(MagickWand *wand) % level. While checker,8,8,4 will produce a 332 colormaped image with % only a single checkerboard hash pattern (50% grey) between each color % level, to basically double the number of color levels with a bare -% minimim of dithering. +% minimum of dithering. % */ WandExport MagickBooleanType MagickOrderedDitherImage(MagickWand *wand, @@ -9160,7 +9160,7 @@ WandExport MagickBooleanType MagickRemoveImage(MagickWand *wand) % Bessel Blackman Box % Catrom Cubic Gaussian % Hanning Hermite Lanczos -% Mitchell Point Quandratic +% Mitchell Point Quadratic % Sinc Triangle % % Most of the filters are FIR (finite impulse response), however, Bessel, @@ -9263,7 +9263,7 @@ WandExport MagickBooleanType MagickResetImagePage(MagickWand *wand, % Bessel Blackman Box % Catrom Cubic Gaussian % Hanning Hermite Lanczos -% Mitchell Point Quandratic +% Mitchell Point Quadratic % Sinc Triangle % % Most of the filters are FIR (finite impulse response), however, Bessel, @@ -10326,7 +10326,7 @@ WandExport MagickBooleanType MagickSetImageDepth(MagickWand *wand, % % o wand: the magick wand. % -% o dispose: the image disposeal type. +% o dispose: the image disposal type. % */ WandExport MagickBooleanType MagickSetImageDispose(MagickWand *wand, @@ -11515,7 +11515,7 @@ WandExport MagickBooleanType MagickSetImageWhitePoint(MagickWand *wand, % */ WandExport MagickBooleanType MagickShadeImage(MagickWand *wand, - const MagickBooleanType gray,const double asimuth,const double elevation) + const MagickBooleanType gray,const double azimuth,const double elevation) { Image *shade_image; @@ -11526,7 +11526,7 @@ WandExport MagickBooleanType MagickShadeImage(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - shade_image=ShadeImage(wand->images,gray,asimuth,elevation,wand->exception); + shade_image=ShadeImage(wand->images,gray,azimuth,elevation,wand->exception); if (shade_image == (Image *) NULL) return(MagickFalse); ReplaceImageInList(&wand->images,shade_image); @@ -11819,7 +11819,7 @@ WandExport MagickBooleanType MagickSigmoidalContrastImage( % % MagickWand *MagickSimilarityImage(MagickWand *wand, % const MagickWand *reference,const MetricType metric, -% const double similarity_threshold,RectangeInfo *offset, +% const double similarity_threshold,RectangleInfo *offset, % double *similarity) % % A description of each parameter follows: @@ -11926,7 +11926,7 @@ WandExport MagickBooleanType MagickSketchImage(MagickWand *wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickSmushImages() takes all images from the current image pointer to the -% end of the image list and smushs them to each other top-to-bottom if the +% end of the image list and smushes them to each other top-to-bottom if the % stack parameter is true, otherwise left-to-right. % % The format of the MagickSmushImages method is: @@ -12041,13 +12041,13 @@ WandExport MagickBooleanType MagickSolarizeImage(MagickWand *wand, % style of image sparseion. % % Affine, Perspective, and Bilinear, will do least squares fitting of -% the distrotion when more than the minimum number of control point +% the distortion when more than the minimum number of control point % pairs are provided. % % Perspective, and Bilinear, will fall back to a Affine sparseion when % less than 4 control point pairs are provided. While Affine sparseions % will let you use any number of control point pairs, that is Zero pairs -% is a No-Op (viewport only) distrotion, one pair is a translation and +% is a No-Op (viewport only) distortion, one pair is a translation and % two pairs of control points will do a scale-rotate-translate, without % any shearing. % @@ -12160,7 +12160,7 @@ WandExport MagickBooleanType MagickSpliceImage(MagickWand *wand, % % o wand: the magick wand. % -% o method: intepolation method. +% o method: interpolation method. % % o radius: Choose a random pixel in a neighborhood of this extent. % @@ -12969,7 +12969,7 @@ WandExport MagickBooleanType MagickUniqueImageColors(MagickWand *wand) % o gain: the percentage of the difference between the original and the % blur image that is added back into the original. % -% o threshold: the threshold in pixels needed to apply the diffence gain. +% o threshold: the threshold in pixels needed to apply the difference gain. % */ WandExport MagickBooleanType MagickUnsharpMaskImage(MagickWand *wand, diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c index 3056e5b46f..6c30ced08e 100644 --- a/MagickWand/magick-property.c +++ b/MagickWand/magick-property.c @@ -1798,7 +1798,7 @@ WandExport unsigned char *MagickRemoveImageProfile(MagickWand *wand, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickSetAntialias() sets the antialias propery of the wand. +% MagickSetAntialias() sets the antialias property of the wand. % % The format of the MagickSetAntialias method is: % @@ -2434,7 +2434,7 @@ WandExport MagickBooleanType MagickSetInterpolateMethod(MagickWand *wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickSetOption() associates one or options with the wand (.e.g -% MagickSetOption(wand,"jpeg:perserve","yes")). +% MagickSetOption(wand,"jpeg:preserve","yes")). % % The format of the MagickSetOption method is: % @@ -2767,7 +2767,7 @@ WandExport MagickBooleanType MagickSetResolution(MagickWand *wand, % % o wand: the magick wand. % -% o number_factoes: the number of factors. +% o number_factors: the number of factors. % % o sampling_factors: An array of doubles representing the sampling factor % for each color component (in RGB order). @@ -2816,7 +2816,7 @@ WandExport MagickBooleanType MagickSetSamplingFactors(MagickWand *wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % MagickSetSeed() sets the pseudo-random number generator seed. Use it to -% generate a pedictable sequence of random numbers. +% generate a predictable sequence of random numbers. % % The format of the MagickSetSeed method is: % diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 8fa3e0ded2..23dbdc0dd8 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -34,7 +34,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Use the mogrify program to resize an image, blur, crop, despeckle, dither, -% draw on, flip, join, re-sample, and much more. This tool is similiar to +% draw on, flip, join, re-sample, and much more. This tool is similar 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. @@ -252,7 +252,7 @@ static Image *SparseColorOption(const Image *image, /* 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 + a complex mix of floating-point pixel coordinates, and color specifications (or direct floating point numbers). The number of floats needed to represent a color varies depending on the current channel setting. */ diff --git a/MagickWand/montage.c b/MagickWand/montage.c index 41398ced39..6eb1c81a39 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -131,7 +131,7 @@ static MagickBooleanType MontageUsage(void) " -bordercolor color border color\n" " -caption string assign a caption to an image\n" " -colors value preferred number of colors in the image\n" - " -colorspace type alternate image colorsapce\n" + " -colorspace type alternate image colorspace\n" " -comment string annotate image with comment\n" " -compose operator composite operator\n" " -compress type type of pixel compression when writing the image\n" diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 0ea3ba838c..e8ec8d6d03 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -172,7 +172,7 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path, /* SparseColorOption() parse the complex -sparse-color argument into an an array of floating point values than call SparseColorImage(). - Argument is a complex mix of floating-point pixel coodinates, and color + Argument is a complex mix of floating-point pixel coordinates, and color specifications (or direct floating point numbers). The number of floats needed to represent a color varies depending on the current channel setting. @@ -462,7 +462,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, #define _process_flags (cli_wand->process_flags) #define _option_type ((CommandOptionFlags) cli_wand->command->flags) /* Interpret Percent Escapes in Arguments - using first image */ - if ( (((_process_flags & ProcessInterpretProperities) != 0 ) + if ( (((_process_flags & ProcessInterpretProperties) != 0 ) || ((_option_type & AlwaysInterpretArgsFlag) != 0) ) && ((_option_type & NeverInterpretArgsFlag) == 0) ) { /* Interpret Percent escapes in argument 1 */ @@ -549,7 +549,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, { /* FUTURE: bias OBSOLETED, replaced by Artifact "convolve:bias" as it is actually rarely used except in direct convolve operations - Usage outside a direct convolve operation is actally non-sensible! + Usage outside a direct convolve operation is actually non-sensible! SyncImageSettings() used to set per-image attribute. */ @@ -631,7 +631,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, } if (LocaleCompare("colorspace",option+1) == 0) { - /* Setting used for new images via AquireImage() + /* Setting used for new images via AcquireImage() But also used as a SimpleImageOperator Undefined colorspace means don't modify images on read or as a operation */ @@ -654,7 +654,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, SyncImageSettings() used to set per-image attribute. - REMOVE This setting should NOT be used to set image 'compose' - "-layer" operators shoud use _image_info if defined otherwise + "-layer" operators should use _image_info if defined otherwise they should use a per-image compose setting. */ parse = ParseCommandOption(MagickComposeOptions,MagickFalse, @@ -669,7 +669,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, if (LocaleCompare("compress",option+1) == 0) { /* FUTURE: What should be used? _image_info or ImageOption ??? - The former is more efficent, but Crisy prefers the latter! + The former is more efficient, but Crisy prefers the latter! SyncImageSettings() used to set per-image attribute. The coders appears to use _image_info, not Image_Option @@ -748,7 +748,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, } if (LocaleCompare("depth",option+1) == 0) { - /* This is also a SimpleImageOperator! for 8->16 vaule trunc !!!! + /* This is also a SimpleImageOperator! for 8->16 value trunc !!!! SyncImageSettings() used to set per-image attribute. */ if (IfSetOption && (IsGeometry(arg1) == MagickFalse)) @@ -860,7 +860,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, /* Set "fill" OR "fill-pattern" in _draw_info The original fill color is preserved if a fill-pattern is given. That way it does not effect other operations that directly using - the fill color and, can be retored using "+tile". + the fill color and, can be restored using "+tile". */ MagickBooleanType status; @@ -1275,7 +1275,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, if (LocaleCompare("quiet",option+1) == 0) { /* FUTURE: if two -quiet is performed you can not do +quiet! - This needs to be checked over thoughly. + This needs to be checked over thoroughly. */ static WarningHandler warning_handler = (WarningHandler) NULL; @@ -1431,7 +1431,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, #endif if (LocaleCompare("synchronize",option+1) == 0) { - /* FUTURE: syncronize to storage - but what does that mean? */ + /* FUTURE: synchronize to storage - but what does that mean? */ _image_info->synchronize = ArgBoolean; break; } @@ -1627,7 +1627,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% CLISimpleOperatorImages() applys one simple image operation given to all +% CLISimpleOperatorImages() applies one simple image operation given to all % the images in the CLI wand, using any per-image or global settings that was % previously saved in the CLI wand. % @@ -1711,7 +1711,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, arg2 = arg2n; /* Interpret Percent Escapes in Arguments - using first image */ - if ( (((_process_flags & ProcessInterpretProperities) != 0 ) + if ( (((_process_flags & ProcessInterpretProperties) != 0 ) || ((_option_type & AlwaysInterpretArgsFlag) != 0) ) && ((_option_type & NeverInterpretArgsFlag) == 0) ) { /* Interpret Percent escapes in argument 1 */ @@ -2480,7 +2480,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, constant=PerceptibleReciprocal(constant); (void) GammaImage(_image,constant,_exception); #else - /* Using Evaluate POW, direct update of values - more accurite */ + /* Using Evaluate POW, direct update of values - more accurate */ if (IfNormalOp) constant=PerceptibleReciprocal(constant); (void) EvaluateImage(_image,PowEvaluateOperator,constant,_exception); @@ -3580,7 +3580,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, { if (LocaleCompare("unique",option+1) == 0) { - /* FUTURE: move to SyncImageSettings() and AcqireImage()??? + /* FUTURE: move to SyncImageSettings() and AcquireImage()??? Option is not documented, bt appears to be for "identify". We may need a identify specific verbose! */ @@ -3791,7 +3791,7 @@ WandPrivate MagickBooleanType CLISimpleOperatorImages(MagickCLI *cli_wand, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % CLIListOperatorImages() applies a single operation that is apply to the -% entire image list as a whole. The result is often a complete replacment +% entire image list as a whole. The result is often a complete replacement % of the image list with a completely new list, or with just a single image % result. % @@ -3852,7 +3852,7 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, arg2 = arg2n; /* Interpret Percent Escapes in Arguments - using first image */ - if ( (((_process_flags & ProcessInterpretProperities) != 0 ) + if ( (((_process_flags & ProcessInterpretProperties) != 0 ) || ((_option_type & AlwaysInterpretArgsFlag) != 0) ) && ((_option_type & NeverInterpretArgsFlag) == 0) ) { /* Interpret Percent escapes in argument 1 */ @@ -4681,7 +4681,7 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand, base_image=GetImageFromList(_images,0); compare_image=GetImageFromList(_images,1); - /* Comparision Metric */ + /* Comparison Metric */ metric=UndefinedErrorMetric; value=GetImageOption(_image_info,"metric"); if (value != (const char *) NULL) @@ -4846,7 +4846,7 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, arg2 = arg2n; /* Interpret Percent Escapes in Arguments - using first image */ - if ( (((_process_flags & ProcessInterpretProperities) != 0 ) + if ( (((_process_flags & ProcessInterpretProperties) != 0 ) || ((_option_type & AlwaysInterpretArgsFlag) != 0) ) && ((_option_type & NeverInterpretArgsFlag) == 0) ) { /* Interpret Percent escapes in argument 1 */ @@ -5091,7 +5091,7 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, /* Settings are applied to each image in memory in turn (if any). While a option: only need to be applied once globally. - NOTE: rguments have not been automatically percent expaneded + NOTE: Arguments have not been automatically percent expanded */ /* escape the 'key' once only, using first image. */ @@ -5121,7 +5121,7 @@ WandPrivate void CLINoImageOperator(MagickCLI *cli_wand, } if (LocaleNCompare(arg1,"option:",7) == 0) { - /* delete equivelent artifact from all images (if any) */ + /* delete equivalent artifact from all images (if any) */ if (_images != (Image *) NULL) { MagickResetIterator(&cli_wand->wand); @@ -5415,7 +5415,7 @@ WandExport void CLIOption(MagickCLI *cli_wand,const char *option,...) if ( (option_type & SettingOptionFlags) != 0 ) { CLISettingOptionInfo(cli_wand, option, arg1, arg2); /* - FUTURE: Sync Specific Settings into Image Properities (not global) + FUTURE: Sync Specific Settings into Image Properties (not global) */ } diff --git a/MagickWand/pixel-wand-private.h b/MagickWand/pixel-wand-private.h index 9036e72e7a..4c5f85856c 100644 --- a/MagickWand/pixel-wand-private.h +++ b/MagickWand/pixel-wand-private.h @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. - MAgickWand pixel wand private methods. + MagickWand pixel wand private methods. */ #ifndef MAGICKWAND_PIXEL_WAND_PRIVATE_H #define MAGICKWAND_PIXEL_WAND_PRIVATE_H diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c index c1b189888d..abf8662873 100644 --- a/MagickWand/pixel-wand.c +++ b/MagickWand/pixel-wand.c @@ -665,7 +665,7 @@ WandExport Quantum PixelGetBlueQuantum(const PixelWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% PixelGetColorAsString() returnsd the color of the pixel wand as a string. +% PixelGetColorAsString() returns the color of the pixel wand as a string. % % The format of the PixelGetColorAsString method is: % diff --git a/MagickWand/script-token.c b/MagickWand/script-token.c index 1a4191caf0..0af6486587 100644 --- a/MagickWand/script-token.c +++ b/MagickWand/script-token.c @@ -34,13 +34,13 @@ % Read a stream of characters and return tokens one at a time. % % The input stream is divided into individual 'tokens' (representing 'words' -% or 'options'), in a way that is as close to a UNIX shell, as is feasable. +% or 'options'), in a way that is as close to a UNIX shell, as is feasible. % Only shell variable, and command substitutions will not be performed. % Tokens can be any length. % -% The main function call is GetScriptToken() (see below) whcih returns one +% The main function call is GetScriptToken() (see below) which returns one % and only one token at a time. The other functions provide support to this -% function, opening scripts, and seting up the required structures. +% function, opening scripts, and setting up the required structures. % % More specifically... % @@ -50,13 +50,13 @@ % % For example: This\ is' a 'single" token" % -% A token is returned immediatally the end of token is found. That is as soon +% A token is returned immediately the end of token is found. That is as soon % as a unquoted white-space or EOF condition has been found. That is to say % the file stream is parsed purely character-by-character, regardless any % buffering constraints set by the system. It is not parsed line-by-line. % % The function will return 'MagickTrue' if a valid token was found, while -% the token status will be set accordingally to 'OK' or 'EOF', according to +% the token status will be set accordingly to 'OK' or 'EOF', according to % the cause of the end of token. The token may be an empty string if the % input was a quoted empty string. Other error conditions return a value of % MagickFalse, indicating any token found but was incomplete due to some @@ -77,7 +77,7 @@ % % Comments start with a '#' character at the start of a new token, will be % completely ignored upto the end of line, regardless of any backslash at the -% end of the line. You can escape a comment '#', using quotes or backlsashes +% end of the line. You can escape a comment '#', using quotes or backslashes % just as you can in a shell. % % The parser will accept both newlines, returns, or return-newlines to mark @@ -289,7 +289,7 @@ WandExport ScriptTokenInfo * DestroyScriptTokenInfo(ScriptTokenInfo *token_info) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % GetScriptToken() a fairly general, finite state token parser. That returns -% tokens one at a time, as soon as posible. +% tokens one at a time, as soon as possible. % % % The format of the GetScriptToken method is: diff --git a/MagickWand/tests/add_first.c b/MagickWand/tests/add_first.c index f3b3874642..a2aa17e000 100644 --- a/MagickWand/tests/add_first.c +++ b/MagickWand/tests/add_first.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) status; printf("Check prepend when using 'FirstIterator' on empty wand\n"); - printf("Result shoud be: 3210\n"); + printf("Result should be: 3210\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_first_lists.c b/MagickWand/tests/add_first_lists.c index 25ff7736aa..141595542e 100644 --- a/MagickWand/tests/add_first_lists.c +++ b/MagickWand/tests/add_first_lists.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) status; printf("Add 3 sets of images after setting 'first' on empty wand\n"); - printf("Result shoud be: 678 345 012\n"); + printf("Result should be: 678 345 012\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_index.c b/MagickWand/tests/add_index.c index 4601854e8b..0d274f7812 100644 --- a/MagickWand/tests/add_index.c +++ b/MagickWand/tests/add_index.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) status; printf("Read 4 images, then set index 1 and read more individual images\n"); - printf("Result shoud be: 01 654 23\n"); + printf("Result should be: 01 654 23\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_last.c b/MagickWand/tests/add_last.c index fcf913423b..927a8aa608 100644 --- a/MagickWand/tests/add_last.c +++ b/MagickWand/tests/add_last.c @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) status; printf("Check append when using 'LastIterator' on empty wand\n"); - printf("Result shoud be: 0123\n"); + printf("Result should be: 0123\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_last_lists.c b/MagickWand/tests/add_last_lists.c index 6013e0f38d..4779e1bea9 100644 --- a/MagickWand/tests/add_last_lists.c +++ b/MagickWand/tests/add_last_lists.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) status; printf("Add 3 sets of images after setting 'last' on empty wand\n"); - printf("Result shoud be: 012 345 678\n"); + printf("Result should be: 012 345 678\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_mixed.c b/MagickWand/tests/add_mixed.c index cc947c1548..b4c6ab9aba 100644 --- a/MagickWand/tests/add_mixed.c +++ b/MagickWand/tests/add_mixed.c @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) status; printf("Read 3 sets of 3 Images, each set with settings: none, first, last\n"); - printf("Result shoud be: 543 012 678\n"); + printf("Result should be: 543 012 678\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_mixed_lists.c b/MagickWand/tests/add_mixed_lists.c index 8d33e5caf9..416000fb4a 100644 --- a/MagickWand/tests/add_mixed_lists.c +++ b/MagickWand/tests/add_mixed_lists.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) status; printf("Add 3 sets of image using settings: none, first, last\n"); - printf("Result shoud be: 345 012 678\n"); + printf("Result should be: 345 012 678\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_norm.c b/MagickWand/tests/add_norm.c index 9f122715ec..5590c3b9b9 100644 --- a/MagickWand/tests/add_norm.c +++ b/MagickWand/tests/add_norm.c @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) status; printf("Just read images one at a time, no settings\n"); - printf("Result shoud be: 0123\n"); + printf("Result should be: 0123\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/add_norm_lists.c b/MagickWand/tests/add_norm_lists.c index 5512f1a621..0733ef4a09 100644 --- a/MagickWand/tests/add_norm_lists.c +++ b/MagickWand/tests/add_norm_lists.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) status; printf("Just read images in three groups, no settings used\n"); - printf("Result shoud be: 012 345 678\n"); + printf("Result should be: 012 345 678\n"); MagickWandGenesis(); diff --git a/MagickWand/tests/script-token-test-data.txt b/MagickWand/tests/script-token-test-data.txt index 6e1e035f97..acc877946d 100644 --- a/MagickWand/tests/script-token-test-data.txt +++ b/MagickWand/tests/script-token-test-data.txt @@ -22,7 +22,7 @@ And\\\ \''even '\'\""more \""complex \" '"' "\"" Back\ slash\ escapes -\\ '\' "\\" # NOTE that backslash in single quotes are literial! +\\ '\' "\\" # NOTE that backslash in single quotes are literal! 'Space Character Escapes' \ ' ' " " @@ -30,7 +30,7 @@ Back\ slash\ escapes 'Empty Tokens, using quotes' '' "" -"Unicode charcaters are handled" +"Unicode characters are handled" "° ' ² ³ ` ´" "µ ¶ ⨀ ⨁ ⨂" 测试用的汉字 diff --git a/MagickWand/tests/script-token-test-results.txt b/MagickWand/tests/script-token-test-results.txt index 4d0de960d0..50c4056e80 100644 --- a/MagickWand/tests/script-token-test-results.txt +++ b/MagickWand/tests/script-token-test-results.txt @@ -24,7 +24,7 @@ l=28, c=9, stat=0, len=64, token=" " l=30, c=1, stat=0, len=64, token="Empty Tokens, using quotes" l=31, c=1, stat=0, len=64, token="" l=31, c=6, stat=0, len=64, token="" -l=33, c=1, stat=0, len=64, token="Unicode charcaters are handled" +l=33, c=1, stat=0, len=64, token="Unicode characters are handled" l=34, c=1, stat=0, len=64, token="° ' ² ³ ` ´" l=35, c=1, stat=0, len=64, token="µ ¶ ⨀ ⨁ ⨂" l=36, c=1, stat=0, len=64, token="测试用的汉字" diff --git a/MagickWand/tests/script-token-test.c b/MagickWand/tests/script-token-test.c index 5ea45a492b..c6cc94a233 100644 --- a/MagickWand/tests/script-token-test.c +++ b/MagickWand/tests/script-token-test.c @@ -37,11 +37,11 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% Test the raw tokanization of the ScriptToken Subroutines +% Test the raw tokenization of the ScriptToken Subroutines % % This actually uses very little of the magic core functions % and in fact creates a completely stand-alone program by substituting -% required MagickCore with direct system equivelents. +% required MagickCore with direct system equivalents. % % Build % cc script-token-test.c -o script-token-test @@ -57,7 +57,7 @@ #include #include -/* Defines to replace MagickWand / MagickCore defintions */ +/* Defines to replace MagickWand / MagickCore definitions */ #define MagickPathExtent 4096 #define MagickFalse 0 #define MagickTrue 1 diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index 719fc2a41f..b751f6afcd 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -877,7 +877,7 @@ MagickExport void SetWandViewDescription(WandView *wand_view, % SetWandViewIterator() iterates over the wand view in parallel and calls % your set method for each scanline of the view. The pixel extent is % confined to the image canvas-- that is no negative offsets or widths or -% heights that exceed the image dimension. The pixels are initiallly +% heights that exceed the image dimension. The pixels are initially % undefined and any settings you make in the callback method are automagically % synced back to your image. % diff --git a/MagickWand/wand-view.h b/MagickWand/wand-view.h index c32801a2b8..8176b9030c 100644 --- a/MagickWand/wand-view.h +++ b/MagickWand/wand-view.h @@ -9,7 +9,7 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITTransferNS OF ANY KIND, either express or implied. + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/MagickWand/wandcli-private.h b/MagickWand/wandcli-private.h index 620593507e..225dac9c62 100644 --- a/MagickWand/wandcli-private.h +++ b/MagickWand/wandcli-private.h @@ -60,11 +60,11 @@ extern "C" { typedef enum { /* General Option Handling */ - ProcessImplictRead = 0x0001, /* Non-options are image reads. + ProcessImplicitRead = 0x0001, /* Non-options are image reads. If not set then skip implied read without producing an error. For use with "mogrify" handling */ - ProcessInterpretProperities = 0x0010, /* allow general escapes in args */ + ProcessInterpretProperties = 0x0010, /* allow general escapes in args */ /* Special Option Handling */ ProcessExitOption = 0x0100, /* allow '-exit' use */ @@ -74,7 +74,7 @@ typedef enum /* Option Processing Flags */ ProcessOneOptionOnly = 0x4000, /* Process one option only */ - ProcessImplictWrite = 0x8000, /* Last arg is an implict write */ + ProcessImplicitWrite = 0x8000, /* Last arg is an implicit write */ /* Flag Groups for specific Situations */ MagickCommandOptionFlags = 0x8FFF, /* Magick Command Flags */ diff --git a/MagickWand/wandcli.c b/MagickWand/wandcli.c index d3e206ae4e..78e9995a61 100644 --- a/MagickWand/wandcli.c +++ b/MagickWand/wandcli.c @@ -31,7 +31,7 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% General methds for handling the WandCLI structure used for Command Line. +% General methods for handling the WandCLI structure used for Command Line. % % Anthony Thyssen, April 2011 */ @@ -102,7 +102,7 @@ WandExport MagickCLI *AcquireMagickCLI(ImageInfo *image_info, cli_wand->image_info_stack=(Stack *) NULL; /* default exception location... - EG: sprintf(locaiton, filename, line, column); + EG: sprintf(location, filename, line, column); */ cli_wand->location="from \"%s\""; /* location format using arguments: */ /* filename, line, column */ @@ -127,7 +127,7 @@ WandExport MagickCLI *AcquireMagickCLI(ImageInfo *image_info, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% DestroyMagickCLI() destorys everything in a CLI wand, including image_info +% DestroyMagickCLI() destroys everything in a CLI wand, including image_info % and any exceptions, if still present in the wand. % % The format of the NewMagickWand method is: @@ -192,7 +192,7 @@ WandExport MagickCLI *DestroyMagickCLI(MagickCLI *cli_wand) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % CLICatchException() will report exceptions, either just non-fatal warnings -% only, or all errors, according to 'all_execeptions' boolean argument. +% only, or all errors, according to 'all_exceptions' boolean argument. % % The function returns true if errors are fatal, in which case the caller % should abort and re-call with an 'all_exceptions' argument of true before @@ -271,9 +271,9 @@ WandExport MagickBooleanType CLILogEvent(MagickCLI *cli_wand, return(MagickFalse); /* HACK - prepend the CLI location to format string. - The better way would be add more arguments to to the 'va' oparands + The better way would be add more arguments to the 'va' operands list, but that does not appear to be possible! So we do some - pre-formating of the location info here. + pre-formatting of the location info here. */ (void) FormatLocaleString(new_format,MagickPathExtent,cli_wand->location, cli_wand->filename, cli_wand->line, cli_wand->column); @@ -319,9 +319,9 @@ WandExport MagickBooleanType CLIThrowException(MagickCLI *cli_wand, operands; /* HACK - append location to format string. - The better way would be add more arguments to to the 'va' oparands + The better way would be add more arguments to the 'va' operands list, but that does not appear to be possible! So we do some - pre-formating of the location info here. + pre-formatting of the location info here. */ (void) CopyMagickString(new_format,format,MagickPathExtent); (void) ConcatenateMagickString(new_format," ",MagickPathExtent);