Attachment #746781 for bug #820275




++ oiio-Release-2.2.18.0/src/field3d.imageio/field3d_pvt.h

#include <OpenImageIO/Imath.h>

#if OIIO_USING_IMATH >= 3
#    include <Imath-3/ImathBox.h>
#else
#    include <OpenEXR/ImathBox.h>
#endif
++ oiio-Release-2.2.18.0/src/include/OpenImageIO/Imath.h.in

#define OIIO_USING_IMATH @OIIO_USING_IMATH@

#if OIIO_USING_IMATH >= 3
#   include <Imath-3/ImathColor.h>
#   include <Imath-3/ImathMatrix.h>
#   include <Imath-3/ImathVec.h>
#   include <Imath-3/half.h>
#else
#   include <OpenEXR/ImathColor.h>
#   include <OpenEXR/ImathMatrix.h>
++ oiio-Release-2.2.18.0/src/libOpenImageIO/imagebufalgo_xform.cpp

#include <OpenImageIO/thread.h>

#if OIIO_USING_IMATH >= 3
#    include <Imath-3/ImathBox.h>
#else
#    include <OpenEXR/ImathBox.h>
#endif
++ oiio-Release-2.2.18.0/src/libutil/fmath_test.cpp

#include <OpenImageIO/unittest.h>

#if OIIO_USING_IMATH >= 3
#    include <Imath-3/ImathFun.h>
#else
#    include <OpenEXR/ImathFun.h>
#endif
++ oiio-Release-2.2.18.0/src/libutil/typedesc_test.cpp

#include <OpenImageIO/Imath.h>

#if OIIO_USING_IMATH >= 3
#    include <Imath-3/ImathBox.h>
#else
#    include <OpenEXR/ImathBox.h>
#endif

Return to bug 820275

Line Link Here

(-)file_not_specified_in_diff (-13 / +13 lines)
0	-- oiio-Release-2.2.18.0/src/field3d.imageio/field3d_pvt.h.orig	0	++ oiio-Release-2.2.18.0/src/field3d.imageio/field3d_pvt.h
Lines 8-14 Link Here
8	#include <OpenImageIO/Imath.h>	8	#include <OpenImageIO/Imath.h>
9		9
10	#if OIIO_USING_IMATH >= 3	10	#if OIIO_USING_IMATH >= 3
11	# include <Imath/ImathBox.h>	11	# include <Imath-3/ImathBox.h>
12	#else	12	#else
13	# include <OpenEXR/ImathBox.h>	13	# include <OpenEXR/ImathBox.h>
14	#endif	14	#endif
15	-- oiio-Release-2.2.18.0/src/include/OpenImageIO/Imath.h.in.orig	15	++ oiio-Release-2.2.18.0/src/include/OpenImageIO/Imath.h.in
Lines 13-22 Link Here
13	#define OIIO_USING_IMATH @OIIO_USING_IMATH@	13	#define OIIO_USING_IMATH @OIIO_USING_IMATH@
14		14
15	#if OIIO_USING_IMATH >= 3	15	#if OIIO_USING_IMATH >= 3
16	# include <Imath/ImathColor.h>	16	# include <Imath-3/ImathColor.h>
17	# include <Imath/ImathMatrix.h>	17	# include <Imath-3/ImathMatrix.h>
18	# include <Imath/ImathVec.h>	18	# include <Imath-3/ImathVec.h>
19	# include <Imath/half.h>	19	# include <Imath-3/half.h>
20	#else	20	#else
21	# include <OpenEXR/ImathColor.h>	21	# include <OpenEXR/ImathColor.h>
22	# include <OpenEXR/ImathMatrix.h>	22	# include <OpenEXR/ImathMatrix.h>
23	-- oiio-Release-2.2.18.0/src/libOpenImageIO/imagebufalgo_xform.cpp.orig	23	++ oiio-Release-2.2.18.0/src/libOpenImageIO/imagebufalgo_xform.cpp
Lines 18-24 Link Here
18	#include <OpenImageIO/thread.h>	18	#include <OpenImageIO/thread.h>
19		19
20	#if OIIO_USING_IMATH >= 3	20	#if OIIO_USING_IMATH >= 3
21	# include <Imath/ImathBox.h>	21	# include <Imath-3/ImathBox.h>
22	#else	22	#else
23	# include <OpenEXR/ImathBox.h>	23	# include <OpenEXR/ImathBox.h>
24	#endif	24	#endif
25	-- oiio-Release-2.2.18.0/src/libutil/fmath_test.cpp.orig	25	++ oiio-Release-2.2.18.0/src/libutil/fmath_test.cpp
Lines 18-24 Link Here
18	#include <OpenImageIO/unittest.h>	18	#include <OpenImageIO/unittest.h>
19		19
20	#if OIIO_USING_IMATH >= 3	20	#if OIIO_USING_IMATH >= 3
21	# include <Imath/ImathFun.h>	21	# include <Imath-3/ImathFun.h>
22	#else	22	#else
23	# include <OpenEXR/ImathFun.h>	23	# include <OpenEXR/ImathFun.h>
24	#endif	24	#endif
25	-- oiio-Release-2.2.18.0/src/libutil/typedesc_test.cpp.orig	25	++ oiio-Release-2.2.18.0/src/libutil/typedesc_test.cpp
Lines 9-15 Link Here
9	#include <OpenImageIO/Imath.h>	9	#include <OpenImageIO/Imath.h>
10		10
11	#if OIIO_USING_IMATH >= 3	11	#if OIIO_USING_IMATH >= 3
12	# include <Imath/ImathBox.h>	12	# include <Imath-3/ImathBox.h>
13	#else	13	#else
14	# include <OpenEXR/ImathBox.h>	14	# include <OpenEXR/ImathBox.h>
15	#endif	15	#endif