(no commit message)

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 0642ba58334810fcf609217a03fceca37a25dd45..36f49e0aad105ad725bed629e4a627ad5e395a2e 100644 (file)
--- 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 892f4d5bcfe74a343cf4890f885030d3f419a5ec..86e7fe64bcbabf6ad1a8b98e3b486516bddbfc78 100644 (file)
--- 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 fa98fd0cb93b943574d131694124ff21af859822..2a390cfb51894fd4177fb83361ee17eac7719963 100644 (file)
--- 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 127d8cc1d28eded868d3108dcd15c011655ef117..74cefc0683f3463d66e390867e29a36f34c60fd1 100644 (file)
--- 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],