(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 561b7303b02b9bf1510505459b8ffe5623539e86..3faa5e27bda7462376cfe5ffaefe832b20e0fe9f 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1521,6 +1521,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
                   (1.0-Da)*GetPixelIntensity(image,q) ? Sa : Da;
                 break;
               }
+              case IntensityCompositeOp:
+              {
+                pixel=GetPixelIntensity(composite_image,p);
+                break;
+              }
               case LightenIntensityCompositeOp:
               {
                 pixel=Sa*GetPixelIntensity(composite_image,p) >
@@ -1672,6 +1677,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             break;
           }
           case CopyAlphaCompositeOp:
+          case IntensityCompositeOp:
           {
             if (channel == AlphaPixelChannel)
               {

diff --git a/MagickCore/composite.h b/MagickCore/composite.h
index 976e9f255b8c070c8ba539756ab4a537316e29ea..c8f69bc9c96df55907bbfc043fdf1c1d478c5d91 100644 (file)
--- a/MagickCore/composite.h
+++ b/MagickCore/composite.h
@@ -59,6 +59,7 @@ typedef enum
   HardLightCompositeOp,
   HueCompositeOp,
   InCompositeOp,
+  IntensityCompositeOp,
   LightenCompositeOp,
   LightenIntensityCompositeOp,
   LinearBurnCompositeOp,

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index c9db13942b146454a8d4ffd383e6a821bf9bc5d2..670af0d28a2a24a7c0ab4520f2527407e059ac86 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -5420,8 +5420,8 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
       return((Image *) NULL);
     }
   canvas_image->matte=MagickTrue;
-  oval_image=CloneImage(canvas_image,canvas_image->columns,
-    canvas_image->rows,MagickTrue,exception);
+  oval_image=CloneImage(canvas_image,canvas_image->columns,canvas_image->rows,
+    MagickTrue,exception);
   if (oval_image == (Image *) NULL)
     {
       canvas_image=DestroyImage(canvas_image);
@@ -5449,7 +5449,7 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
       return((Image *) NULL);
     }
   blur_image->matte=MagickFalse;
-  (void) CompositeImage(canvas_image,CopyAlphaCompositeOp,blur_image,0,0,
+  (void) CompositeImage(canvas_image,IntensityCompositeOp,blur_image,0,0,
     exception);
   blur_image=DestroyImage(blur_image);
   vignette_image=MergeImageLayers(canvas_image,FlattenLayer,exception);

diff --git a/MagickCore/option.c b/MagickCore/option.c
index b3d87464f783443fe6790a0fe77bd38cd8d59fb3..1243f82ca5f9376b82b8085e0b55df5dc051a989 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -761,6 +761,7 @@ static const OptionInfo
     { "HardLight", HardLightCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "Hue", HueCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "In", InCompositeOp, UndefinedOptionFlag, MagickFalse },
+    { "Intensity", IntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "Lighten", LightenCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "LightenIntensity", LightenIntensityCompositeOp, UndefinedOptionFlag, MagickFalse },
     { "LinearBurn", LinearBurnCompositeOp, UndefinedOptionFlag, MagickFalse },