From 3030de0c79535f44c0b205b47452d68510ac3955 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Fri, 19 Apr 2024 15:46:53 -0700 Subject: [PATCH] Drop support for OpenEXR 2 --- SConstruct | 29 +------------------ .../IECoreUSD/include/IECoreUSD/TypeTraits.h | 9 ------ include/IECore/BezierAlgo.inl | 5 ---- include/IECore/BoundedKDTree.h | 5 ---- include/IECore/BoxAlgo.h | 5 ---- include/IECore/BoxInterpolator.inl | 5 ---- include/IECore/BoxTraits.h | 9 ------ include/IECore/CubicBasis.h | 5 ---- include/IECore/DimensionTraits.inl | 7 ----- include/IECore/HalfTypeTraits.h | 5 ---- include/IECore/IFFFile.h | 5 ---- include/IECore/ImathHash.h | 10 ------- include/IECore/ImathRandAdapter.h | 5 ---- include/IECore/IndexedIO.h | 5 ---- include/IECore/KDTree.h | 5 ---- include/IECore/LineSegment.h | 6 ---- include/IECore/LineSegment.inl | 5 ---- include/IECore/Lookup.h | 5 ---- include/IECore/Lookup.inl | 5 ---- include/IECore/MatrixAlgo.h | 5 ---- include/IECore/MatrixInterpolator.inl | 10 ------- include/IECore/MatrixTraits.h | 5 ---- include/IECore/MurmurHash.inl | 10 ------- include/IECore/NumericParameter.h | 5 ---- include/IECore/PointDistribution.h | 6 ---- include/IECore/PolygonAlgo.h | 5 ---- include/IECore/PolygonAlgo.inl | 5 ---- include/IECore/QuatAlgo.h | 6 ---- include/IECore/QuatInterpolator.inl | 5 ---- include/IECore/RandomAlgo.h | 5 ---- include/IECore/RandomAlgo.inl | 5 ---- include/IECore/RandomRotationOp.inl | 9 ------ include/IECore/SimpleTypedData.h | 10 ------- .../IECore/SphericalToEuclideanTransform.inl | 6 ---- include/IECore/Spline.h | 5 ---- include/IECore/Spline.inl | 5 ---- include/IECore/TransformationMatrix.h | 8 ----- include/IECore/TriangleAlgo.h | 5 ---- include/IECore/TriangleAlgo.inl | 5 ---- include/IECore/VecAlgo.h | 5 ---- include/IECore/VectorTypedData.h | 9 ------ include/IECoreGL/Camera.h | 6 ---- include/IECoreGL/GL.h | 6 ---- include/IECoreGL/Group.h | 5 ---- include/IECoreGL/NumericTraits.h | 5 ---- include/IECoreGL/Primitive.h | 5 ---- include/IECoreGL/Renderable.h | 5 ---- include/IECoreGL/Selector.h | 6 ---- include/IECoreGL/TypedStateComponent.h | 6 ---- .../IECoreGL/private/RendererImplementation.h | 5 ---- include/IECoreHoudini/Convert.h | 10 ------- include/IECoreImage/DisplayDriver.h | 5 ---- include/IECoreImage/Font.h | 6 ---- include/IECoreImage/ImagePrimitive.inl | 5 ---- include/IECoreMaya/Convert.h | 10 ------- include/IECoreMaya/NumericTraits.h | 6 ---- include/IECoreMaya/SceneShapeInterface.h | 5 ---- ...ceneShapeInterfaceComponentBoundIterator.h | 5 ---- include/IECoreNuke/Box3ParameterHandler.h | 5 ---- include/IECoreNuke/Color3fParameterHandler.h | 5 ---- include/IECoreNuke/Convert.h | 8 ----- include/IECoreNuke/CurveLookup.inl | 5 ---- include/IECoreNuke/DrawableHolder.h | 5 ---- include/IECoreNuke/Hash.h | 8 ----- include/IECoreNuke/SceneCacheReader.h | 5 ---- include/IECoreNuke/Warp.h | 5 ---- include/IECoreScene/Font.h | 6 ---- include/IECoreScene/OBJReader.h | 5 ---- include/IECoreScene/ParticleReader.inl | 5 ---- include/IECoreScene/PrimitiveEvaluator.h | 6 ---- include/IECoreScene/Renderer.h | 6 ---- include/IECoreScene/SceneInterface.h | 6 ---- include/IECoreScene/Transform.h | 5 ---- include/IECoreScene/VisibleRenderable.h | 5 ---- include/IECoreScene/private/TransformStack.h | 5 ---- include/IECoreVDB/VDBObject.h | 5 ---- src/IECore/PointDistribution.cpp | 5 ---- src/IECoreGL/Camera.cpp | 5 ---- src/IECoreGL/CurvesPrimitive.cpp | 7 ----- src/IECoreGL/Group.cpp | 5 ---- src/IECoreGL/MeshPrimitive.cpp | 5 ---- src/IECoreGL/PointsPrimitive.cpp | 6 ---- src/IECoreGL/Renderer.cpp | 5 ---- src/IECoreGL/SpherePrimitive.cpp | 5 ---- src/IECoreHoudini/LiveScene.cpp | 6 ---- src/IECoreHoudini/SOP_SceneCacheSource.cpp | 7 +---- .../ImagePrimitiveBinding.cpp | 5 ---- src/IECoreMaya/FromMayaImageConverter.cpp | 5 ---- src/IECoreMaya/FromMayaLocatorConverter.cpp | 7 +---- src/IECoreMaya/LiveScene.cpp | 5 ---- src/IECoreMaya/SceneShapeInterface.cpp | 6 ---- src/IECoreMaya/ToMayaLocatorConverter.cpp | 6 +--- src/IECoreNuke/LiveScene.cpp | 11 ++----- src/IECorePython/AngleConversionBinding.cpp | 5 ---- src/IECorePython/HalfBinding.cpp | 5 ---- src/IECorePython/HenyeyGreensteinBinding.cpp | 5 ---- src/IECorePython/IECoreBinding.cpp | 10 ------- src/IECorePython/VectorTypedDataBinding.cpp | 7 ----- src/IECorePythonModule/IECore.cpp | 5 ---- src/IECoreScene/CurveExtrudeOp.cpp | 5 ---- src/IECoreScene/CurvesPrimitiveEvaluator.cpp | 5 ---- src/IECoreScene/Group.cpp | 5 ---- src/IECoreScene/MatrixMotionTransform.cpp | 5 ---- src/IECoreScene/MeshPrimitiveEvaluator.cpp | 10 ------- src/IECoreScene/NParticleReader.cpp | 5 ---- src/IECoreScene/SceneCache.cpp | 7 +---- src/IECoreScene/SpherePrimitiveEvaluator.cpp | 6 ---- src/IECoreScene/TransformStack.cpp | 5 ---- .../CurvesPrimitiveEvaluatorBinding.cpp | 5 ---- test/IECore/CompilerTest.h | 7 ----- test/IECore/IECoreTest.cpp | 5 ---- test/IECore/InternedStringTest.cpp | 5 ---- test/IECore/InterpolatorTest.h | 7 ----- test/IECore/KDTreeTest.h | 6 ---- test/IECore/LevenbergMarquardtTest.h | 6 ---- test/IECore/ParameterThreadingTest.cpp | 5 ---- test/IECore/SpaceTransformTest.h | 6 ---- test/IECore/SweepAndPruneTest.h | 6 ---- test/IECore/TypedDataTest.h | 4 --- 119 files changed, 8 insertions(+), 720 deletions(-) diff --git a/SConstruct b/SConstruct index 5bbac87593..b4cee075f0 100644 --- a/SConstruct +++ b/SConstruct @@ -1301,23 +1301,6 @@ if doConfigure : sys.stderr.write( "ERROR : unable to determine boost version from \"%s\".\n" % boostVersionHeader ) Exit( 1 ) - # Figure out the OpenEXR version - - exrVersionHeader = env.FindFile( "OpenEXR/OpenEXRConfig.h", dependencyIncludes ) - if exrVersionHeader is None : - sys.stderr.write( "ERROR : unable to find `OpenEXR/OpenEXRConfig.h`, check OPENEXR_INCLUDE_PATH.\n" ) - Exit( 1 ) - - exrMajorVersion = None - for line in open( str( exrVersionHeader ) ) : - m = re.match( r'^#define OPENEXR_VERSION_STRING "(\d)\.(\d)\.(\d+)"$', line ) - if m : - exrMajorVersion = int( m.group( 1 ) ) - - if exrMajorVersion is None : - sys.stderr.write( "ERROR : unable to determine OpenEXR version from \"{}\".\n".format( exrVersionHeader ) ) - Exit( 1 ) - env.Append( LIBS = [ "boost_filesystem" + env["BOOST_LIB_SUFFIX"], "boost_regex" + env["BOOST_LIB_SUFFIX"], @@ -1357,23 +1340,13 @@ if doConfigure : c.Finish() -if exrMajorVersion >= 3 : - env.Append( LIBS = [ "OpenEXR" + env["OPENEXR_LIB_SUFFIX"] ] ) -else : - env.Append( - LIBS = [ - "IlmImf" + env["OPENEXR_LIB_SUFFIX"], - # Windows OpenEXR adds version numbers to all libraries except Half. - "Half" + ( env["OPENEXR_LIB_SUFFIX"] if env["PLATFORM"] != "win32" else "" ) - ] - ) - env.Append( LIBS = [ "tbb" + env["TBB_LIB_SUFFIX"], "blosc" + env["BLOSC_LIB_SUFFIX"], "Iex" + env["OPENEXR_LIB_SUFFIX"], "Imath" + env["OPENEXR_LIB_SUFFIX"], "IlmThread" + env["OPENEXR_LIB_SUFFIX"], + "OpenEXR" + env["OPENEXR_LIB_SUFFIX"], # Link Windows zlib against static library to avoid potential conflicts # with system provided version. "z" if env["PLATFORM"] != "win32" else "zlibstatic" diff --git a/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h b/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h index b781b3179c..b3f6ac609c 100644 --- a/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h +++ b/contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h @@ -44,20 +44,11 @@ IECORE_PUSH_DEFAULT_VISIBILITY #include "pxr/base/vt/value.h" IECORE_POP_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/half.h" #include "Imath/ImathColor.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" -#endif namespace IECoreUSD { diff --git a/include/IECore/BezierAlgo.inl b/include/IECore/BezierAlgo.inl index 808e1c601a..6ed008873e 100644 --- a/include/IECore/BezierAlgo.inl +++ b/include/IECore/BezierAlgo.inl @@ -37,12 +37,7 @@ #include "IECore/LineSegment.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif namespace IECore { diff --git a/include/IECore/BoundedKDTree.h b/include/IECore/BoundedKDTree.h index a0a5f62374..f7ab3bbe38 100644 --- a/include/IECore/BoundedKDTree.h +++ b/include/IECore/BoundedKDTree.h @@ -39,12 +39,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/BoxAlgo.h b/include/IECore/BoxAlgo.h index 7894629d04..dee3d70aaf 100644 --- a/include/IECore/BoxAlgo.h +++ b/include/IECore/BoxAlgo.h @@ -42,12 +42,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/BoxInterpolator.inl b/include/IECore/BoxInterpolator.inl index 134c0de567..ec194d9011 100644 --- a/include/IECore/BoxInterpolator.inl +++ b/include/IECore/BoxInterpolator.inl @@ -35,12 +35,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/BoxTraits.h b/include/IECore/BoxTraits.h index 7ac987e304..a1653bd7f5 100644 --- a/include/IECore/BoxTraits.h +++ b/include/IECore/BoxTraits.h @@ -39,19 +39,10 @@ #include "IECore/VectorTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif #include "boost/static_assert.hpp" diff --git a/include/IECore/CubicBasis.h b/include/IECore/CubicBasis.h index ef42065e28..be71c6ddba 100644 --- a/include/IECore/CubicBasis.h +++ b/include/IECore/CubicBasis.h @@ -38,12 +38,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/DimensionTraits.inl b/include/IECore/DimensionTraits.inl index a229415650..f4622a8005 100644 --- a/include/IECore/DimensionTraits.inl +++ b/include/IECore/DimensionTraits.inl @@ -40,16 +40,9 @@ #include "IECore/TypeTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathPlane.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathPlane.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "boost/static_assert.hpp" diff --git a/include/IECore/HalfTypeTraits.h b/include/IECore/HalfTypeTraits.h index 553705eb33..996ba87734 100644 --- a/include/IECore/HalfTypeTraits.h +++ b/include/IECore/HalfTypeTraits.h @@ -38,12 +38,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "boost/type_traits/is_arithmetic.hpp" diff --git a/include/IECore/IFFFile.h b/include/IECore/IFFFile.h index d3d29dd553..62a02de2d7 100644 --- a/include/IECore/IFFFile.h +++ b/include/IECore/IFFFile.h @@ -39,12 +39,7 @@ #include "IECore/RefCounted.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/ImathHash.h b/include/IECore/ImathHash.h index a117078239..f41bf2f010 100644 --- a/include/IECore/ImathHash.h +++ b/include/IECore/ImathHash.h @@ -36,22 +36,12 @@ #define IE_CORE_IMATHHASH_H IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/half.h" #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/ImathRandAdapter.h b/include/IECore/ImathRandAdapter.h index 971b821d78..dc82f0cc3c 100644 --- a/include/IECore/ImathRandAdapter.h +++ b/include/IECore/ImathRandAdapter.h @@ -35,12 +35,7 @@ #ifndef IE_CORE_IMATHRANDADAPTER_H #define IE_CORE_IMATHRANDADAPTER_H -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathRandom.h" -#else #include "Imath/ImathRandom.h" -#endif namespace IECore { diff --git a/include/IECore/IndexedIO.h b/include/IECore/IndexedIO.h index 9ff43306e5..98ebe8e053 100644 --- a/include/IECore/IndexedIO.h +++ b/include/IECore/IndexedIO.h @@ -40,12 +40,7 @@ #include "IECore/RunTimeTyped.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/KDTree.h b/include/IECore/KDTree.h index 4b272d3cad..a9969cc371 100644 --- a/include/IECore/KDTree.h +++ b/include/IECore/KDTree.h @@ -39,12 +39,7 @@ #include "IECore/VectorTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/LineSegment.h b/include/IECore/LineSegment.h index d5c55dafbc..c168706b5d 100644 --- a/include/IECore/LineSegment.h +++ b/include/IECore/LineSegment.h @@ -39,14 +39,8 @@ #include "IECore/VectorTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathPlane.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathPlane.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/LineSegment.inl b/include/IECore/LineSegment.inl index 824cbb4725..44dee24e13 100644 --- a/include/IECore/LineSegment.inl +++ b/include/IECore/LineSegment.inl @@ -35,12 +35,7 @@ #ifndef IECORE_LINESEGMENT_INL #define IECORE_LINESEGMENT_INL -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif namespace IECore { diff --git a/include/IECore/Lookup.h b/include/IECore/Lookup.h index 87af070f2a..d2eff30c7d 100644 --- a/include/IECore/Lookup.h +++ b/include/IECore/Lookup.h @@ -39,12 +39,7 @@ #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 "boost/function.hpp" diff --git a/include/IECore/Lookup.inl b/include/IECore/Lookup.inl index a8b0cf5098..b5764338fc 100644 --- a/include/IECore/Lookup.inl +++ b/include/IECore/Lookup.inl @@ -38,12 +38,7 @@ #include "IECore/FastFloat.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif namespace IECore { diff --git a/include/IECore/MatrixAlgo.h b/include/IECore/MatrixAlgo.h index 89f5d4d27c..74ed16d73d 100644 --- a/include/IECore/MatrixAlgo.h +++ b/include/IECore/MatrixAlgo.h @@ -43,12 +43,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/MatrixInterpolator.inl b/include/IECore/MatrixInterpolator.inl index 26dcd0ca8f..e58a8dd440 100644 --- a/include/IECore/MatrixInterpolator.inl +++ b/include/IECore/MatrixInterpolator.inl @@ -35,21 +35,11 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathMatrix.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrixAlgo.h" -#else #include "Imath/ImathMatrixAlgo.h" -#endif namespace IECore { diff --git a/include/IECore/MatrixTraits.h b/include/IECore/MatrixTraits.h index 9855e1b847..6591719845 100644 --- a/include/IECore/MatrixTraits.h +++ b/include/IECore/MatrixTraits.h @@ -38,12 +38,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/MurmurHash.inl b/include/IECore/MurmurHash.inl index 35581cf0bb..46d015efaa 100644 --- a/include/IECore/MurmurHash.inl +++ b/include/IECore/MurmurHash.inl @@ -38,22 +38,12 @@ #include "IECore/InternedString.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#include "OpenEXR/ImathEuler.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" #include "Imath/ImathEuler.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/NumericParameter.h b/include/IECore/NumericParameter.h index b08e1e5239..acfd5d0c71 100644 --- a/include/IECore/NumericParameter.h +++ b/include/IECore/NumericParameter.h @@ -38,12 +38,7 @@ #include "IECore/Parameter.h" #include "IECore/TypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif namespace IECore { diff --git a/include/IECore/PointDistribution.h b/include/IECore/PointDistribution.h index 0e5414d46a..ab713ab9aa 100644 --- a/include/IECore/PointDistribution.h +++ b/include/IECore/PointDistribution.h @@ -38,14 +38,8 @@ #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" -#else #include "Imath/ImathBox.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "boost/noncopyable.hpp" diff --git a/include/IECore/PolygonAlgo.h b/include/IECore/PolygonAlgo.h index 4ca2ccd80c..13460a37fc 100644 --- a/include/IECore/PolygonAlgo.h +++ b/include/IECore/PolygonAlgo.h @@ -42,12 +42,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/PolygonAlgo.inl b/include/IECore/PolygonAlgo.inl index e9ae073933..4519d121d6 100644 --- a/include/IECore/PolygonAlgo.inl +++ b/include/IECore/PolygonAlgo.inl @@ -37,12 +37,7 @@ #include "IECore/CircularIterator.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVecAlgo.h" -#else #include "Imath/ImathVecAlgo.h" -#endif namespace IECore { diff --git a/include/IECore/QuatAlgo.h b/include/IECore/QuatAlgo.h index 57aa1c1a3f..8d6e4521b4 100644 --- a/include/IECore/QuatAlgo.h +++ b/include/IECore/QuatAlgo.h @@ -42,14 +42,8 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathMath.h" -#else #include "Imath/ImathQuat.h" #include "Imath/ImathMath.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/QuatInterpolator.inl b/include/IECore/QuatInterpolator.inl index 4e4ee95f9b..28da875e9f 100644 --- a/include/IECore/QuatInterpolator.inl +++ b/include/IECore/QuatInterpolator.inl @@ -36,12 +36,7 @@ #include "IECore/QuatAlgo.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathQuat.h" -#else #include "Imath/ImathQuat.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/RandomAlgo.h b/include/IECore/RandomAlgo.h index daabf05943..8176cd5211 100644 --- a/include/IECore/RandomAlgo.h +++ b/include/IECore/RandomAlgo.h @@ -35,12 +35,7 @@ #ifndef IECORE_RANDOMALGO_H #define IECORE_RANDOMALGO_H -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathRandom.h" -#else #include "Imath/ImathRandom.h" -#endif namespace IECore { diff --git a/include/IECore/RandomAlgo.inl b/include/IECore/RandomAlgo.inl index 2a558b7096..72332aaa2d 100644 --- a/include/IECore/RandomAlgo.inl +++ b/include/IECore/RandomAlgo.inl @@ -38,12 +38,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/RandomRotationOp.inl b/include/IECore/RandomRotationOp.inl index 2b9148e924..5f59391f4d 100644 --- a/include/IECore/RandomRotationOp.inl +++ b/include/IECore/RandomRotationOp.inl @@ -39,19 +39,10 @@ #include "IECore/Math.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathQuat.h" -#else #include "Imath/ImathQuat.h" -#endif IECORE_POP_DEFAULT_VISIBILITY -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathRandom.h" -#else #include "Imath/ImathRandom.h" -#endif namespace IECore { diff --git a/include/IECore/SimpleTypedData.h b/include/IECore/SimpleTypedData.h index a2d02d7423..c8e0af8e3c 100644 --- a/include/IECore/SimpleTypedData.h +++ b/include/IECore/SimpleTypedData.h @@ -42,22 +42,12 @@ #include "IECore/TypedData.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#include "OpenEXR/half.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/SphericalToEuclideanTransform.inl b/include/IECore/SphericalToEuclideanTransform.inl index ff47a68dae..427ad712a4 100644 --- a/include/IECore/SphericalToEuclideanTransform.inl +++ b/include/IECore/SphericalToEuclideanTransform.inl @@ -39,14 +39,8 @@ #include "IECore/VectorTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathMatrix.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECore/Spline.h b/include/IECore/Spline.h index 0368e2440a..1900a9568d 100644 --- a/include/IECore/Spline.h +++ b/include/IECore/Spline.h @@ -40,12 +40,7 @@ #include "IECore/MurmurHash.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 "boost/numeric/interval.hpp" diff --git a/include/IECore/Spline.inl b/include/IECore/Spline.inl index 809eb3527e..af415ba8b2 100644 --- a/include/IECore/Spline.inl +++ b/include/IECore/Spline.inl @@ -37,12 +37,7 @@ #include "IECore/Exception.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif #include "boost/format.hpp" diff --git a/include/IECore/TransformationMatrix.h b/include/IECore/TransformationMatrix.h index 800a3d671c..d45fe730c5 100644 --- a/include/IECore/TransformationMatrix.h +++ b/include/IECore/TransformationMatrix.h @@ -39,18 +39,10 @@ #include "IECore/MurmurHash.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathEuler.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathEuler.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/TriangleAlgo.h b/include/IECore/TriangleAlgo.h index c044abd5e5..8b5a151d3a 100644 --- a/include/IECore/TriangleAlgo.h +++ b/include/IECore/TriangleAlgo.h @@ -43,12 +43,7 @@ #include "IECore/VectorTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECore diff --git a/include/IECore/TriangleAlgo.inl b/include/IECore/TriangleAlgo.inl index 6e3d411d53..73d19d545b 100644 --- a/include/IECore/TriangleAlgo.inl +++ b/include/IECore/TriangleAlgo.inl @@ -37,12 +37,7 @@ #include "IECore/VectorOps.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathLineAlgo.h" -#else #include "Imath/ImathLineAlgo.h" -#endif #include diff --git a/include/IECore/VecAlgo.h b/include/IECore/VecAlgo.h index 03b9a7ec34..4baa915232 100644 --- a/include/IECore/VecAlgo.h +++ b/include/IECore/VecAlgo.h @@ -42,12 +42,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY // Putting these operators in the Imath namespace so that the compiler can find them diff --git a/include/IECore/VectorTypedData.h b/include/IECore/VectorTypedData.h index ab6de7081b..5c82891b1f 100644 --- a/include/IECore/VectorTypedData.h +++ b/include/IECore/VectorTypedData.h @@ -40,20 +40,11 @@ #include "IECore/TypedData.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#include "OpenEXR/half.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreGL/Camera.h b/include/IECoreGL/Camera.h index c4faf49ea4..493f7afdbc 100644 --- a/include/IECoreGL/Camera.h +++ b/include/IECoreGL/Camera.h @@ -41,14 +41,8 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathMatrix.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreGL diff --git a/include/IECoreGL/GL.h b/include/IECoreGL/GL.h index 8891b8e0c7..195a9391db 100644 --- a/include/IECoreGL/GL.h +++ b/include/IECoreGL/GL.h @@ -44,14 +44,8 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathColor.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "GL/glew.h" diff --git a/include/IECoreGL/Group.h b/include/IECoreGL/Group.h index a9a69c8acb..9fb38e28e0 100644 --- a/include/IECoreGL/Group.h +++ b/include/IECoreGL/Group.h @@ -41,12 +41,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreGL/NumericTraits.h b/include/IECoreGL/NumericTraits.h index a419a68f76..9e1ccd51e7 100644 --- a/include/IECoreGL/NumericTraits.h +++ b/include/IECoreGL/NumericTraits.h @@ -41,12 +41,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreGL diff --git a/include/IECoreGL/Primitive.h b/include/IECoreGL/Primitive.h index 0c9a110e44..5d19ca00ce 100644 --- a/include/IECoreGL/Primitive.h +++ b/include/IECoreGL/Primitive.h @@ -48,12 +48,7 @@ #include "IECore/VectorTypedData.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreGL diff --git a/include/IECoreGL/Renderable.h b/include/IECoreGL/Renderable.h index 24f766868a..6e40cd7780 100644 --- a/include/IECoreGL/Renderable.h +++ b/include/IECoreGL/Renderable.h @@ -42,12 +42,7 @@ #include "IECore/RunTimeTyped.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreGL diff --git a/include/IECoreGL/Selector.h b/include/IECoreGL/Selector.h index 0deb96d6d4..0f6a8da03b 100644 --- a/include/IECoreGL/Selector.h +++ b/include/IECoreGL/Selector.h @@ -42,14 +42,8 @@ #include "IECore/RefCounted.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreGL/TypedStateComponent.h b/include/IECoreGL/TypedStateComponent.h index 0b7774c784..87a44e1098 100644 --- a/include/IECoreGL/TypedStateComponent.h +++ b/include/IECoreGL/TypedStateComponent.h @@ -42,14 +42,8 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreGL diff --git a/include/IECoreGL/private/RendererImplementation.h b/include/IECoreGL/private/RendererImplementation.h index 938c42ddef..f5d6b4ccd7 100644 --- a/include/IECoreGL/private/RendererImplementation.h +++ b/include/IECoreGL/private/RendererImplementation.h @@ -45,12 +45,7 @@ #include "IECore/RunTimeTyped.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreGL diff --git a/include/IECoreHoudini/Convert.h b/include/IECoreHoudini/Convert.h index 9e6014936b..06fa10f967 100644 --- a/include/IECoreHoudini/Convert.h +++ b/include/IECoreHoudini/Convert.h @@ -41,22 +41,12 @@ #include "IECore/Data.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathEuler.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathEuler.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "UT/UT_BoundingBox.h" diff --git a/include/IECoreImage/DisplayDriver.h b/include/IECoreImage/DisplayDriver.h index 8e55bbce3f..fa5e09702a 100644 --- a/include/IECoreImage/DisplayDriver.h +++ b/include/IECoreImage/DisplayDriver.h @@ -46,12 +46,7 @@ #include "IECore/RunTimeTyped.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "boost/function.hpp" diff --git a/include/IECoreImage/Font.h b/include/IECoreImage/Font.h index 654b1aed77..576ea4af65 100644 --- a/include/IECoreImage/Font.h +++ b/include/IECoreImage/Font.h @@ -42,14 +42,8 @@ #include "IECore/RunTimeTyped.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 namespace IECoreImage diff --git a/include/IECoreImage/ImagePrimitive.inl b/include/IECoreImage/ImagePrimitive.inl index da0937e8a9..46527262d5 100644 --- a/include/IECoreImage/ImagePrimitive.inl +++ b/include/IECoreImage/ImagePrimitive.inl @@ -40,12 +40,7 @@ #include "IECore/TypeTraits.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "boost/format.hpp" diff --git a/include/IECoreMaya/Convert.h b/include/IECoreMaya/Convert.h index a373b41101..5695de1b79 100644 --- a/include/IECoreMaya/Convert.h +++ b/include/IECoreMaya/Convert.h @@ -41,22 +41,12 @@ #include "IECore/Data.h" #include "IECore/TransformationMatrix.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathEuler.h" -#else #include "Imath/ImathVec.h" #include "Imath/ImathColor.h" #include "Imath/ImathBox.h" #include "Imath/ImathQuat.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathEuler.h" -#endif #include "maya/MString.h" #include "maya/MBoundingBox.h" diff --git a/include/IECoreMaya/NumericTraits.h b/include/IECoreMaya/NumericTraits.h index 79bc293872..799be3e6a6 100644 --- a/include/IECoreMaya/NumericTraits.h +++ b/include/IECoreMaya/NumericTraits.h @@ -38,14 +38,8 @@ #include "boost/static_assert.hpp" #include "maya/MFnNumericData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#include "OpenEXR/ImathColor.h" -#else #include "Imath/ImathVec.h" #include "Imath/ImathColor.h" -#endif namespace IECoreMaya { diff --git a/include/IECoreMaya/SceneShapeInterface.h b/include/IECoreMaya/SceneShapeInterface.h index 48ca79cd5f..b16a863fb6 100644 --- a/include/IECoreMaya/SceneShapeInterface.h +++ b/include/IECoreMaya/SceneShapeInterface.h @@ -40,12 +40,7 @@ #include "IECoreMaya/Export.h" #include -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif #include "IECoreGL/IECoreGL.h" #include "maya/MPxComponentShape.h" diff --git a/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h b/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h index ca35f0bc68..f82dcbad5a 100644 --- a/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h +++ b/include/IECoreMaya/SceneShapeInterfaceComponentBoundIterator.h @@ -40,12 +40,7 @@ #include "maya/MBoundingBox.h" #include "maya/MObjectArray.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif #include "IECoreMaya/SceneShapeInterface.h" diff --git a/include/IECoreNuke/Box3ParameterHandler.h b/include/IECoreNuke/Box3ParameterHandler.h index 3d7b5cda60..28dc055da1 100644 --- a/include/IECoreNuke/Box3ParameterHandler.h +++ b/include/IECoreNuke/Box3ParameterHandler.h @@ -37,12 +37,7 @@ #include "IECoreNuke/ParameterHandler.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif namespace IECoreNuke { diff --git a/include/IECoreNuke/Color3fParameterHandler.h b/include/IECoreNuke/Color3fParameterHandler.h index 2e6f7dc33d..f6d8fbbdfb 100644 --- a/include/IECoreNuke/Color3fParameterHandler.h +++ b/include/IECoreNuke/Color3fParameterHandler.h @@ -37,12 +37,7 @@ #include "IECoreNuke/ParameterHandler.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathColor.h" -#else #include "Imath/ImathColor.h" -#endif namespace IECoreNuke { diff --git a/include/IECoreNuke/Convert.h b/include/IECoreNuke/Convert.h index 8d375c262d..d1308a9219 100644 --- a/include/IECoreNuke/Convert.h +++ b/include/IECoreNuke/Convert.h @@ -47,18 +47,10 @@ #include "DDImage/Vector4.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY /// Specialising in the IECore namespace. This is OK because the Nuke types diff --git a/include/IECoreNuke/CurveLookup.inl b/include/IECoreNuke/CurveLookup.inl index 4b11ffd7a9..20c52f56dd 100644 --- a/include/IECoreNuke/CurveLookup.inl +++ b/include/IECoreNuke/CurveLookup.inl @@ -35,12 +35,7 @@ #ifndef IECORENUKE_CURVELOOKUP_INL #define IECORENUKE_CURVELOOKUP_INL -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif #include #include diff --git a/include/IECoreNuke/DrawableHolder.h b/include/IECoreNuke/DrawableHolder.h index 54c78f034a..cdfd4ed25d 100644 --- a/include/IECoreNuke/DrawableHolder.h +++ b/include/IECoreNuke/DrawableHolder.h @@ -42,12 +42,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreNuke diff --git a/include/IECoreNuke/Hash.h b/include/IECoreNuke/Hash.h index 553795d25c..553109c3f1 100644 --- a/include/IECoreNuke/Hash.h +++ b/include/IECoreNuke/Hash.h @@ -40,18 +40,10 @@ #include "DDImage/Hash.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreNuke diff --git a/include/IECoreNuke/SceneCacheReader.h b/include/IECoreNuke/SceneCacheReader.h index 2a04ea97be..68758dafb4 100644 --- a/include/IECoreNuke/SceneCacheReader.h +++ b/include/IECoreNuke/SceneCacheReader.h @@ -54,12 +54,7 @@ #include "DDImage/ViewerContext.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreNuke diff --git a/include/IECoreNuke/Warp.h b/include/IECoreNuke/Warp.h index 4bf482386e..3f22bee577 100644 --- a/include/IECoreNuke/Warp.h +++ b/include/IECoreNuke/Warp.h @@ -42,12 +42,7 @@ #include "DDImage/Iop.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreNuke diff --git a/include/IECoreScene/Font.h b/include/IECoreScene/Font.h index 7920cacf3c..e28477787a 100644 --- a/include/IECoreScene/Font.h +++ b/include/IECoreScene/Font.h @@ -42,14 +42,8 @@ #include "IECore/RunTimeTyped.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 namespace IECoreScene diff --git a/include/IECoreScene/OBJReader.h b/include/IECoreScene/OBJReader.h index d33f110dc1..a7436b138d 100644 --- a/include/IECoreScene/OBJReader.h +++ b/include/IECoreScene/OBJReader.h @@ -42,12 +42,7 @@ #include "IECore/Reader.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreScene/ParticleReader.inl b/include/IECoreScene/ParticleReader.inl index 6c9faae0b9..8524a64daf 100644 --- a/include/IECoreScene/ParticleReader.inl +++ b/include/IECoreScene/ParticleReader.inl @@ -38,12 +38,7 @@ #include "IECore/Convert.h" #include "IECore/MessageHandler.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathRandom.h" -#else #include "Imath/ImathRandom.h" -#endif namespace IECoreScene { diff --git a/include/IECoreScene/PrimitiveEvaluator.h b/include/IECoreScene/PrimitiveEvaluator.h index 9135eac543..4263d63430 100644 --- a/include/IECoreScene/PrimitiveEvaluator.h +++ b/include/IECoreScene/PrimitiveEvaluator.h @@ -42,14 +42,8 @@ #include "IECore/RunTimeTyped.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathColor.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreScene/Renderer.h b/include/IECoreScene/Renderer.h index ebb1e6a6a3..85a46526dc 100644 --- a/include/IECoreScene/Renderer.h +++ b/include/IECoreScene/Renderer.h @@ -47,14 +47,8 @@ #include "IECore/VectorTypedData.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreScene/SceneInterface.h b/include/IECoreScene/SceneInterface.h index 2cd57d0592..fbf0fbdf5c 100644 --- a/include/IECoreScene/SceneInterface.h +++ b/include/IECoreScene/SceneInterface.h @@ -46,14 +46,8 @@ #include "IECore/PathMatcher.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreScene diff --git a/include/IECoreScene/Transform.h b/include/IECoreScene/Transform.h index 0607f41336..31e53e2866 100644 --- a/include/IECoreScene/Transform.h +++ b/include/IECoreScene/Transform.h @@ -41,12 +41,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreScene diff --git a/include/IECoreScene/VisibleRenderable.h b/include/IECoreScene/VisibleRenderable.h index 6d8f9825dc..6e2dd82235 100644 --- a/include/IECoreScene/VisibleRenderable.h +++ b/include/IECoreScene/VisibleRenderable.h @@ -41,12 +41,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY namespace IECoreScene diff --git a/include/IECoreScene/private/TransformStack.h b/include/IECoreScene/private/TransformStack.h index 98237d21db..a0b2e6a84c 100644 --- a/include/IECoreScene/private/TransformStack.h +++ b/include/IECoreScene/private/TransformStack.h @@ -40,12 +40,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include diff --git a/include/IECoreVDB/VDBObject.h b/include/IECoreVDB/VDBObject.h index ea2f7eb650..699d03cf52 100644 --- a/include/IECoreVDB/VDBObject.h +++ b/include/IECoreVDB/VDBObject.h @@ -50,12 +50,7 @@ #include "openvdb/openvdb.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "tbb/recursive_mutex.h" diff --git a/src/IECore/PointDistribution.cpp b/src/IECore/PointDistribution.cpp index 4a5e0b5be6..88df562d5b 100644 --- a/src/IECore/PointDistribution.cpp +++ b/src/IECore/PointDistribution.cpp @@ -2,12 +2,7 @@ #include "IECore/Exception.h" #include "IECore/ImathRandAdapter.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathRandom.h" -#else #include "Imath/ImathRandom.h" -#endif #include #include diff --git a/src/IECoreGL/Camera.cpp b/src/IECoreGL/Camera.cpp index 3e037c384c..4a4a6e8f14 100644 --- a/src/IECoreGL/Camera.cpp +++ b/src/IECoreGL/Camera.cpp @@ -39,12 +39,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY using namespace IECoreGL; diff --git a/src/IECoreGL/CurvesPrimitive.cpp b/src/IECoreGL/CurvesPrimitive.cpp index 653320c975..4dff45653d 100644 --- a/src/IECoreGL/CurvesPrimitive.cpp +++ b/src/IECoreGL/CurvesPrimitive.cpp @@ -45,16 +45,9 @@ #include "IECore/MessageHandler.h" #include "IECore/SimpleTypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrixAlgo.h" -#include "OpenEXR/ImathVecAlgo.h" -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathMatrixAlgo.h" #include "Imath/ImathVecAlgo.h" #include "Imath/ImathFun.h" -#endif using namespace IECoreGL; using namespace Imath; diff --git a/src/IECoreGL/Group.cpp b/src/IECoreGL/Group.cpp index e6a517b2cb..4ec76432bd 100644 --- a/src/IECoreGL/Group.cpp +++ b/src/IECoreGL/Group.cpp @@ -37,12 +37,7 @@ #include "IECoreGL/GL.h" #include "IECoreGL/State.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif using namespace IECoreGL; using namespace Imath; diff --git a/src/IECoreGL/MeshPrimitive.cpp b/src/IECoreGL/MeshPrimitive.cpp index 23cd6c7317..f08d715f39 100644 --- a/src/IECoreGL/MeshPrimitive.cpp +++ b/src/IECoreGL/MeshPrimitive.cpp @@ -39,12 +39,7 @@ #include "IECore/DespatchTypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMath.h" -#else #include "Imath/ImathMath.h" -#endif #include diff --git a/src/IECoreGL/PointsPrimitive.cpp b/src/IECoreGL/PointsPrimitive.cpp index e06c6f3e1e..948e528bf5 100644 --- a/src/IECoreGL/PointsPrimitive.cpp +++ b/src/IECoreGL/PointsPrimitive.cpp @@ -49,14 +49,8 @@ #include "IECore/SimpleTypedData.h" #include "IECore/VectorTypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#include "OpenEXR/ImathMatrixAlgo.h" -#else #include "Imath/ImathFun.h" #include "Imath/ImathMatrixAlgo.h" -#endif using namespace IECoreGL; using namespace IECore; diff --git a/src/IECoreGL/Renderer.cpp b/src/IECoreGL/Renderer.cpp index c346fa7cee..7730e1b994 100644 --- a/src/IECoreGL/Renderer.cpp +++ b/src/IECoreGL/Renderer.cpp @@ -77,12 +77,7 @@ #include "IECore/SimpleTypedData.h" #include "IECore/SplineData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif #include #include diff --git a/src/IECoreGL/SpherePrimitive.cpp b/src/IECoreGL/SpherePrimitive.cpp index 864ea23b90..19baa1fc57 100644 --- a/src/IECoreGL/SpherePrimitive.cpp +++ b/src/IECoreGL/SpherePrimitive.cpp @@ -41,12 +41,7 @@ #include "IECore/Math.h" #include "IECore/MessageHandler.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif using namespace IECoreGL; using namespace Imath; diff --git a/src/IECoreHoudini/LiveScene.cpp b/src/IECoreHoudini/LiveScene.cpp index abeb1cd0a8..a27b551a1a 100644 --- a/src/IECoreHoudini/LiveScene.cpp +++ b/src/IECoreHoudini/LiveScene.cpp @@ -42,14 +42,8 @@ #include "IECore/TransformationMatrixData.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#include "OpenEXR/ImathMatrixAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" #include "Imath/ImathMatrixAlgo.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "MGR/MGR_Node.h" diff --git a/src/IECoreHoudini/SOP_SceneCacheSource.cpp b/src/IECoreHoudini/SOP_SceneCacheSource.cpp index a1ddaea385..37cffa7d21 100644 --- a/src/IECoreHoudini/SOP_SceneCacheSource.cpp +++ b/src/IECoreHoudini/SOP_SceneCacheSource.cpp @@ -50,12 +50,7 @@ #include "IECore/DespatchTypedData.h" #include "IECore/TypeTraits.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrixAlgo.h" -#else #include "Imath/ImathMatrixAlgo.h" -#endif #include "GA/GA_Names.h" #include "OP/OP_NodeInfoParms.h" @@ -412,7 +407,7 @@ void SOP_SceneCacheSource::loadObjects( const IECoreScene::SceneInterface *scene gdp->destroyPrimitives( primRange, true ); } } - + } if ( UT_String( currentPath ).multiMatch( params.shapeFilter ) && tagged( scene, params.tagFilter ) ) diff --git a/src/IECoreImageBindings/ImagePrimitiveBinding.cpp b/src/IECoreImageBindings/ImagePrimitiveBinding.cpp index 21e2555686..154bae85e3 100644 --- a/src/IECoreImageBindings/ImagePrimitiveBinding.cpp +++ b/src/IECoreImageBindings/ImagePrimitiveBinding.cpp @@ -34,12 +34,7 @@ #include "boost/python.hpp" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif #include "IECoreImage/ImagePrimitive.h" diff --git a/src/IECoreMaya/FromMayaImageConverter.cpp b/src/IECoreMaya/FromMayaImageConverter.cpp index 7ebc6b6482..edd124e551 100644 --- a/src/IECoreMaya/FromMayaImageConverter.cpp +++ b/src/IECoreMaya/FromMayaImageConverter.cpp @@ -46,12 +46,7 @@ #include "IECoreMaya/FromMayaImageConverter.h" #include "IECoreMaya/MImageAccessor.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#else #include "Imath/ImathBox.h" -#endif using namespace IECore; using namespace IECoreImage; diff --git a/src/IECoreMaya/FromMayaLocatorConverter.cpp b/src/IECoreMaya/FromMayaLocatorConverter.cpp index 8a1959df75..b93ee041ee 100644 --- a/src/IECoreMaya/FromMayaLocatorConverter.cpp +++ b/src/IECoreMaya/FromMayaLocatorConverter.cpp @@ -35,14 +35,9 @@ #include "IECoreMaya/FromMayaLocatorConverter.h" #include "IECoreMaya/Convert.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathVec.h" #include "Imath/ImathMatrix.h" -#endif + #include "IECoreScene/CoordinateSystem.h" #include "IECoreScene/MatrixTransform.h" diff --git a/src/IECoreMaya/LiveScene.cpp b/src/IECoreMaya/LiveScene.cpp index 4f747605bc..e7d5b8fd51 100644 --- a/src/IECoreMaya/LiveScene.cpp +++ b/src/IECoreMaya/LiveScene.cpp @@ -75,12 +75,7 @@ #include "maya/MFnSet.h" #include "maya/MFnInstancer.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif #include "boost/algorithm/string.hpp" #include "boost/tokenizer.hpp" diff --git a/src/IECoreMaya/SceneShapeInterface.cpp b/src/IECoreMaya/SceneShapeInterface.cpp index 9eb0a4b692..de619446ab 100644 --- a/src/IECoreMaya/SceneShapeInterface.cpp +++ b/src/IECoreMaya/SceneShapeInterface.cpp @@ -40,14 +40,8 @@ #include "boost/python.hpp" #include "boost/tokenizer.hpp" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrixAlgo.h" -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathMatrixAlgo.h" #include "Imath/ImathBoxAlgo.h" -#endif #include "IECoreGL/Renderer.h" #include "IECoreGL/Scene.h" diff --git a/src/IECoreMaya/ToMayaLocatorConverter.cpp b/src/IECoreMaya/ToMayaLocatorConverter.cpp index 2aa5bebd39..9c648ba960 100644 --- a/src/IECoreMaya/ToMayaLocatorConverter.cpp +++ b/src/IECoreMaya/ToMayaLocatorConverter.cpp @@ -39,12 +39,8 @@ #include "maya/MFnTransform.h" #include "maya/MPlug.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrixAlgo.h" -#else #include "Imath/ImathMatrixAlgo.h" -#endif + #include "IECore/AngleConversion.h" #include "IECore/MessageHandler.h" #include "IECore/SimpleTypedData.h" diff --git a/src/IECoreNuke/LiveScene.cpp b/src/IECoreNuke/LiveScene.cpp index cd455180b4..c2457e7fd1 100644 --- a/src/IECoreNuke/LiveScene.cpp +++ b/src/IECoreNuke/LiveScene.cpp @@ -46,12 +46,7 @@ #include "IECore/NullObject.h" #include "IECore/TransformationMatrixData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif #include "boost/algorithm/string.hpp" #include "boost/format.hpp" @@ -224,7 +219,7 @@ unsigned LiveScene::objectNum( const double* time) const auto jit = cachedGeometryListMap()[this].find( h ); if ( jit != cachedGeometryListMap()[this].end() ) { - + auto kit = cachedGeometryListMap()[this][h].find( frame ); if ( kit != cachedGeometryListMap()[this][h].end() ) { @@ -265,7 +260,7 @@ DD::Image::GeoInfo* LiveScene::object( const unsigned& index, const double* time auto jit = cachedGeometryListMap()[this].find( h ); if ( jit != cachedGeometryListMap()[this].end() ) { - + auto kit = cachedGeometryListMap()[this][h].find( frame ); if ( kit != cachedGeometryListMap()[this][h].end() ) { @@ -581,7 +576,7 @@ SceneInterfacePtr LiveScene::child( const Name &name, MissingBehaviour missingBe { IECoreScene::SceneInterface::NameList names; childNames( names ); - + if( find( names.cbegin(), names.cend(), name ) == names.cend() ) { switch ( missingBehaviour ) diff --git a/src/IECorePython/AngleConversionBinding.cpp b/src/IECorePython/AngleConversionBinding.cpp index 6e1e322df8..7c8e324465 100644 --- a/src/IECorePython/AngleConversionBinding.cpp +++ b/src/IECorePython/AngleConversionBinding.cpp @@ -42,12 +42,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY using namespace boost::python; diff --git a/src/IECorePython/HalfBinding.cpp b/src/IECorePython/HalfBinding.cpp index 6779b3072f..9010d2878e 100644 --- a/src/IECorePython/HalfBinding.cpp +++ b/src/IECorePython/HalfBinding.cpp @@ -39,12 +39,7 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/half.h" -#else #include "Imath/half.h" -#endif IECORE_POP_DEFAULT_VISIBILITY using namespace boost::python; diff --git a/src/IECorePython/HenyeyGreensteinBinding.cpp b/src/IECorePython/HenyeyGreensteinBinding.cpp index 0cddb4dcd1..70923f36ce 100644 --- a/src/IECorePython/HenyeyGreensteinBinding.cpp +++ b/src/IECorePython/HenyeyGreensteinBinding.cpp @@ -42,12 +42,7 @@ #include "IECore/HenyeyGreenstein.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY using namespace boost::python; diff --git a/src/IECorePython/IECoreBinding.cpp b/src/IECorePython/IECoreBinding.cpp index d0ee134754..4ce249fcbf 100644 --- a/src/IECorePython/IECoreBinding.cpp +++ b/src/IECorePython/IECoreBinding.cpp @@ -37,22 +37,12 @@ #include "IECore/Export.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathColor.h" -#include "OpenEXR/ImathEuler.h" -#include "OpenEXR/ImathMatrix.h" -#include "OpenEXR/ImathPlane.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathColor.h" #include "Imath/ImathEuler.h" #include "Imath/ImathMatrix.h" #include "Imath/ImathPlane.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY using namespace std; diff --git a/src/IECorePython/VectorTypedDataBinding.cpp b/src/IECorePython/VectorTypedDataBinding.cpp index 80ae73f658..848e9b1fe8 100644 --- a/src/IECorePython/VectorTypedDataBinding.cpp +++ b/src/IECorePython/VectorTypedDataBinding.cpp @@ -51,16 +51,9 @@ #include "IECore/VectorTypedData.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBox.h" -#include "OpenEXR/ImathQuat.h" -#include "OpenEXR/ImathVec.h" -#else #include "Imath/ImathBox.h" #include "Imath/ImathQuat.h" #include "Imath/ImathVec.h" -#endif IECORE_POP_DEFAULT_VISIBILITY #include "boost/numeric/conversion/cast.hpp" diff --git a/src/IECorePythonModule/IECore.cpp b/src/IECorePythonModule/IECore.cpp index 6c69deee6f..b2a2fd94d3 100644 --- a/src/IECorePythonModule/IECore.cpp +++ b/src/IECorePythonModule/IECore.cpp @@ -41,12 +41,7 @@ #include "TBBBinding.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathEuler.h" -#else #include "Imath/ImathEuler.h" -#endif #include "IECorePython/RefCountedBinding.h" #include "IECorePython/RunTimeTypedBinding.h" diff --git a/src/IECoreScene/CurveExtrudeOp.cpp b/src/IECoreScene/CurveExtrudeOp.cpp index 80f93470b7..439312b8a2 100644 --- a/src/IECoreScene/CurveExtrudeOp.cpp +++ b/src/IECoreScene/CurveExtrudeOp.cpp @@ -49,12 +49,7 @@ #include "IECore/TypedObjectParameter.h" #include "IECore/VectorTypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFrame.h" -#else #include "Imath/ImathFrame.h" -#endif #include #include diff --git a/src/IECoreScene/CurvesPrimitiveEvaluator.cpp b/src/IECoreScene/CurvesPrimitiveEvaluator.cpp index 9ea3f1716a..91148cdf2e 100644 --- a/src/IECoreScene/CurvesPrimitiveEvaluator.cpp +++ b/src/IECoreScene/CurvesPrimitiveEvaluator.cpp @@ -42,12 +42,7 @@ #include "IECore/SimpleTypedData.h" #include "IECore/VectorTypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif using namespace IECore; using namespace IECoreScene; diff --git a/src/IECoreScene/Group.cpp b/src/IECoreScene/Group.cpp index 72ede85a65..430fe73c97 100644 --- a/src/IECoreScene/Group.cpp +++ b/src/IECoreScene/Group.cpp @@ -40,12 +40,7 @@ #include "IECore/MurmurHash.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif #include "boost/format.hpp" #include "boost/lexical_cast.hpp" diff --git a/src/IECoreScene/MatrixMotionTransform.cpp b/src/IECoreScene/MatrixMotionTransform.cpp index acc4578c4b..82f381b61f 100644 --- a/src/IECoreScene/MatrixMotionTransform.cpp +++ b/src/IECoreScene/MatrixMotionTransform.cpp @@ -38,12 +38,7 @@ #include "IECore/MurmurHash.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif #include "boost/format.hpp" diff --git a/src/IECoreScene/MeshPrimitiveEvaluator.cpp b/src/IECoreScene/MeshPrimitiveEvaluator.cpp index 3c7aeca4f5..c575dd25a4 100644 --- a/src/IECoreScene/MeshPrimitiveEvaluator.cpp +++ b/src/IECoreScene/MeshPrimitiveEvaluator.cpp @@ -43,21 +43,11 @@ #include "IECore/TriangleAlgo.h" IECORE_PUSH_DEFAULT_VISIBILITY -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathMatrix.h" -#else #include "Imath/ImathMatrix.h" -#endif IECORE_POP_DEFAULT_VISIBILITY -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#include "OpenEXR/ImathLineAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" #include "Imath/ImathLineAlgo.h" -#endif #include diff --git a/src/IECoreScene/NParticleReader.cpp b/src/IECoreScene/NParticleReader.cpp index 38cbc74a41..6590218c06 100644 --- a/src/IECoreScene/NParticleReader.cpp +++ b/src/IECoreScene/NParticleReader.cpp @@ -42,12 +42,7 @@ #include "IECore/Timer.h" #include "IECore/VectorTypedData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathRandom.h" -#else #include "Imath/ImathRandom.h" -#endif #include "boost/algorithm/string/predicate.hpp" diff --git a/src/IECoreScene/SceneCache.cpp b/src/IECoreScene/SceneCache.cpp index 62df7164be..2c60296eb0 100644 --- a/src/IECoreScene/SceneCache.cpp +++ b/src/IECoreScene/SceneCache.cpp @@ -50,12 +50,7 @@ #include "IECore/TransformationMatrixData.h" #include "IECore/PathMatcherData.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" -#endif #include "boost/core/demangle.hpp" #include "boost/tuple/tuple.hpp" @@ -2187,7 +2182,7 @@ class SceneCache::WriterImplementation : public SceneCache::Implementation ) ); } - + WriterImplementation* m_parent; std::map< SceneCache::Name, WriterImplementationPtr > m_children; diff --git a/src/IECoreScene/SpherePrimitiveEvaluator.cpp b/src/IECoreScene/SpherePrimitiveEvaluator.cpp index 9ab8c90bdf..5d4bf06d9f 100644 --- a/src/IECoreScene/SpherePrimitiveEvaluator.cpp +++ b/src/IECoreScene/SpherePrimitiveEvaluator.cpp @@ -41,14 +41,8 @@ #include "IECore/SimpleTypedData.h" #include "IECore/TriangleAlgo.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathBoxAlgo.h" -#include "OpenEXR/ImathLineAlgo.h" -#else #include "Imath/ImathBoxAlgo.h" #include "Imath/ImathLineAlgo.h" -#endif #include diff --git a/src/IECoreScene/TransformStack.cpp b/src/IECoreScene/TransformStack.cpp index a6ed423fe6..f07b151321 100644 --- a/src/IECoreScene/TransformStack.cpp +++ b/src/IECoreScene/TransformStack.cpp @@ -39,12 +39,7 @@ #include "IECore/Exception.h" #include "IECore/Interpolator.h" -#include "OpenEXR/OpenEXRConfig.h" -#if OPENEXR_VERSION_MAJOR < 3 -#include "OpenEXR/ImathFun.h" -#else #include "Imath/ImathFun.h" -#endif using namespace Imath; using namespace IECore; diff --git a/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.cpp b/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.cpp index ceb7c26845..1ac58c5d4b 100644 --- a/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.cpp +++ b/src/IECoreScene/bindings/CurvesPrimitiveEvaluatorBinding.cpp @@ -42,12 +42,7 @@ #include "IECorePython/RefCountedBinding.h" #include "IECorePython/RunTimeTypedBinding.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/CompilerTest.h b/test/IECore/CompilerTest.h index 0a103f6709..998f731389 100644 --- a/test/IECore/CompilerTest.h +++ b/test/IECore/CompilerTest.h @@ -39,16 +39,9 @@ #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" -#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 diff --git a/test/IECore/IECoreTest.cpp b/test/IECore/IECoreTest.cpp index d02b17a50c..bd77eac4d5 100644 --- a/test/IECore/IECoreTest.cpp +++ b/test/IECore/IECoreTest.cpp @@ -35,12 +35,7 @@ #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 diff --git a/test/IECore/InternedStringTest.cpp b/test/IECore/InternedStringTest.cpp index 98455f351e..296ed884d3 100644 --- a/test/IECore/InternedStringTest.cpp +++ b/test/IECore/InternedStringTest.cpp @@ -36,12 +36,7 @@ #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 index 82d6390b0f..b25e50977e 100644 --- a/test/IECore/InterpolatorTest.h +++ b/test/IECore/InterpolatorTest.h @@ -39,16 +39,9 @@ #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 diff --git a/test/IECore/KDTreeTest.h b/test/IECore/KDTreeTest.h index 3dfa96cf15..0af7b5dff6 100644 --- a/test/IECore/KDTreeTest.h +++ b/test/IECore/KDTreeTest.h @@ -39,14 +39,8 @@ #include "IECore/KDTree.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 IECORE_PUSH_DEFAULT_VISIBILITY diff --git a/test/IECore/LevenbergMarquardtTest.h b/test/IECore/LevenbergMarquardtTest.h index 28f3aa671a..a901488730 100644 --- a/test/IECore/LevenbergMarquardtTest.h +++ b/test/IECore/LevenbergMarquardtTest.h @@ -39,14 +39,8 @@ #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 IECORE_PUSH_DEFAULT_VISIBILITY diff --git a/test/IECore/ParameterThreadingTest.cpp b/test/IECore/ParameterThreadingTest.cpp index 2a8d997438..492c9dcf99 100644 --- a/test/IECore/ParameterThreadingTest.cpp +++ b/test/IECore/ParameterThreadingTest.cpp @@ -42,12 +42,7 @@ #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 index 8ef1fc7a28..781019f62a 100644 --- a/test/IECore/SpaceTransformTest.h +++ b/test/IECore/SpaceTransformTest.h @@ -40,14 +40,8 @@ #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 diff --git a/test/IECore/SweepAndPruneTest.h b/test/IECore/SweepAndPruneTest.h index 9cb2e17398..c04effd774 100644 --- a/test/IECore/SweepAndPruneTest.h +++ b/test/IECore/SweepAndPruneTest.h @@ -43,14 +43,8 @@ #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 index 04b6f681b0..e2ba63b513 100644 --- a/test/IECore/TypedDataTest.h +++ b/test/IECore/TypedDataTest.h @@ -39,11 +39,7 @@ #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"