From 03fa69fa6956ae6f59026ca3e7c1e47a3a871f80 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 8 Jan 2014 18:36:49 +0000 Subject: [PATCH] --- MagickCore/compare.c | 4 ++-- MagickCore/compare.h | 2 +- MagickCore/option.c | 2 +- MagickWand/compare.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 0642ba583..36f49e0aa 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -1179,7 +1179,7 @@ MagickExport MagickBooleanType GetImageDistortion(Image *image, channel_distortion,exception); break; } - case MeanErrorPerPixelMetric: + case MeanErrorPerPixelErrorMetric: { status=GetMeanErrorPerPixel(image,reconstruct_image,channel_distortion, exception); @@ -1321,7 +1321,7 @@ MagickExport double *GetImageDistortions(Image *image, channel_distortion,exception); break; } - case MeanErrorPerPixelMetric: + case MeanErrorPerPixelErrorMetric: { status=GetMeanErrorPerPixel(image,reconstruct_image,channel_distortion, exception); diff --git a/MagickCore/compare.h b/MagickCore/compare.h index 892f4d5bc..86e7fe64b 100644 --- a/MagickCore/compare.h +++ b/MagickCore/compare.h @@ -30,7 +30,7 @@ typedef enum AbsoluteErrorMetric, FuzzErrorMetric, MeanAbsoluteErrorMetric, - MeanErrorPerPixelMetric, + MeanErrorPerPixelErrorMetric, MeanSquaredErrorMetric, NormalizedCrossCorrelationErrorMetric, PeakAbsoluteErrorMetric, diff --git a/MagickCore/option.c b/MagickCore/option.c index fa98fd0cb..2a390cfb5 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -1348,7 +1348,7 @@ static const OptionInfo { "AE", AbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse }, { "Fuzz", FuzzErrorMetric, UndefinedOptionFlag, MagickFalse }, { "MAE", MeanAbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse }, - { "MEPP", MeanErrorPerPixelMetric, UndefinedOptionFlag, MagickFalse }, + { "MEPP", MeanErrorPerPixelErrorMetric, UndefinedOptionFlag, MagickFalse }, { "MSE", MeanSquaredErrorMetric, UndefinedOptionFlag, MagickFalse }, { "NCC", NormalizedCrossCorrelationErrorMetric, UndefinedOptionFlag, MagickFalse }, { "PAE", PeakAbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse }, diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 127d8cc1d..74cefc068 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -1048,7 +1048,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, difference_image->page.x,(double) difference_image->page.y); break; } - case MeanErrorPerPixelMetric: + case MeanErrorPerPixelErrorMetric: { (void) FormatLocaleFile(stderr,"%g (%g, %g)",distortion, image->error.normalized_mean_error, @@ -1191,7 +1191,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info, channel_distortion[MaxPixelChannels]); break; } - case MeanErrorPerPixelMetric: + case MeanErrorPerPixelErrorMetric: { (void) FormatLocaleFile(stderr," %g (%g, %g)\n", channel_distortion[MaxPixelChannels], -- 2.40.0