From 5ef57c31ea701758fec69d240a1650405c468c38 Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Thu, 1 Sep 2022 10:14:46 +0200
Subject: [PATCH] Build fixes.

---
 magick/compare.c | 4 ----
 wand/compare.c   | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/magick/compare.c b/magick/compare.c
index 489b2d4780..ab523e4f4e 100644
--- 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
index 1c263b4b38..cfa0d09131 100644
--- 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: