]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 9 Jul 2013 13:25:52 +0000 (13:25 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 9 Jul 2013 13:25:52 +0000 (13:25 +0000)
MagickCore/composite.c

index 3a8d0b8014338b5d720f188fe729c5c413982b2c..145cfbdc997529376dd207c2a5e0807488d29ef4 100644 (file)
@@ -1721,14 +1721,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           }
           case ColorDodgeCompositeOp:
           {
-            if ((fabs(Sca-Sa) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon))
+            if ((Sca*Da+Dca*Sa) >= Sa*Da)
               {
-                pixel=QuantumRange*gamma*(Sca*(1.0-Da)+Dca*(1.0-Sa));
-                break;
-              }
-            if (fabs(Sca-Sa) < MagickEpsilon)
-              {
-                pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+                pixel=QuantumRange*gamma*(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa))
                 break;
               }
             pixel=QuantumRange*gamma*(Dca*Sa*Sa/(Sa-Sca)+Sca*(1.0-Da)+Dca*