[Emacs-diffs] trunk r113902: (imagemagick_compute_animated_image): Fix animated segafault

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113902
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-15 20:47:28 +0200
message:
  (imagemagick_compute_animated_image): Fix animated segafault
  
  (imagemagick_compute_animated_image): Setting the iterator row to
  zero is apparently not allowed.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-15 18:34:23 +0000
+++ b/src/ChangeLog     2013-08-15 18:47:28 +0000
@@ -2,6 +2,8 @@
 
        * image.c (imagemagick_compute_animated_image): Animate correctly
        when sub-images are smaller than the main image.
+       (imagemagick_compute_animated_image): Setting the iterator row to
+       zero is apparently not allowed.
 
 2013-08-15  Jan Djärv  <address@hidden>
 

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-15 18:34:23 +0000
+++ b/src/image.c       2013-08-15 18:47:28 +0000
@@ -7945,7 +7945,8 @@
 
       /* The sub-image may not start at origo, so move the destination
         iterator to where the sub-image should start. */
-      PixelSetIteratorRow (dest_iterator, source_top);
+      if (source_top > 0)
+       PixelSetIteratorRow (dest_iterator, source_top);
 
       while ((source = PixelGetNextIteratorRow (source_iterator, 
&source_width))
             != NULL)