(no commit message)

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 07473dba2bab054d4648fca929dadbce062ec282..6f18b1d8a8ed2225ea8da2d6ba1f5b51eb311d9c 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -274,7 +274,7 @@ struct _Image
     dither;            /* dithering on/off */
 
   MagickSizeType
-    extent;
+    extent;            /* Size of image read from disk */
 
   MagickBooleanType
     ping;
@@ -317,25 +317,25 @@ struct _Image
     *generic_profile;
 
   char
-    filename[MaxTextExtent],   /* images input filename */
-    magick_filename[MaxTextExtent],
-    magick[MaxTextExtent];
+    filename[MaxTextExtent],        /* images input filename */
+    magick_filename[MaxTextExtent], /* given image filename (with read mods) */
+    magick[MaxTextExtent];          /* images file format (file magic) */
 
   size_t
     magick_columns,
     magick_rows;
 
   BlobInfo
-    *blob;
+    *blob;             /* image file as in-memory string of 'extent' */
 
   ExceptionInfo
-    exception;        /* Error handling report */
+    exception;         /* Error handling report */
 
   MagickBooleanType
-    debug;            /* debug output attribute */
+    debug;             /* debug output attribute */
 
   volatile ssize_t
-    reference_count;
+    reference_count;   /* image data sharing memory management */
 
   SemaphoreInfo
     *semaphore;
@@ -375,22 +375,22 @@ struct _ImageInfo
     depth;
 
   InterlaceType
-    interlace;
+    interlace;          /* interlace for image write */
 
   EndianType
-    endian;
+    endian;             /* integer endian order for raw image data */
 
   ResolutionType
-    units;
+    units;              /* denisty pixels/inch or pixel/cm */
 
   size_t
-    quality;
+    quality;            /* compression quality */
 
   char
-    *sampling_factor,
-    *server_name,
-    *font,
-    *texture,
+    *sampling_factor,   /* JPEG write sampling factor */
+    *server_name,       /* X windows server name - display/animate */
+    *font,              /* draw_info */
+    *texture,           /* montage/display background tile */
     *density;
 
   double
@@ -403,8 +403,8 @@ struct _ImageInfo
     matte_color;
 
   MagickBooleanType
-    dither,
-    monochrome;
+    dither,            /* dither enable-disable */
+    monochrome;        /* read/write pcl,pdf,ps,xps as monocrome image */
 
   size_t
     colors;
@@ -422,8 +422,8 @@ struct _ImageInfo
     group;
 
   MagickBooleanType
-    ping,
-    verbose;
+    ping,                    /* fast read image attributes, not image data */
+    verbose;                 /* verbose output enable/disable */
 
   char
     *view,
@@ -433,7 +433,7 @@ struct _ImageInfo
     channel;
 
   void
-    *options;
+    *options;                /* splay tree of use options */
 
   VirtualPixelMethod
     virtual_pixel_method;
@@ -467,10 +467,10 @@ struct _ImageInfo
     length;
 
   char
-    magick[MaxTextExtent],
-    unique[MaxTextExtent],
-    zero[MaxTextExtent],
-    filename[MaxTextExtent];
+    magick[MaxTextExtent],    /* image file format (file magick) */
+    unique[MaxTextExtent],    /* unique tempory filename - delegates */
+    zero[MaxTextExtent],      /* unique filename ? - delegates */
+    filename[MaxTextExtent];  /* filename when reading/writing image */
 
   MagickBooleanType
     debug;

diff --git a/MagickCore/list.c b/MagickCore/list.c
index 65e245170c55b7bea6569a040d37135091dfbe14..19e4b0374a6d991fab1c0163ad139cd99709b46d 100644 (file)
--- a/MagickCore/list.c
+++ b/MagickCore/list.c
@@ -846,9 +846,9 @@ MagickExport Image **ImageListToArray(const Image *images,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  InsertImageInList() inserts the second image or image list into the first
-%  image list immediately after the image pointed to.  The given image list
-%  pointer is unchanged unless previously empty.
+%  InsertImageInList() insert second given image or image list, into the first
+%  image list, immediately AFTER the image pointed to.  The given image list
+%  pointer is left unchanged unless previously empty.
 %
 %  The format of the InsertImageInList method is:
 %
@@ -928,6 +928,7 @@ MagickExport Image *NewImageList(void)
 */
 MagickExport void PrependImageToList(Image **images,Image *image)
 {
+  /* prepend, append the two lists with order swapped! */
   AppendImageToList(&image,*images);
 }
 \f

diff --git a/MagickCore/option.c b/MagickCore/option.c
index c5a5b4f3c86bdf93a7ad041a1d6dfaae5990bc66..f0bcac179b7c61bf5b0b6ce85573689a9721bc64 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1597,7 +1597,8 @@ MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info,
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  DefineImageOption() associates a key/value pair with an image option.
+%  DefineImageOption() associates an assignment string of the form
+%  "key=value" with an image option.
 %
 %  The format of the DefineImageOption method is:
 %
@@ -1608,7 +1609,7 @@ MagickExport MagickBooleanType CloneImageOptions(ImageInfo *image_info,
 %
 %    o image_info: the image info.
 %
-%    o option: the image option.
+%    o option: the image option assignment string.
 %
 */
 MagickExport MagickBooleanType DefineImageOption(ImageInfo *image_info,