Skip to content

Commit c73ab69

Browse files
johnhaddonjohnhaddon
authored
Merge pull request #1348 from danieldresser-ie/imath3Ifdefs
ifdefs for Imath3
2 parents 6715172 + 62d3b71 commit c73ab69

File tree

110 files changed

+640
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+640
-0
lines changed

‎contrib/IECoreAppleseed/include/IECoreAppleseed/TransformAlgo.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,12 @@
4040
#include "IECore/Export.h"
4141

4242
IECORE_PUSH_DEFAULT_VISIBILITY
43+
#include "OpenEXR/OpenEXRConfig.h"
44+
#if OPENEXR_VERSION_MAJOR < 3
4345
#include "OpenEXR/ImathMatrix.h"
46+
#else
47+
#include "Imath/ImathMatrix.h"
48+
#endif
4449
IECORE_POP_DEFAULT_VISIBILITY
4550

4651
#include "renderer/api/utility.h"

‎contrib/IECoreAppleseed/src/IECoreAppleseed/ColorAlgo.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@
3939
#include "IECore/Export.h"
4040

4141
IECORE_PUSH_DEFAULT_VISIBILITY
42+
#include "OpenEXR/OpenEXRConfig.h"
43+
#if OPENEXR_VERSION_MAJOR < 3
4244
#include "OpenEXR/ImathColor.h"
45+
#else
46+
#include "Imath/ImathColor.h"
47+
#endif
4348
IECORE_POP_DEFAULT_VISIBILITY
4449

4550
#include "boost/lexical_cast.hpp"

‎contrib/IECoreUSD/include/IECoreUSD/TypeTraits.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,20 @@ IECORE_PUSH_DEFAULT_VISIBILITY
4444
#include "pxr/base/vt/value.h"
4545
IECORE_POP_DEFAULT_VISIBILITY
4646

47+
#include "OpenEXR/OpenEXRConfig.h"
48+
#if OPENEXR_VERSION_MAJOR < 3
4749
#include "OpenEXR/half.h"
4850
#include "OpenEXR/ImathColor.h"
4951
#include "OpenEXR/ImathMatrix.h"
5052
#include "OpenEXR/ImathQuat.h"
5153
#include "OpenEXR/ImathVec.h"
54+
#else
55+
#include "Imath/half.h"
56+
#include "Imath/ImathColor.h"
57+
#include "Imath/ImathMatrix.h"
58+
#include "Imath/ImathQuat.h"
59+
#include "Imath/ImathVec.h"
60+
#endif
5261

5362
namespace IECoreUSD
5463
{

‎include/IECore/BezierAlgo.inl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@
3737

3838
#include "IECore/LineSegment.h"
3939

40+
#include "OpenEXR/OpenEXRConfig.h"
41+
#if OPENEXR_VERSION_MAJOR < 3
4042
#include "OpenEXR/ImathFun.h"
43+
#else
44+
#include "Imath/ImathFun.h"
45+
#endif
4146

4247
namespace IECore
4348
{

‎include/IECore/BoundedKDTree.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@
3939
#include "IECore/Export.h"
4040

4141
IECORE_PUSH_DEFAULT_VISIBILITY
42+
#include "OpenEXR/OpenEXRConfig.h"
43+
#if OPENEXR_VERSION_MAJOR < 3
4244
#include "OpenEXR/ImathBox.h"
45+
#else
46+
#include "Imath/ImathBox.h"
47+
#endif
4348
IECORE_POP_DEFAULT_VISIBILITY
4449

4550
#include <vector>

‎include/IECore/BoxAlgo.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@
4242
#include "IECore/Export.h"
4343

4444
IECORE_PUSH_DEFAULT_VISIBILITY
45+
#include "OpenEXR/OpenEXRConfig.h"
46+
#if OPENEXR_VERSION_MAJOR < 3
4547
#include "OpenEXR/ImathBox.h"
48+
#else
49+
#include "Imath/ImathBox.h"
50+
#endif
4651
IECORE_POP_DEFAULT_VISIBILITY
4752

4853
#include <iostream>

‎include/IECore/BoxInterpolator.inl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@
3535
#include "IECore/Export.h"
3636

3737
IECORE_PUSH_DEFAULT_VISIBILITY
38+
#include "OpenEXR/OpenEXRConfig.h"
39+
#if OPENEXR_VERSION_MAJOR < 3
3840
#include "OpenEXR/ImathBox.h"
41+
#else
42+
#include "Imath/ImathBox.h"
43+
#endif
3944
IECORE_POP_DEFAULT_VISIBILITY
4045

4146
namespace IECore

‎include/IECore/BoxTraits.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,19 @@
3939
#include "IECore/VectorTraits.h"
4040

4141
IECORE_PUSH_DEFAULT_VISIBILITY
42+
#include "OpenEXR/OpenEXRConfig.h"
43+
#if OPENEXR_VERSION_MAJOR < 3
4244
#include "OpenEXR/ImathBox.h"
45+
#else
46+
#include "Imath/ImathBox.h"
47+
#endif
4348
IECORE_POP_DEFAULT_VISIBILITY
4449

50+
#if OPENEXR_VERSION_MAJOR < 3
4551
#include "OpenEXR/ImathBoxAlgo.h"
52+
#else
53+
#include "Imath/ImathBoxAlgo.h"
54+
#endif
4655

4756
#include "boost/static_assert.hpp"
4857

‎include/IECore/CubicBasis.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@
3838
#include "IECore/Export.h"
3939

4040
IECORE_PUSH_DEFAULT_VISIBILITY
41+
#include "OpenEXR/OpenEXRConfig.h"
42+
#if OPENEXR_VERSION_MAJOR < 3
4143
#include "OpenEXR/ImathMatrix.h"
44+
#else
45+
#include "Imath/ImathMatrix.h"
46+
#endif
4247
IECORE_POP_DEFAULT_VISIBILITY
4348

4449
namespace IECore

‎include/IECore/DimensionTraits.inl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,16 @@
4040
#include "IECore/TypeTraits.h"
4141

4242
IECORE_PUSH_DEFAULT_VISIBILITY
43+
#include "OpenEXR/OpenEXRConfig.h"
44+
#if OPENEXR_VERSION_MAJOR < 3
4345
#include "OpenEXR/ImathBox.h"
4446
#include "OpenEXR/ImathPlane.h"
4547
#include "OpenEXR/ImathVec.h"
48+
#else
49+
#include "Imath/ImathBox.h"
50+
#include "Imath/ImathPlane.h"
51+
#include "Imath/ImathVec.h"
52+
#endif
4653
IECORE_POP_DEFAULT_VISIBILITY
4754

4855
#include "boost/static_assert.hpp"

0 commit comments

Comments
 (0)