Tests : Adapt for OpenEXR/Imath 3

johnhaddon · johnhaddon · commit f64c2930eb1f · 2023-07-24T12:08:58.000+01:00
diff --git a/test/IECore/CompilerTest.h b/test/IECore/CompilerTest.h
@@ -39,11 +39,17 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathBox.h"
 #include "OpenEXR/ImathVec.h"
-IECORE_POP_DEFAULT_VISIBILITY
-
 #include "OpenEXR/ImathLineAlgo.h"
+#else
+#include "Imath/ImathBox.h"
+#include "Imath/ImathVec.h"
+#include "Imath/ImathLineAlgo.h"
+#endif
+IECORE_POP_DEFAULT_VISIBILITY
 
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "boost/test/unit_test.hpp"
diff --git a/test/IECore/IECoreTest.cpp b/test/IECore/IECoreTest.cpp
@@ -35,7 +35,12 @@
 #include "IECore/Export.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathColor.h"
+#else
+#include "Imath/ImathColor.h"
+#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 #include <iostream>
diff --git a/test/IECore/InternedStringTest.cpp b/test/IECore/InternedStringTest.cpp
@@ -36,7 +36,12 @@
 
 #include "IECore/InternedString.h"
 
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathRandom.h"
+#else
+#include "Imath/ImathRandom.h"
+#endif
 
 #include "boost/lexical_cast.hpp"
 
diff --git a/test/IECore/InterpolatorTest.h b/test/IECore/InterpolatorTest.h
@@ -39,11 +39,18 @@
 #include "IECore/Interpolator.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathMatrix.h"
+#include "OpenEXR/ImathMatrixAlgo.h"
 #include "OpenEXR/ImathVec.h"
+#else
+#include "Imath/ImathMatrix.h"
+#include "Imath/ImathMatrixAlgo.h"
+#include "Imath/ImathVec.h"
+#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
-#include "OpenEXR/ImathMatrixAlgo.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "boost/test/unit_test.hpp"
diff --git a/test/IECore/KDTreeTest.h b/test/IECore/KDTreeTest.h
@@ -39,10 +39,15 @@
 #include "IECore/KDTree.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathVec.h"
-IECORE_POP_DEFAULT_VISIBILITY
-
 #include "OpenEXR/ImathRandom.h"
+#else
+#include "Imath/ImathVec.h"
+#include "Imath/ImathRandom.h"
+#endif
+IECORE_POP_DEFAULT_VISIBILITY
 
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "boost/test/unit_test.hpp"
diff --git a/test/IECore/LevenbergMarquardtTest.h b/test/IECore/LevenbergMarquardtTest.h
@@ -39,11 +39,16 @@
 #include "IECore/LevenbergMarquardt.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
+#include "OpenEXR/ImathRandom.h"
 #include "OpenEXR/ImathVec.h"
+#else
+#include "Imath/ImathRandom.h"
+#include "Imath/ImathVec.h"
+#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
-#include "OpenEXR/ImathRandom.h"
-
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "boost/test/unit_test.hpp"
 IECORE_POP_DEFAULT_VISIBILITY
diff --git a/test/IECore/LevenbergMarquardtTest.inl b/test/IECore/LevenbergMarquardtTest.inl
@@ -32,9 +32,6 @@
 //
 //////////////////////////////////////////////////////////////////////////
 
-#include "OpenEXR/ImathMath.h"
-#include "OpenEXR/ImathRandom.h"
-
 #include "boost/math/tools/rational.hpp"
 
 using namespace IECore;
@@ -62,7 +59,7 @@ class LevenbergMarquardtTestSimple<T>::Fn
 			for ( unsigned i = 1; i <= m_num; i ++ )
 			{
 				/// Distance between our guess and the real function
-				errors->writable()[i-1] = Imath::Math<T>::fabs(
+				errors->writable()[i-1] = std::abs(
 					parameters->readable()[i-1] -
 					i * i
 				);
@@ -149,7 +146,7 @@ class LevenbergMarquardtTestPolynomialFit<T>::Fn
 				T v2 = boost::math::tools::evaluate_polynomial<N, T, T>( m_coeffs, (T(i) / m_num - 0.5) * 10.0);
 
 				/// Distance between our guess and the real function
-				errors->writable()[i] = Imath::Math<T>::fabs( v1 - v2 );
+				errors->writable()[i] = std::abs( v1 - v2 );
 			}
 		}
 
diff --git a/test/IECore/ParameterThreadingTest.cpp b/test/IECore/ParameterThreadingTest.cpp
@@ -42,7 +42,12 @@
 #include "IECore/TypedObjectParameter.h"
 #include "IECore/VectorTypedParameter.h"
 
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathRandom.h"
+#else
+#include "Imath/ImathRandom.h"
+#endif
 
 #include "tbb/parallel_for.h"
 
diff --git a/test/IECore/SpaceTransformTest.h b/test/IECore/SpaceTransformTest.h
@@ -40,10 +40,16 @@
 #include "IECore/SphericalToEuclideanTransform.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathVec.h"
+#include "OpenEXR/ImathRandom.h"
+#else
+#include "Imath/ImathVec.h"
+#include "Imath/ImathRandom.h"
+#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
-#include "OpenEXR/ImathRandom.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "boost/test/unit_test.hpp"
diff --git a/test/IECore/SweepAndPruneTest.h b/test/IECore/SweepAndPruneTest.h
@@ -43,8 +43,14 @@
 #include "IECore/VectorTraits.h"
 
 IECORE_PUSH_DEFAULT_VISIBILITY
+#include "OpenEXR/OpenEXRConfig.h"
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathBox.h"
 #include "OpenEXR/ImathVec.h"
+#else
+#include "Imath/ImathBox.h"
+#include "Imath/ImathVec.h"
+#endif
 IECORE_POP_DEFAULT_VISIBILITY
 
 IECORE_PUSH_DEFAULT_VISIBILITY
diff --git a/test/IECore/TypedDataTest.h b/test/IECore/TypedDataTest.h
@@ -39,7 +39,11 @@
 #include "IECore/SimpleTypedData.h"
 #include "IECore/VectorTypedData.h"
 
+#if OPENEXR_VERSION_MAJOR < 3
 #include "OpenEXR/ImathRandom.h"
+#else
+#include "Imath/ImathRandom.h"
+#endif
 
 IECORE_PUSH_DEFAULT_VISIBILITY
 #include "boost/test/unit_test.hpp"
