Attachment #747156 for bug #820275




++ oiio-Release-2.2.18.0/src/dpx.imageio/dpxinput.cpp

#include <iomanip>
#include <memory>

#include <OpenEXR-3/ImfTimeCode.h>  //For TimeCode support

// Note: libdpx originally from: https://github.com/PatrickPalmer/dpx
// But that seems not to be actively maintained.
++ 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>
#    include <OpenEXR-3/ImfKeyCode.h>
#    include <OpenEXR-3/ImfTimeCode.h>
#else
#    include <OpenEXR/ImathBox.h>
#    include <OpenEXR/ImfKeyCode.h>
#    include <OpenEXR/ImfTimeCode.h>
#endif
#include <OpenEXR/ImfKeyCode.h>
#include <OpenEXR/ImfTimeCode.h>

#include <OpenImageIO/typedesc.h>
#include <OpenImageIO/unittest.h>
++ oiio-Release-2.2.18.0/src/oiiotool/oiiotool.cpp

#include <utility>
#include <vector>

#include <OpenEXR-3/ImfTimeCode.h>

#include <OpenImageIO/argparse.h>
#include <OpenImageIO/color.h>
++ oiio-Release-2.2.18.0/src/openexr.imageio/exrinput.cpp


#include <OpenImageIO/platform.h>

#include <OpenEXR-3/ImfChannelList.h>
#include <OpenEXR-3/ImfEnvmap.h>
#include <OpenEXR-3/ImfInputFile.h>
#include <OpenEXR-3/ImfTestFile.h>
#include <OpenEXR-3/ImfTiledInputFile.h>

#ifdef OPENEXR_VERSION_MAJOR
#    define OPENEXR_CODED_VERSION                                    \

#endif

#if OPENEXR_CODED_VERSION >= 20400 \
    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
#    define OPENEXR_HAS_FLOATVECTOR 1
#else
#    define OPENEXR_HAS_FLOATVECTOR 0

OIIO_PRAGMA_VISIBILITY_PUSH
OIIO_PRAGMA_WARNING_PUSH
OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
#include <OpenEXR-3/IexBaseExc.h>
#include <OpenEXR-3/IexThrowErrnoExc.h>
#include <OpenEXR-3/ImfBoxAttribute.h>
#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
#include <OpenEXR-3/ImfCompressionAttribute.h>
#include <OpenEXR-3/ImfDeepFrameBuffer.h>
#include <OpenEXR-3/ImfDeepScanLineInputPart.h>
#include <OpenEXR-3/ImfDeepTiledInputPart.h>
#include <OpenEXR-3/ImfDoubleAttribute.h>
#include <OpenEXR-3/ImfEnvmapAttribute.h>
#include <OpenEXR-3/ImfFloatAttribute.h>
#include <OpenEXR-3/ImfHeader.h>
#if OPENEXR_HAS_FLOATVECTOR
#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
#endif
#include <OpenEXR-3/ImfInputPart.h>
#include <OpenEXR-3/ImfIntAttribute.h>
#include <OpenEXR-3/ImfKeyCodeAttribute.h>
#include <OpenEXR-3/ImfMatrixAttribute.h>
#include <OpenEXR-3/ImfMultiPartInputFile.h>
#include <OpenEXR-3/ImfPartType.h>
#include <OpenEXR-3/ImfRationalAttribute.h>
#include <OpenEXR-3/ImfStringAttribute.h>
#include <OpenEXR-3/ImfStringVectorAttribute.h>
#include <OpenEXR-3/ImfTiledInputPart.h>
#include <OpenEXR-3/ImfTimeCodeAttribute.h>
#include <OpenEXR-3/ImfVecAttribute.h>
OIIO_PRAGMA_WARNING_POP
OIIO_PRAGMA_VISIBILITY_POP

#include <OpenEXR-3/ImfCRgbaFile.h>

#include "imageio_pvt.h"
#include <OpenImageIO/dassert.h>
++ oiio-Release-2.2.18.0/src/openexr.imageio/exroutput.cpp


#include <OpenImageIO/platform.h>

#include <OpenEXR-3/ImfChannelList.h>
#include <OpenEXR-3/ImfEnvmap.h>
#include <OpenEXR-3/ImfOutputFile.h>
#include <OpenEXR-3/ImfTiledOutputFile.h>

