[Emacs-diffs] trunk r113899: (imagemagick_compute_animated_image): Clean up code slightly

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113899
revision-id: address@hidden
parent: address@hidden
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-15 19:26:34 +0200
message:
  (imagemagick_compute_animated_image): Clean up code slightly
modified:
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-15 17:20:06 +0000
+++ b/src/image.c       2013-08-15 17:26:34 +0000
@@ -7929,20 +7929,15 @@
          dest = PixelGetNextIteratorRow (dest_iterator, &dest_width);
          for (x = 0; x < source_width; x++)
            {
-             if (dispose == BackgroundDispose)
+             /* Normally we only copy over non-transparent pixels,
+                but if the disposal method is "Background", then we
+                copy over all pixels.  */
+             if (dispose == BackgroundDispose ||
+                 PixelGetAlpha (source[x]))
                {
                  PixelGetMagickColor (source[x], &pixel);
                  PixelSetMagickColor (dest[x], &pixel);
                }
-             else
-               {
-                 /* Copy over non-transparent pixels. */
-                 if (PixelGetAlpha (source[x]))
-                   {
-                     PixelGetMagickColor (source[x], &pixel);
-                     PixelSetMagickColor (dest[x], &pixel);
-                   }
-               }
            }
          PixelSyncIterator(dest_iterator);
        }