(no commit message)

diff --git a/magick/composite-private.h b/magick/composite-private.h
index e77e328c8f76b31e04cde8687f3284042fc7b31a..6a4e09a427ed597ad8e3d631404efd0d60b4d6ab 100644 (file)
--- a/magick/composite-private.h
+++ b/magick/composite-private.h
@@ -104,11 +104,9 @@ static inline void MagickPixelCompositeOver(const MagickPixelPacket *p,
   gamma=1.0-QuantumScale*QuantumScale*alpha*beta;
   composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
   gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
-  composite->red=gamma*MagickOver_(GetRedPixelComponent(p),alpha,q->red,beta);
-  composite->green=gamma*MagickOver_(GetGreenPixelComponent(p),alpha,q->green,
-    beta);
-  composite->blue=gamma*MagickOver_(GetBluePixelComponent(p),alpha,q->blue,
-    beta);
+  composite->red=gamma*MagickOver_(p->red,alpha,q->red,beta);
+  composite->green=gamma*MagickOver_(p->green,alpha,q->green,beta);
+  composite->blue=gamma*MagickOver_(p->blue,alpha,q->blue,beta);
   if (q->colorspace == CMYKColorspace)
     composite->index=gamma*MagickOver_(p->index,alpha,q->index,beta);
 }
@@ -130,9 +128,9 @@ static inline void MagickPixelCompositePlus(const MagickPixelPacket *p,
   gamma=RoundToUnity(Sa+Da);  /* 'Plus' blending -- not 'Over' blending */
   composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
   gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
-  composite->red=gamma*(Sa*GetRedPixelComponent(p)+Da*q->red);
-  composite->green=gamma*(Sa*GetGreenPixelComponent(p)+Da*q->green);
-  composite->blue=gamma*(Sa*GetBluePixelComponent(p)+Da*q->blue);
+  composite->red=gamma*(Sa*p->red+Da*q->red);
+  composite->green=gamma*(Sa*p->green+Da*q->green);
+  composite->blue=gamma*(Sa*p->blue+Da*q->blue);
   if (q->colorspace == CMYKColorspace)
     composite->index=gamma*(Sa*p->index+Da*q->index);
 }

diff --git a/magick/threshold.c b/magick/threshold.c
index 411859857b0ebc6e2d17a6cf2998702fa39b7d2c..a1da573b9a2aa96fbf95fb9db01711b25ee7001d 100644 (file)
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -444,8 +444,9 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
               SetOpacityPixelComponent(q,(MagickRealType)
                 GetOpacityPixelComponent(q) <= threshold ? 0 : QuantumRange);
             else
-              SetRedPixelComponent(q,(MagickRealType) GetOpacityPixelComponent(
-                q) <= threshold ? OpaqueOpacity : TransparentOpacity);
+              SetOpacityPixelComponent(q,(MagickRealType)
+                GetOpacityPixelComponent(q) <= threshold ? OpaqueOpacity :
+                TransparentOpacity);
           }
         if (((channel & IndexChannel) != 0) &&
             (image->colorspace == CMYKColorspace))