(no commit message)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index e4ab882d7edf216567fc8c73684e856195d267c0..24688e19fb16110028bf443100ff8d6869040fae 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1525,7 +1525,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
           Image option.
         */
         /* FUTURE: Compare update with code from InterpretImageProperties()
-           Note that a 'filename:' properity should not need depth recursion.
+           Note that a 'filename:' property should not need depth recursion.
         */
         if (strchr(p,']') == (char *) NULL)
           break;
@@ -1548,7 +1548,7 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
 #if 0
         // FUTURE: remove this code. -- Anthony  29 Arpil 2012
         // Removed as GetMagickProperty() will will never match a "filename:"
-        // string as this is not a 'known' image properity.
+        // string as this is not a 'known' image property.
         //
         if ((image_info != (const ImageInfo *) NULL) &&
             (image != (const Image *) NULL))

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index e2ea76a261494f2bc1109332cb1a242f42e76d82..d87a32342170b7ff732f324cb39b8bee9b218bdb 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -93,7 +93,7 @@
 ** part of the kernel neighbourhood for convolution or morphology processing,
 ** and thus should be ignored.  This allows the use of 'shaped' kernels.
 **
-** The special properity that two NaN's are never equal, even if they are from
+** The special property that two NaN's are never equal, even if they are from
 ** the same variable allow you to test if a value is special NaN value.
 **
 ** This macro  IsNaN() is thus is only true if the value given is NaN.

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 22aaf4f94dccdeb98127e64108f1ebd323d578e3..67c7e7490a55e0c836fce5810fea8d805c4dc2e7 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2162,11 +2162,11 @@ MagickExport const char *GetImageProperty(const Image *image,
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  GetMagickProperty() gets attributes or calculated values that is associated
-%  with a fixed known property name, or single letter properity.
+%  with a fixed known property name, or single letter property.
 %
-%  This does not return, special profile or properity expressions. Nor does it
-%  return free-form properity strings, unless referenced by a single letter
-%  properity name.
+%  This does not return, special profile or property expressions. Nor does it
+%  return free-form property strings, unless referenced by a single letter
+%  property name.
 %
 %  The returned string is stored as the image artifact 'get-property' (not as
 %  another property), and as such should not be freed. Later calls however
@@ -2176,7 +2176,7 @@ MagickExport const char *GetImageProperty(const Image *image,
 %  The format of the GetMagickProperty method is:
 %
 %      const char *GetMagickProperty(const ImageInfo *image_info,Image *image,
-%        const char *properity,ExceptionInfo *exception)
+%        const char *property,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2260,7 +2260,7 @@ static const char *GetMagickPropertyLetter(const ImageInfo *image_info,
         GetNumberColors(image,(FILE *) NULL,exception));
       break;
     }
-    case 'l': /* Image label properity - empty string by default */
+    case 'l': /* Image label property - empty string by default */
     {
       string=GetImageProperty(image,"label",exception);
       if ( string == (const char *)NULL)
@@ -2848,7 +2848,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GetNextImageProperty() gets the next free-form string properity name.
+%  GetNextImageProperty() gets the next free-form string property name.
 %
 %  The format of the GetNextImageProperty method is:
 %
@@ -2893,7 +2893,7 @@ MagickExport char *GetNextImageProperty(const Image *image)
 %     %x            where 'x' is a single letter, case sensitive).
 %     %[type:name]  where 'type' is specifically known prefix.
 %     %[name]       where 'name' is a specifically known attribute, calculated
-%                   value, or a per-image properity string name, or a per-image
+%                   value, or a per-image property string name, or a per-image
 %                   'artifact' (as generated from a global option)
 %
 %  Single letter % substitutions will only happen if the preceeding character
@@ -3135,7 +3135,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
       /*
         Special Property Prefixes
         such as: %[exif:...] %[fx:...] %[pixel:...]
-        Otherwise a free-form properity string
+        Otherwise a free-form property string
       */
       value=GetImageProperty(image,pattern,exception);
       if (value != (const char *) NULL)
@@ -3155,7 +3155,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
           continue;
         }
       /*
-        Handle properity 'glob' patterns
+        Handle property 'glob' patterns
         Such as:  %[*]   %[user:array_??]  %[filename:e*]
       */
       if( IfMagickTrue(IsGlob(pattern)) )
@@ -3361,9 +3361,9 @@ MagickExport void ResetImagePropertyIterator(const Image *image)
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %  SetImageProperty() saves the given string value either to specific known
-%  attribute or to a freeform properity string.
+%  attribute or to a freeform property string.
 %
-%  Attempting to set a properity that is normally calculated will produce
+%  Attempting to set a property that is normally calculated will produce
 %  an exception.
 %
 %  The format of the SetImageProperty method is:
@@ -3401,7 +3401,7 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
     image->properties=NewSplayTree(CompareSplayTreeString,
       RelinquishMagickMemory,RelinquishMagickMemory);
 
-  /* Delete properity if NULL --  empty string values are valid! */
+  /* Delete property if NULL --  empty string values are valid! */
   if ((value == (const char *) NULL))
     return(DeleteImageProperty(image,property));
   status=MagickTrue;