aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2013-08-15 22:21:38 +0200
committerJoakim Verona2013-08-15 22:21:38 +0200
commita6266f5865449ecb66c69f08c8f9042633721b47 (patch)
tree0ea9e79f623a49b47d133886eacb32ee41f9138e
parent8e6a3959ba772997f80108b53317e966f63cf52d (diff)
parent0f8a692622e18520c11ae7ae0c3e51b04b410790 (diff)
downloademacs-a6266f5865449ecb66c69f08c8f9042633721b47.tar.gz
emacs-a6266f5865449ecb66c69f08c8f9042633721b47.zip
merge from trunk
-rw-r--r--src/image.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c
index d7e1d7991dd..41c991f09c6 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7908,6 +7908,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
7908 MagickGetImagePage (sub_wand, &source_width, &source_height, 7908 MagickGetImagePage (sub_wand, &source_width, &source_height,
7909 &source_left, &source_top); 7909 &source_left, &source_top);
7910 7910
7911 /* This flag says how to handle transparent pixels. */
7911 dispose = MagickGetImageDispose (sub_wand); 7912 dispose = MagickGetImageDispose (sub_wand);
7912 7913
7913 source_iterator = NewPixelIterator (sub_wand); 7914 source_iterator = NewPixelIterator (sub_wand);
@@ -7968,7 +7969,7 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
7968 PixelSetMagickColor (dest[x + source_left], &pixel); 7969 PixelSetMagickColor (dest[x + source_left], &pixel);
7969 } 7970 }
7970 } 7971 }
7971 PixelSyncIterator(dest_iterator); 7972 PixelSyncIterator (dest_iterator);
7972 } 7973 }
7973 7974
7974 DestroyPixelIterator (source_iterator); 7975 DestroyPixelIterator (source_iterator);