From 9ee911ca8bd048eb050184ee491f631f947a6a8d Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 28 Sep 2011 22:33:09 +0000 Subject: [PATCH] --- MagickCore/statistic.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 69290e674..b27368277 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -683,15 +683,33 @@ MagickExport Image *EvaluateImages(const Image *images, image_view=DestroyCacheView(image_view); next=GetNextImageInList(next); } - if (op == MeanEvaluateOperator) - for (x=0; x < (ssize_t) evaluate_image->columns; x++) + for (x=0; x < (ssize_t) evaluate_image->columns; x++) + { + register ssize_t + i; + + switch (op) { - register ssize_t - i; + case MeanEvaluateOperator: + { + for (i=0; i < (ssize_t) GetPixelChannels(evaluate_image); i++) + evaluate_pixel[x].channel[i]/=(MagickRealType) number_images; + break; + } + case MultiplyEvaluateOperator: + { + for (i=0; i < (ssize_t) GetPixelChannels(evaluate_image); i++) + { + register ssize_t + j; - for (i=0; i < (ssize_t) GetPixelChannels(evaluate_image); i++) - evaluate_pixel[x].channel[i]/=(MagickRealType) number_images; + for (j=0; j < (ssize_t) (number_images-1); j++) + evaluate_pixel[x].channel[i]*=QuantumScale; + } + break; + } } + } for (x=0; x < (ssize_t) evaluate_image->columns; x++) { register ssize_t -- 2.40.0