]>
Commit | Line | Data |
---|---|---|
b238f81f JB |
1 | --- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt.orig 2011-11-05 08:35:00.000000000 +0100 |
2 | +++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/CMakeLists.txt 2011-11-26 09:02:29.701499722 +0100 | |
3 | @@ -1,4 +1,3 @@ | |
4 | add_oiio_plugin (dpxinput.cpp dpxoutput.cpp | |
5 | - libdpx/DPX.cpp libdpx/OutStream.cpp libdpx/RunLengthEncoding.cpp | |
6 | - libdpx/Codec.cpp libdpx/Reader.cpp libdpx/Writer.cpp libdpx/DPXHeader.cpp | |
7 | - libdpx/ElementReadStream.cpp libdpx/InStream.cpp libdpx/DPXColorConverter.cpp) | |
8 | + libdpx/DPXColorConverter.cpp | |
9 | + LINK_LIBRARIES dpx) | |
10 | --- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp.orig 2011-11-05 08:35:00.000000000 +0100 | |
11 | +++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxinput.cpp 2011-11-26 09:03:24.121501545 +0100 | |
12 | @@ -28,7 +28,7 @@ | |
13 | (This is the Modified BSD License) | |
14 | */ | |
15 | ||
16 | -#include "libdpx/DPX.h" | |
17 | +#include <DPX.h> | |
18 | #include "libdpx/DPXColorConverter.h" | |
19 | ||
20 | #include "typedesc.h" | |
40b0de7c JR |
21 | @@ -499,7 +499,7 @@ |
22 | case dpx::k1125LineProgressive169AR: | |
23 | tmpstr = "YCbCr 1125p, 16:9 (SMPTE 274M)"; | |
24 | break; | |
25 | - case dpx::k255: | |
26 | + case 255: | |
27 | // don't set the attribute at all | |
28 | break; | |
29 | default: | |
b238f81f JB |
30 | --- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp.orig 2011-11-05 08:35:00.000000000 +0100 |
31 | +++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/dpxoutput.cpp 2011-11-26 09:03:35.934835274 +0100 | |
32 | @@ -33,7 +33,7 @@ | |
33 | #include <cmath> | |
34 | #include <boost/algorithm/string.hpp> | |
35 | ||
36 | -#include "libdpx/DPX.h" | |
37 | +#include <DPX.h> | |
38 | #include "libdpx/DPXColorConverter.h" | |
39 | ||
40 | #include "typedesc.h" | |
41 | --- OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h.orig 2011-11-05 08:35:00.000000000 +0100 | |
42 | +++ OpenImageIO-oiio-7d98ca6/src/dpx.imageio/libdpx/DPXColorConverter.h 2011-11-26 09:05:17.444838673 +0100 | |
43 | @@ -37,7 +37,7 @@ | |
44 | #define _DPX_COLORCONVERTER_H 1 | |
45 | ||
46 | ||
47 | -#include "DPX.h" | |
48 | +#include <DPX.h> | |
49 | ||
50 | ||
51 | namespace dpx |