]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 8 Jan 2015 02:02:38 +0000 (02:02 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 8 Jan 2015 02:02:38 +0000 (02:02 +0000)
MagickCore/composite.c

index 3893a0969bedc18ce1812577787bfb7285abce66..f211a266e63e4f2aaf35aa91020d7e683df910d5 100644 (file)
@@ -1628,8 +1628,8 @@ if (0)
               }
               case DarkenIntensityCompositeOp:
               {
-                pixel=(1.0-Sa)*GetPixelIntensity(composite_image,p) <
-                  (1.0-Da)*GetPixelIntensity(image,q) ? Sa : Da;
+                pixel=Sa*GetPixelIntensity(composite_image,p) <
+                  Da*GetPixelIntensity(image,q) ? Sa : Da;
                 break;
               }
               case LightenIntensityCompositeOp:
@@ -1833,8 +1833,8 @@ if (0)
           }
           case DarkenIntensityCompositeOp:
           {
-            pixel=(1.0-Sa)*GetPixelIntensity(composite_image,p) <
-              (1.0-Da)*GetPixelIntensity(image,q) ? Sc : Dc;
+            pixel=Sa*GetPixelIntensity(composite_image,p) <
+              Da*GetPixelIntensity(image,q) ? Sc : Dc;
             break;
           }
           case DifferenceCompositeOp:
@@ -1980,7 +1980,7 @@ if (0)
           }
           case LinearDodgeCompositeOp:
           {
-            pixel=QuantumRange*(Sa*Sc+Da*Dc);
+            pixel=(Sa*Sc+Da*Dc);
             break;
           }
           case LinearLightCompositeOp: