From f91b39ed781a23024e02bb95879b46d3012ceb78 Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 30 Nov 2017 19:38:30 -0500 Subject: [PATCH] Support Stereo composite operator --- ChangeLog | 3 +++ MagickCore/composite.c | 6 ++++++ MagickCore/composite.h | 3 ++- MagickCore/option.c | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 273cd840f..8dee8e746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-11-30 7.0.7-14 Cristy + * Support Stereo composite operator. + 2017-11-30 7.0.7-13 Cristy * Release ImageMagick version 7.0.7-13, GIT revision 21823:72cb0fd0c:20171130. diff --git a/MagickCore/composite.c b/MagickCore/composite.c index e2f59842c..7a258c300 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -2264,6 +2264,12 @@ MagickExport MagickBooleanType CompositeImage(Image *image, (Dca/Da))+Sca*(1.0-Da)+Dca*(1.0-Sa)); break; } + case StereoCompositeOp: + { + if (channel == RedPixelChannel) + pixel=(MagickRealType) GetPixelRed(source_image,p); + break; + } case ThresholdCompositeOp: { MagickRealType diff --git a/MagickCore/composite.h b/MagickCore/composite.h index ca658210f..d866f0ff4 100644 --- a/MagickCore/composite.h +++ b/MagickCore/composite.h @@ -94,7 +94,8 @@ typedef enum SrcOverCompositeOp, ThresholdCompositeOp, VividLightCompositeOp, - XorCompositeOp + XorCompositeOp, + StereoCompositeOp } CompositeOperator; extern MagickExport MagickBooleanType diff --git a/MagickCore/option.c b/MagickCore/option.c index 4a2068b2a..5e4e1e252 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -971,6 +971,7 @@ static const OptionInfo { "SrcIn", SrcInCompositeOp, UndefinedOptionFlag, MagickFalse }, { "SrcOut", SrcOutCompositeOp, UndefinedOptionFlag, MagickFalse }, { "SrcOver", SrcOverCompositeOp, UndefinedOptionFlag, MagickFalse }, + { "Stereo", StereoCompositeOp, UndefinedOptionFlag, MagickFalse }, { "VividLight", VividLightCompositeOp, UndefinedOptionFlag, MagickFalse }, { "Xor", XorCompositeOp, UndefinedOptionFlag, MagickFalse }, { "Divide", DivideDstCompositeOp, DeprecateOptionFlag, MagickTrue }, -- 2.40.0