From: cristy Date: Wed, 11 Apr 2012 18:48:17 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5832 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e14e320cfae4c2114600d028682a4fc4836c660d;p=imagemagick --- diff --git a/MagickCore/image.c b/MagickCore/image.c index 31be7c741..719bf54db 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -534,6 +534,9 @@ MagickExport Image *AppendImages(const Image *images, MagickBooleanType sync; + PixelInfo + pixel; + register const Quantum *restrict p; @@ -553,34 +556,17 @@ MagickExport Image *AppendImages(const Image *images, status=MagickFalse; continue; } + GetPixelInfo(image,&pixel); for (x=0; x < (ssize_t) image->columns; x++) { - register ssize_t - i; - if (GetPixelMask(image,p) != 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(append_image); continue; } - for (i=0; i < (ssize_t) GetPixelChannels(image); i++) - { - PixelChannel - channel; - - PixelTrait - append_traits, - traits; - - channel=GetPixelChannelMapChannel(image,i); - traits=GetPixelChannelMapTraits(image,channel); - append_traits=GetPixelChannelMapTraits(append_image,channel); - if ((traits == UndefinedPixelTrait) || - (append_traits == UndefinedPixelTrait)) - continue; - SetPixelChannel(append_image,channel,p[i],q); - } + GetPixelInfoPixel(image,p,&pixel); + SetPixelInfoPixel(append_image,&pixel,q); p+=GetPixelChannels(image); q+=GetPixelChannels(append_image); }