#ifdef OPENEXR_VERSION_MAJOR
#    define OPENEXR_CODED_VERSION                                    \

#endif

#if OPENEXR_CODED_VERSION >= 20400 \
    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
#    define OPENEXR_HAS_FLOATVECTOR 1
#else
#    define OPENEXR_HAS_FLOATVECTOR 0

OIIO_PRAGMA_VISIBILITY_PUSH
OIIO_PRAGMA_WARNING_PUSH
OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
#include <OpenEXR-3/IexBaseExc.h>
#include <OpenEXR-3/ImfBoxAttribute.h>
#include <OpenEXR-3/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
#include <OpenEXR-3/ImfCompressionAttribute.h>
#include <OpenEXR-3/ImfEnvmapAttribute.h>
#include <OpenEXR-3/ImfFloatAttribute.h>
#if OPENEXR_HAS_FLOATVECTOR
#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
#endif
#include <OpenEXR-3/ImfHeader.h>
#include <OpenEXR-3/ImfIntAttribute.h>
#include <OpenEXR-3/ImfKeyCodeAttribute.h>
#include <OpenEXR-3/ImfMatrixAttribute.h>
#include <OpenEXR-3/ImfRationalAttribute.h>
#include <OpenEXR-3/ImfStringAttribute.h>
#include <OpenEXR-3/ImfTimeCodeAttribute.h>
#include <OpenEXR-3/ImfVecAttribute.h>

#include <OpenEXR-3/ImfDeepFrameBuffer.h>
#include <OpenEXR-3/ImfDeepScanLineOutputPart.h>
#include <OpenEXR-3/ImfDeepTiledOutputPart.h>
#include <OpenEXR-3/ImfDoubleAttribute.h>
#include <OpenEXR-3/ImfMultiPartOutputFile.h>
#include <OpenEXR-3/ImfOutputPart.h>
#include <OpenEXR-3/ImfPartType.h>
#include <OpenEXR-3/ImfStringVectorAttribute.h>
#include <OpenEXR-3/ImfTiledOutputPart.h>
OIIO_PRAGMA_WARNING_POP
OIIO_PRAGMA_VISIBILITY_POP


Return to bug 820275

Line Link Here

(-)file_not_specified_in_diff (-84 / +86 lines)
0	-- oiio-Release-2.2.18.0/src/dpx.imageio/dpxinput.cpp.orig	0	++ oiio-Release-2.2.18.0/src/dpx.imageio/dpxinput.cpp
Lines 6-12 Link Here
6	#include <iomanip>	6	#include <iomanip>
7	#include <memory>	7	#include <memory>
8		8
9	#include <OpenEXR/ImfTimeCode.h> //For TimeCode support	9	#include <OpenEXR-3/ImfTimeCode.h> //For TimeCode support
10		10
11	// Note: libdpx originally from: https://github.com/PatrickPalmer/dpx	11	// Note: libdpx originally from: https://github.com/PatrickPalmer/dpx
12	// But that seems not to be actively maintained.	12	// But that seems not to be actively maintained.
13	-- oiio-Release-2.2.18.0/src/field3d.imageio/field3d_pvt.h.orig	13	++ 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-20 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	# include <OpenEXR-3/ImfKeyCode.h>
		14	# include <OpenEXR-3/ImfTimeCode.h>
13	#else	15	#else
14	# include <OpenEXR/ImathBox.h>	16	# include <OpenEXR/ImathBox.h>
		17	# include <OpenEXR/ImfKeyCode.h>
		18	# include <OpenEXR/ImfTimeCode.h>
15	#endif	19	#endif
16	#include <OpenEXR/ImfKeyCode.h>
17	#include <OpenEXR/ImfTimeCode.h>
18		20
19	#include <OpenImageIO/typedesc.h>	21	#include <OpenImageIO/typedesc.h>
20	#include <OpenImageIO/unittest.h>	22	#include <OpenImageIO/unittest.h>
21	-- oiio-Release-2.2.18.0/src/oiiotool/oiiotool.cpp.orig	23	++ oiio-Release-2.2.18.0/src/oiiotool/oiiotool.cpp
Lines 16-22 Link Here
16	#include <utility>	16	#include <utility>
17	#include <vector>	17	#include <vector>
18		18
19	#include <OpenEXR/ImfTimeCode.h>	19	#include <OpenEXR-3/ImfTimeCode.h>
20		20
21	#include <OpenImageIO/argparse.h>	21	#include <OpenImageIO/argparse.h>
22	#include <OpenImageIO/color.h>	22	#include <OpenImageIO/color.h>
23	-- oiio-Release-2.2.18.0/src/openexr.imageio/exrinput.cpp.orig	23	++ oiio-Release-2.2.18.0/src/openexr.imageio/exrinput.cpp
Lines 22-32 Link Here
22		22
23	#include <OpenImageIO/platform.h>	23	#include <OpenImageIO/platform.h>
24		24
25	#include <OpenEXR/ImfChannelList.h>	25	#include <OpenEXR-3/ImfChannelList.h>
26	#include <OpenEXR/ImfEnvmap.h>	26	#include <OpenEXR-3/ImfEnvmap.h>
27	#include <OpenEXR/ImfInputFile.h>	27	#include <OpenEXR-3/ImfInputFile.h>
28	#include <OpenEXR/ImfTestFile.h>	28	#include <OpenEXR-3/ImfTestFile.h>
29	#include <OpenEXR/ImfTiledInputFile.h>	29	#include <OpenEXR-3/ImfTiledInputFile.h>
30		30
31	#ifdef OPENEXR_VERSION_MAJOR	31	#ifdef OPENEXR_VERSION_MAJOR
32	# define OPENEXR_CODED_VERSION \	32	# define OPENEXR_CODED_VERSION \
Lines 37-43 Link Here
37	#endif	37	#endif
38		38
39	#if OPENEXR_CODED_VERSION >= 20400 \	39	#if OPENEXR_CODED_VERSION >= 20400 \
40	\|\| __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)	40	\|\| __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
41	# define OPENEXR_HAS_FLOATVECTOR 1	41	# define OPENEXR_HAS_FLOATVECTOR 1
42	#else	42	#else
43	# define OPENEXR_HAS_FLOATVECTOR 0	43	# define OPENEXR_HAS_FLOATVECTOR 0
Lines 48-84 Link Here
48	OIIO_PRAGMA_VISIBILITY_PUSH	48	OIIO_PRAGMA_VISIBILITY_PUSH
49	OIIO_PRAGMA_WARNING_PUSH	49	OIIO_PRAGMA_WARNING_PUSH
50	OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")	50	OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
51	#include <OpenEXR/IexBaseExc.h>	51	#include <OpenEXR-3/IexBaseExc.h>
52	#include <OpenEXR/IexThrowErrnoExc.h>	52	#include <OpenEXR-3/IexThrowErrnoExc.h>
53	#include <OpenEXR/ImfBoxAttribute.h>	53	#include <OpenEXR-3/ImfBoxAttribute.h>
54	#include <OpenEXR/ImfChromaticitiesAttribute.h>	54	#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
55	#include <OpenEXR/ImfCompressionAttribute.h>	55	#include <OpenEXR-3/ImfCompressionAttribute.h>
56	#include <OpenEXR/ImfDeepFrameBuffer.h>	56	#include <OpenEXR-3/ImfDeepFrameBuffer.h>
57	#include <OpenEXR/ImfDeepScanLineInputPart.h>	57	#include <OpenEXR-3/ImfDeepScanLineInputPart.h>
58	#include <OpenEXR/ImfDeepTiledInputPart.h>	58	#include <OpenEXR-3/ImfDeepTiledInputPart.h>
59	#include <OpenEXR/ImfDoubleAttribute.h>	59	#include <OpenEXR-3/ImfDoubleAttribute.h>
60	#include <OpenEXR/ImfEnvmapAttribute.h>	60	#include <OpenEXR-3/ImfEnvmapAttribute.h>
61	#include <OpenEXR/ImfFloatAttribute.h>	61	#include <OpenEXR-3/ImfFloatAttribute.h>
62	#include <OpenEXR/ImfHeader.h>	62	#include <OpenEXR-3/ImfHeader.h>
63	#if OPENEXR_HAS_FLOATVECTOR	63	#if OPENEXR_HAS_FLOATVECTOR
64	# include <OpenEXR/ImfFloatVectorAttribute.h>	64	# include <OpenEXR-3/ImfFloatVectorAttribute.h>
65	#endif	65	#endif
66	#include <OpenEXR/ImfInputPart.h>	66	#include <OpenEXR-3/ImfInputPart.h>
67	#include <OpenEXR/ImfIntAttribute.h>	67	#include <OpenEXR-3/ImfIntAttribute.h>
68	#include <OpenEXR/ImfKeyCodeAttribute.h>	68	#include <OpenEXR-3/ImfKeyCodeAttribute.h>
69	#include <OpenEXR/ImfMatrixAttribute.h>	69	#include <OpenEXR-3/ImfMatrixAttribute.h>
70	#include <OpenEXR/ImfMultiPartInputFile.h>	70	#include <OpenEXR-3/ImfMultiPartInputFile.h>
71	#include <OpenEXR/ImfPartType.h>	71	#include <OpenEXR-3/ImfPartType.h>
72	#include <OpenEXR/ImfRationalAttribute.h>	72	#include <OpenEXR-3/ImfRationalAttribute.h>
73	#include <OpenEXR/ImfStringAttribute.h>	73	#include <OpenEXR-3/ImfStringAttribute.h>
74	#include <OpenEXR/ImfStringVectorAttribute.h>	74	#include <OpenEXR-3/ImfStringVectorAttribute.h>
75	#include <OpenEXR/ImfTiledInputPart.h>	75	#include <OpenEXR-3/ImfTiledInputPart.h>
76	#include <OpenEXR/ImfTimeCodeAttribute.h>	76	#include <OpenEXR-3/ImfTimeCodeAttribute.h>
77	#include <OpenEXR/ImfVecAttribute.h>	77	#include <OpenEXR-3/ImfVecAttribute.h>
78	OIIO_PRAGMA_WARNING_POP	78	OIIO_PRAGMA_WARNING_POP
79	OIIO_PRAGMA_VISIBILITY_POP	79	OIIO_PRAGMA_VISIBILITY_POP
80		80
81	#include <OpenEXR/ImfCRgbaFile.h>	81	#include <OpenEXR-3/ImfCRgbaFile.h>
82		82
83	#include "imageio_pvt.h"	83	#include "imageio_pvt.h"
84	#include <OpenImageIO/dassert.h>	84	#include <OpenImageIO/dassert.h>
85	-- oiio-Release-2.2.18.0/src/openexr.imageio/exroutput.cpp.orig	85	++ oiio-Release-2.2.18.0/src/openexr.imageio/exroutput.cpp
Lines 13-22 Link Here
13		13
14	#include <OpenImageIO/platform.h>	14	#include <OpenImageIO/platform.h>
15		15
16	#include <OpenEXR/ImfChannelList.h>	16	#include <OpenEXR-3/ImfChannelList.h>
17	#include <OpenEXR/ImfEnvmap.h>	17	#include <OpenEXR-3/ImfEnvmap.h>
18	#include <OpenEXR/ImfOutputFile.h>	18	#include <OpenEXR-3/ImfOutputFile.h>
19	#include <OpenEXR/ImfTiledOutputFile.h>	19	#include <OpenEXR-3/ImfTiledOutputFile.h>
20		20
21	#ifdef OPENEXR_VERSION_MAJOR	21	#ifdef OPENEXR_VERSION_MAJOR
22	# define OPENEXR_CODED_VERSION \	22	# define OPENEXR_CODED_VERSION \
Lines 27-33 Link Here
27	#endif	27	#endif
28		28
29	#if OPENEXR_CODED_VERSION >= 20400 \	29	#if OPENEXR_CODED_VERSION >= 20400 \
30	\|\| __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)	30	\|\| __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
31	# define OPENEXR_HAS_FLOATVECTOR 1	31	# define OPENEXR_HAS_FLOATVECTOR 1
32	#else	32	#else
33	# define OPENEXR_HAS_FLOATVECTOR 0	33	# define OPENEXR_HAS_FLOATVECTOR 0
Lines 38-71 Link Here
38	OIIO_PRAGMA_VISIBILITY_PUSH	38	OIIO_PRAGMA_VISIBILITY_PUSH
39	OIIO_PRAGMA_WARNING_PUSH	39	OIIO_PRAGMA_WARNING_PUSH
40	OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")	40	OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
41	#include <OpenEXR/IexBaseExc.h>	41	#include <OpenEXR-3/IexBaseExc.h>
42	#include <OpenEXR/ImfBoxAttribute.h>	42	#include <OpenEXR-3/ImfBoxAttribute.h>
43	#include <OpenEXR/ImfCRgbaFile.h> // JUST to get symbols to figure out version!	43	#include <OpenEXR-3/ImfCRgbaFile.h> // JUST to get symbols to figure out version!
44	#include <OpenEXR/ImfChromaticitiesAttribute.h>	44	#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
45	#include <OpenEXR/ImfCompressionAttribute.h>	45	#include <OpenEXR-3/ImfCompressionAttribute.h>
46	#include <OpenEXR/ImfEnvmapAttribute.h>	46	#include <OpenEXR-3/ImfEnvmapAttribute.h>
47	#include <OpenEXR/ImfFloatAttribute.h>	47	#include <OpenEXR-3/ImfFloatAttribute.h>
48	#if OPENEXR_HAS_FLOATVECTOR	48	#if OPENEXR_HAS_FLOATVECTOR
49	# include <OpenEXR/ImfFloatVectorAttribute.h>	49	# include <OpenEXR-3/ImfFloatVectorAttribute.h>
50	#endif	50	#endif
51	#include <OpenEXR/ImfHeader.h>	51	#include <OpenEXR-3/ImfHeader.h>
52	#include <OpenEXR/ImfIntAttribute.h>	52	#include <OpenEXR-3/ImfIntAttribute.h>
53	#include <OpenEXR/ImfKeyCodeAttribute.h>	53	#include <OpenEXR-3/ImfKeyCodeAttribute.h>
54	#include <OpenEXR/ImfMatrixAttribute.h>	54	#include <OpenEXR-3/ImfMatrixAttribute.h>
55	#include <OpenEXR/ImfRationalAttribute.h>	55	#include <OpenEXR-3/ImfRationalAttribute.h>
56	#include <OpenEXR/ImfStringAttribute.h>	56	#include <OpenEXR-3/ImfStringAttribute.h>
57	#include <OpenEXR/ImfTimeCodeAttribute.h>	57	#include <OpenEXR-3/ImfTimeCodeAttribute.h>
58	#include <OpenEXR/ImfVecAttribute.h>	58	#include <OpenEXR-3/ImfVecAttribute.h>
59		59
60	#include <OpenEXR/ImfDeepFrameBuffer.h>	60	#include <OpenEXR-3/ImfDeepFrameBuffer.h>
61	#include <OpenEXR/ImfDeepScanLineOutputPart.h>	61	#include <OpenEXR-3/ImfDeepScanLineOutputPart.h>
62	#include <OpenEXR/ImfDeepTiledOutputPart.h>	62	#include <OpenEXR-3/ImfDeepTiledOutputPart.h>
63	#include <OpenEXR/ImfDoubleAttribute.h>	63	#include <OpenEXR-3/ImfDoubleAttribute.h>
64	#include <OpenEXR/ImfMultiPartOutputFile.h>	64	#include <OpenEXR-3/ImfMultiPartOutputFile.h>
65	#include <OpenEXR/ImfOutputPart.h>	65	#include <OpenEXR-3/ImfOutputPart.h>
66	#include <OpenEXR/ImfPartType.h>	66	#include <OpenEXR-3/ImfPartType.h>
67	#include <OpenEXR/ImfStringVectorAttribute.h>	67	#include <OpenEXR-3/ImfStringVectorAttribute.h>
68	#include <OpenEXR/ImfTiledOutputPart.h>	68	#include <OpenEXR-3/ImfTiledOutputPart.h>
69	OIIO_PRAGMA_WARNING_POP	69	OIIO_PRAGMA_WARNING_POP
70	OIIO_PRAGMA_VISIBILITY_POP	70	OIIO_PRAGMA_VISIBILITY_POP
71		71