GraphicsMagick: ReplaceImageInList() related improvements.

GraphicsMagick Commits <[email protected]>
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.37537.1672278054.1567.graphicsmagick-commit@lists.sourceforge.net>
changeset 1db2bd055d4e in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=1db2bd055d4e
summary: ReplaceImageInList() related improvements.

diffstat:

 ChangeLog           |  8 ++++++++
 coders/mat.c        |  6 ++----
 magick/command.c    |  4 +---
 magick/constitute.c |  1 +
 magick/list.c       |  2 +-
 www/Changelog.html  |  5 +++++
 6 files changed, 18 insertions(+), 8 deletions(-)

diffs (92 lines):

diff -r 2df243003b44 -r 1db2bd055d4e ChangeLog
--- a/ChangeLog	Wed Dec 28 14:38:12 2022 -0600
+++ b/ChangeLog	Wed Dec 28 19:40:44 2022 -0600
@@ -1,5 +1,13 @@
 2022-12-28  Bob Friesenhahn  <[email protected]>
 
+	* coders/mat.c (ReadMATImageV4): Use ReplaceImageInList().
+	(ReadMATImage): Use ReplaceImageInList().
+
+	* magick/command.c (MogrifyImages): Remove band-aid.
+
+	* magick/list.c (AppendImageToList): Image list is updated to be
+	new image.
+
 	* magick/image.c (AllocateImage): Initialize colors directly.
 	(GetImageInfo): Initialize colors directly.
 
diff -r 2df243003b44 -r 1db2bd055d4e coders/mat.c
--- a/coders/mat.c	Wed Dec 28 14:38:12 2022 -0600
+++ b/coders/mat.c	Wed Dec 28 19:40:44 2022 -0600
@@ -721,8 +721,7 @@
       rotated_image->blob = image->blob;
       rotated_image->colors = image->colors;
       image->blob = blob;
-      AppendImageToList(&image,rotated_image);
-      DeleteImageFromList(&image);
+      ReplaceImageInList(&image,rotated_image);
       image = rotated_image;
     }
 
@@ -1295,8 +1294,7 @@
       rotated_image->blob = image->blob;
       rotated_image->colors = image->colors;
       image->blob = blob;
-      AppendImageToList(&image,rotated_image);
-      DeleteImageFromList(&image);
+      ReplaceImageInList(&image,rotated_image);
     }
 
 skip_reading_current:
diff -r 2df243003b44 -r 1db2bd055d4e magick/command.c
--- a/magick/command.c	Wed Dec 28 14:38:12 2022 -0600
+++ b/magick/command.c	Wed Dec 28 19:40:44 2022 -0600
@@ -11582,9 +11582,7 @@
           }
       }
       AppendImageToList(&mogrify_images,image);
-      mogrify_images=image;
-    }
-  mogrify_images=GetFirstImageInList(mogrify_images);
+    }
 
   /*
     Apply options to the entire image list.
diff -r 2df243003b44 -r 1db2bd055d4e magick/constitute.c
--- a/magick/constitute.c	Wed Dec 28 14:38:12 2022 -0600
+++ b/magick/constitute.c	Wed Dec 28 19:40:44 2022 -0600
@@ -1842,6 +1842,7 @@
 
       /*
         User specified subimages (e.g. image.miff[1,3-5,7-6,2]).
+        FIXME: Slow!
       */
       subimages=NewImageList();
       p=clone_info->tile;
diff -r 2df243003b44 -r 1db2bd055d4e magick/list.c
--- a/magick/list.c	Wed Dec 28 14:38:12 2022 -0600
+++ b/magick/list.c	Wed Dec 28 19:40:44 2022 -0600
@@ -83,7 +83,7 @@
   for (p=(*images); p->next != (Image *) NULL; p=p->next);
   p->next=image;
   image->previous=p;
-  /* *images=image; */ /* FIXME: Optimization for later */
+  *images=image;
 }
 
 /*
diff -r 2df243003b44 -r 1db2bd055d4e www/Changelog.html
--- a/www/Changelog.html	Wed Dec 28 14:38:12 2022 -0600
+++ b/www/Changelog.html	Wed Dec 28 19:40:44 2022 -0600
@@ -40,6 +40,11 @@
 <p>2022-12-28  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">
+<li><p>coders/mat.c (ReadMATImageV4): Use ReplaceImageInList().
+(ReadMATImage): Use ReplaceImageInList().</p></li>
+<li><p>magick/command.c (MogrifyImages): Remove band-aid.</p></li>
+<li><p>magick/list.c (AppendImageToList): Image list is updated to be
+new image.</p></li>
 <li><p>magick/image.c (AllocateImage): Initialize colors directly.
 (GetImageInfo): Initialize colors directly.</p></li>
 <li><p>utilities/tests/convert-cmds.txt: Add more convert command
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.