(no commit message)

[imagemagick] / MagickCore / compare.h

diff --git a/MagickCore/compare.h b/MagickCore/compare.h
index 50de712cf570a0021d8be343938a9fc617c6d6ae..86e7fe64bcbabf6ad1a8b98e3b486516bddbfc78 100644 (file)
--- a/MagickCore/compare.h
+++ b/MagickCore/compare.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -18,24 +18,25 @@
 #ifndef _MAGICKCORE_COMPARE_H
 #define _MAGICKCORE_COMPARE_H
 
+#include "MagickCore/image.h"
+
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include "MagickCore/image.h"
-
 typedef enum
 {
-  UndefinedMetric,
+  UndefinedErrorMetric,
   AbsoluteErrorMetric,
+  FuzzErrorMetric,
   MeanAbsoluteErrorMetric,
-  MeanErrorPerPixelMetric,
+  MeanErrorPerPixelErrorMetric,
   MeanSquaredErrorMetric,
-  PeakAbsoluteErrorMetric,
-  PeakSignalToNoiseRatioMetric,
-  RootMeanSquaredErrorMetric,
   NormalizedCrossCorrelationErrorMetric,
-  FuzzErrorMetric
+  PeakAbsoluteErrorMetric,
+  PeakSignalToNoiseRatioErrorMetric,
+  PerceptualHashErrorMetric,
+  RootMeanSquaredErrorMetric
 } MetricType;
 
 extern MagickExport double
@@ -44,8 +45,8 @@ extern MagickExport double
 extern MagickExport Image
   *CompareImages(Image *,const Image *,const MetricType,double *,
     ExceptionInfo *),
-  *SimilarityImage(Image *,const Image *,const MetricType,RectangleInfo *,
-    double *,ExceptionInfo *);
+  *SimilarityImage(Image *,const Image *,const MetricType,const double,
+    RectangleInfo *,double *,ExceptionInfo *);
 
 extern MagickExport MagickBooleanType
   GetImageDistortion(Image *,const Image *,const MetricType,double *,