Build fixes.

ImageMagick · Sep 1, 2022 · 5ef57c3 · 5ef57c3
1 parent 8382a97
commit 5ef57c3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/magick/compare.c b/magick/compare.c
@@ -2186,10 +2186,6 @@ MagickExport Image *SimilarityMetricImage(Image *image,const Image *reference,
       if (metric == PeakSignalToNoiseRatioMetric) 
         similarity*=0.01;
       if ((metric == NormalizedCrossCorrelationErrorMetric) ||
-<<<<<<< HEAD
-          (metric == PeakSignalToNoiseRatioMetric) ||
-=======
->>>>>>> 4fc9a66d7 (properly handle a PSNR of 0 (undefined))
           (metric == UndefinedErrorMetric))
         similarity=1.0-similarity;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/wand/compare.c b/wand/compare.c
@@ -1245,13 +1245,12 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
                 QuantumRange*distortion,GetMagickPrecision(),distortion);
               break;
             }
-            case PeakSignalToNoiseRatioErrorMetric:
+            case PeakSignalToNoiseRatioMetric:
             {
               (void) FormatLocaleFile(stderr,"%.*g (%.*g)",GetMagickPrecision(),
                 distortion,GetMagickPrecision(),0.01*distortion);
               break;
             }
-            case PeakSignalToNoiseRatioErrorMetric:
             case AbsoluteErrorMetric:
             case NormalizedCrossCorrelationErrorMetric:
             case PerceptualHashErrorMetric: