From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 8 Jan 2014 18:34:48 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2938
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03d6f86164fadfa17c479863cc13de010bb38169;p=imagemagick

---

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 866499085..0642ba583 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -1101,6 +1101,13 @@ static MagickBooleanType GetPeakSignalToNoiseRatio(const Image *image,
   return(status);
 }
 
+static MagickBooleanType GetPerceptualHashDistortion(const Image *image,
+  const Image *reconstruct_image,double *distortion,ExceptionInfo *exception)
+{
+  *distortion=0.0;
+  return(MagickTrue);
+}
+
 static MagickBooleanType GetRootMeanSquaredDistortion(const Image *image,
   const Image *reconstruct_image,double *distortion,ExceptionInfo *exception)
 {
@@ -1197,12 +1204,18 @@ MagickExport MagickBooleanType GetImageDistortion(Image *image,
         channel_distortion,exception);
       break;
     }
-    case PeakSignalToNoiseRatioMetric:
+    case PeakSignalToNoiseRatioErrorMetric:
     {
       status=GetPeakSignalToNoiseRatio(image,reconstruct_image,
         channel_distortion,exception);
       break;
     }
+    case PerceptualHashErrorMetric:
+    {
+      status=GetPerceptualHashDistortion(image,reconstruct_image,
+        channel_distortion,exception);
+      break;
+    }
     case RootMeanSquaredErrorMetric:
     {
       status=GetRootMeanSquaredDistortion(image,reconstruct_image,
@@ -1333,12 +1346,18 @@ MagickExport double *GetImageDistortions(Image *image,
         channel_distortion,exception);
       break;
     }
-    case PeakSignalToNoiseRatioMetric:
+    case PeakSignalToNoiseRatioErrorMetric:
     {
       status=GetPeakSignalToNoiseRatio(image,reconstruct_image,
         channel_distortion,exception);
       break;
     }
+    case PerceptualHashErrorMetric:
+    {
+      status=GetRootMeanSquaredDistortion(image,reconstruct_image,
+        channel_distortion,exception);
+      break;
+    }
     case RootMeanSquaredErrorMetric:
     {
       status=GetRootMeanSquaredDistortion(image,reconstruct_image,
diff --git a/MagickCore/compare.h b/MagickCore/compare.h
index 7ca46f7a3..892f4d5bc 100644
--- a/MagickCore/compare.h
+++ b/MagickCore/compare.h
@@ -34,7 +34,7 @@ typedef enum
   MeanSquaredErrorMetric,
   NormalizedCrossCorrelationErrorMetric,
   PeakAbsoluteErrorMetric,
-  PeakSignalToNoiseRatioMetric,
+  PeakSignalToNoiseRatioErrorMetric,
   PerceptualHashErrorMetric,
   RootMeanSquaredErrorMetric
 } MetricType;
diff --git a/MagickCore/option.c b/MagickCore/option.c
index 58618fc57..fa98fd0cb 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1353,7 +1353,7 @@ static const OptionInfo
     { "NCC", NormalizedCrossCorrelationErrorMetric, UndefinedOptionFlag, MagickFalse },
     { "PAE", PeakAbsoluteErrorMetric, UndefinedOptionFlag, MagickFalse },
     { "PHASh", PerceptualHashErrorMetric, UndefinedOptionFlag, MagickFalse },
-    { "PSNR", PeakSignalToNoiseRatioMetric, UndefinedOptionFlag, MagickFalse },
+    { "PSNR", PeakSignalToNoiseRatioErrorMetric, UndefinedOptionFlag, MagickFalse },
     { "RMSE", RootMeanSquaredErrorMetric, UndefinedOptionFlag, MagickFalse },
     { (char *) NULL, UndefinedErrorMetric, UndefinedOptionFlag, MagickFalse }
   },
diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 0be139009..127d8cc1d 100644
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -1039,7 +1039,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             }
             case AbsoluteErrorMetric:
             case NormalizedCrossCorrelationErrorMetric:
-            case PeakSignalToNoiseRatioMetric:
+            case PeakSignalToNoiseRatioErrorMetric:
             {
               (void) FormatLocaleFile(stderr,"%g",distortion);
               if ((reconstruct_image->columns != image->columns) ||
@@ -1144,7 +1144,7 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
             }
             case AbsoluteErrorMetric:
             case NormalizedCrossCorrelationErrorMetric:
-            case PeakSignalToNoiseRatioMetric:
+            case PeakSignalToNoiseRatioErrorMetric:
             {
               switch (image->colorspace)
               {