]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Fri, 21 Apr 2017 00:14:10 +0000 (20:14 -0400)
committerCristy <urban-warrior@imagemagick.org>
Fri, 21 Apr 2017 00:14:10 +0000 (20:14 -0400)
MagickCore/decorate.c

index 9e1f860772385bf9af248e97aad5d5f890aee83c..1095e8c956f4e24698fc1b5f4c56b558dc62cc1a 100644 (file)
@@ -426,45 +426,10 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
     /*
       Set frame interior pixels.
     */
+    for (x=0; x < (ssize_t) image->columns; x++)
     {
-      register const Quantum
-        *p;
-
-      p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
-      if (p == (const Quantum *) NULL)
-        {
-          status=MagickFalse;
-          continue;
-        }
-      for (x=0; x < (ssize_t) image->columns; x++)
-      {
-        register ssize_t
-          i;
-
-        if (GetPixelWriteMask(image,q) == 0)
-          {
-            SetPixelBackgoundColor(frame_image,q);
-            p+=GetPixelChannels(image);
-            q+=GetPixelChannels(frame_image);
-            continue;
-          }
-        for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
-        {
-          PixelChannel channel=GetPixelChannelChannel(image,i);
-          PixelTrait traits=GetPixelChannelTraits(image,channel);
-          PixelTrait frame_traits=GetPixelChannelTraits(frame_image,channel);
-          if ((traits == UndefinedPixelTrait) ||
-              (frame_traits == UndefinedPixelTrait))
-            continue;
-          SetPixelChannel(frame_image,channel,p[i],q);
-        }
-        SetPixelRed(frame_image,GetPixelRed(image,p),q);
-        SetPixelGreen(frame_image,GetPixelGreen(image,p),q);
-        SetPixelBlue(frame_image,GetPixelBlue(image,p),q);
-        SetPixelAlpha(frame_image,GetPixelAlpha(image,p),q);
-        p+=GetPixelChannels(image);
-        q+=GetPixelChannels(frame_image);
-      }
+      SetPixelViaPixelInfo(frame_image,&frame_image->border_color,q);
+      q+=GetPixelChannels(frame_image);
     }
     for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
     {