(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index fe51f239230488d079fc4dc40bb1576713502ce1..46f99ac72300ebe5a479dd79f860ff739e1eb813 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1364,6 +1364,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         case DivideSrcCompositeOp:
         case ExclusionCompositeOp:
         case HardLightCompositeOp:
+        case HardMixCompositeOp:
         case LinearBurnCompositeOp:
         case LinearDodgeCompositeOp:
         case LinearLightCompositeOp:
@@ -1880,6 +1881,18 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
               Dca*(1.0-Sa));
             break;
           }
+          case HardMixCompositeOp:
+          {
+            if ((2.0*Sca) < Sa)
+              {
+                pixel=QuantumRange*gamma*(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*
+                  (1.0-Sa));
+                break;
+              }
+            pixel=QuantumRange*gamma*(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+
+              Dca*(1.0-Sa));
+            break;
+          }
           case HueCompositeOp:
           {
             if (fabs(QuantumRange*Sa-TransparentAlpha) < MagickEpsilon)

diff --git a/MagickCore/composite.h b/MagickCore/composite.h
index 4bc019a4459a7237b7d9c8bf986f21904b003151..a2d494a999dc8fa0cd1d1d472cc3e5080810bc87 100644 (file)
--- a/MagickCore/composite.h
+++ b/MagickCore/composite.h
@@ -58,6 +58,7 @@ typedef enum
   DstOverCompositeOp,
   ExclusionCompositeOp,
   HardLightCompositeOp,
+  HardMixCompositeOp,
   HueCompositeOp,
   InCompositeOp,
   IntensityCompositeOp,

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 23b367a5be888b800b13e38e39249ed0cf08b450..a5561478002f395405232b547de77b56c04b8492 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -823,6 +823,7 @@ static const OptionInfo
     { "DstOver", DstOverCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "Exclusion", ExclusionCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "HardLight", HardLightCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "HardMix", HardMixCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "Hue", HueCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "In", InCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "Intensity", IntensityCompositeOp, UndefinedOptionFlag, MagickFalse },