From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 31 Dec 2011 22:31:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9862146c74f51e378eeea80524fb85dd4a332b0a;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 561b7303b..3faa5e27b 100644
--- 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 976e9f255..c8f69bc9c 100644
--- 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 c9db13942..670af0d28 100644
--- 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 b3d87464f..1243f82ca 100644
--- 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 },