Changeset 7119

Timestamp:

03/15/12 09:24:43 (14 months ago)

Author:

anthony

Message:

 

Location:

ImageMagick/trunk/MagickWand

Files:

• magick-image.c (modified) (4 diffs)
• magick-wand.c (modified) (3 diffs)

ImageMagick/trunk/MagickWand/magick-image.c

@@ -403 +403 @@
   Image *images)
 {
-  /* if no images in wand, just add them, set wand->images as appropriate */
+  /* if no images in wand, just add them, set current as appropriate */
   if (wand->images == (Image *) NULL)
     {
@@ -421 +421 @@
       return(MagickTrue);
     }
-  /* Note you should never have 'insert_before' true when wand->images image
+  /* Note you should never have 'insert_before' true when current image
      is not the first image in the wand!  That is no insert before
-     wand->images image, only after current image */
+     current image, only after current image */
 
   /* if at last image append new images */
@@ -432 +432 @@
       return(MagickTrue);
     }
-  /* otherwise insert new images, just after the wand->images image */
+  /* otherwise insert new images, just after the current image */
   InsertImageInList(&wand->images,images);
   return(MagickTrue);
@@ -6835 +6835 @@
 %  MagickNextImage() sets the next image in the wand as the current image.
 %  It returns MagickTrue if their is another image to be processed.
-%  
+%
 %  Returns MagickFalse when current image is already the last image
 %  in the wand (no more next images), at whcih point you can use

ImageMagick/trunk/MagickWand/magick-wand.c

@@ -93 +93 @@
   wand->images=DestroyImageList(wand->images);
   wand->image_info=AcquireImageInfo();
+  wand->insert_before=MagickFalse;
+  wand->image_pending=MagickFalse;
   ClearMagickException(wand->exception);
   wand->debug=IsEventLogging();
@@ -140 +142 @@
   clone_wand->image_info=CloneImageInfo(wand->image_info);
   clone_wand->images=CloneImageList(wand->images,clone_wand->exception);
+  clone_wand->insert_before=MagickFalse;
+  clone_wand->image_pending=MagickFalse;
   clone_wand->debug=IsEventLogging();
   if (clone_wand->debug != MagickFalse)
@@ -827 +831 @@
   wand->images=GetFirstImageInList(wand->images);
   wand->insert_before=MagickFalse; /* Insert/add after current (first) image */
-  wand->image_pending=MagickTrue;  /* NextImage will remain this image */
+  wand->image_pending=MagickTrue;  /* NextImage will set first image */
 }