From d1d7de5fb414c450a5688f6aa78523d2f27a9a72 Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 21 Sep 2017 19:54:20 -0400 Subject: [PATCH] ... --- MagickCore/pixel-accessor.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index c0b6d5fa0..aa21d96e9 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -468,6 +468,8 @@ static inline MagickBooleanType IsPixelEquivalent( value=(MagickRealType) p[image->channel_map[AlphaPixelChannel].offset]; alpha=image->alpha_trait == UndefinedPixelTrait ? OpaqueAlpha : value; beta=q->alpha_trait == UndefinedPixelTrait ? OpaqueAlpha : q->alpha; + if (AbsolutePixelValue(alpha-beta) >= MagickEpsilon) + return(MagickFalse); if ((alpha == TransparentOpacity) || (beta == TransparentOpacity)) return(MagickTrue); /* no color component if pixel is transparent */ value=(MagickRealType) p[image->channel_map[RedPixelChannel].offset]; @@ -485,8 +487,6 @@ static inline MagickBooleanType IsPixelEquivalent( if (AbsolutePixelValue(value-q->black) >= MagickEpsilon) return(MagickFalse); } - if (AbsolutePixelValue(alpha-beta) >= MagickEpsilon) - return(MagickFalse); return(MagickTrue); } @@ -517,6 +517,8 @@ static inline MagickBooleanType IsPixelInfoEquivalent( alpha=p->alpha_trait == UndefinedPixelTrait ? OpaqueAlpha : p->alpha; beta=q->alpha_trait == UndefinedPixelTrait ? OpaqueAlpha : q->alpha; + if (AbsolutePixelValue(alpha-beta) >= MagickEpsilon) + return(MagickFalse); if ((alpha == TransparentOpacity) || (beta == TransparentOpacity)) return(MagickTrue); /* no color component if pixel is transparent */ if (AbsolutePixelValue(p->red-q->red) >= MagickEpsilon) @@ -530,8 +532,6 @@ static inline MagickBooleanType IsPixelInfoEquivalent( if (AbsolutePixelValue(p->black-q->black) >= MagickEpsilon) return(MagickFalse); } - if (AbsolutePixelValue(alpha-beta) >= MagickEpsilon) - return(MagickFalse); return(MagickTrue); } -- 2.40.0