From f5cd1acec40bddfecde45494d83076ab907f065a Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 14 Sep 2014 15:01:30 +0000 Subject: [PATCH] --- MagickCore/decorate.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 152cbe9d5..77fded24b 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -166,14 +166,6 @@ MagickExport Image *BorderImage(const Image *image, % o exception: return any errors or warnings in this structure. % */ - -static inline size_t MagickMin(const ssize_t x,const ssize_t y) -{ - if (x < y) - return(x); - return(y); -} - MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, const CompositeOperator compose,ExceptionInfo *exception) { @@ -459,9 +451,6 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, register ssize_t i; - size_t - number_channels; - if (GetPixelReadMask(image,q) == 0) { SetPixelBackgoundColor(frame_image,q); @@ -469,9 +458,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, q+=GetPixelChannels(frame_image); continue; } - number_channels=MagickMin(GetPixelChannels(image), - GetPixelChannels(frame_image)); - for (i=0; i < (ssize_t) number_channels; i++) + for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel channel=GetPixelChannelChannel(image,i); PixelTrait traits=GetPixelChannelTraits(image,channel); -- 2.40.0