From f8dc9fdedbf5af21d700d6df1c4a27352806d054 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Wed, 5 Apr 2023 09:40:27 -0400
Subject: [PATCH] Undefine macro from HDRTools

---
 source/App/EncoderApp/EncAppCfg.h | 3 +++
 source/Lib/EncoderLib/EncCfg.h    | 3 +++
 source/Lib/EncoderLib/EncGOP.h    | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index ce088b4382..e0c04bb3f7 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -54,6 +54,9 @@ static inline std::istream& operator >> (std::istream &in, std::map<T1, T2> &map
 
 #if JVET_O0756_CALCULATE_HDRMETRICS
 #include "HDRLib/inc/DistortionMetric.H"
+#ifdef UNDEFINED
+#undef UNDEFINED
+#endif
 #endif
 namespace po = df::program_options_lite;
 
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index b8bfe7eef4..24270071f8 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -49,6 +49,9 @@
 
 #if JVET_O0756_CALCULATE_HDRMETRICS
 #include "HDRLib/inc/DistortionMetric.H"
+#ifdef UNDEFINED
+#undef UNDEFINED
+#endif
 #endif
 
 struct GOPEntry
diff --git a/source/Lib/EncoderLib/EncGOP.h b/source/Lib/EncoderLib/EncGOP.h
index 2d791af1d4..10def3589f 100644
--- a/source/Lib/EncoderLib/EncGOP.h
+++ b/source/Lib/EncoderLib/EncGOP.h
@@ -69,6 +69,9 @@
 #include "HDRLib/inc/ColorTransform.H"
 #include "HDRLib/inc/TransferFunction.H"
 #include "HDRLib/inc/DistortionMetricDeltaE.H"
+#ifdef UNDEFINED
+#undef UNDEFINED
+#endif
 #include <chrono>
 #endif
 
-- 
GitLab