]>
Commit | Line | Data |
---|---|---|
9460ccd4 JB |
1 | --- OpenImageIO-2.4.17.0/src/cineon.imageio/CMakeLists.txt.orig 2024-04-26 19:25:33.286182160 +0200 |
2 | +++ OpenImageIO-2.4.17.0/src/cineon.imageio/CMakeLists.txt 2024-04-26 19:49:10.735169846 +0200 | |
f42f60ac | 3 | @@ -3,9 +3,7 @@ |
9460ccd4 | 4 | # https://github.com/AcademySoftwareFoundation/OpenImageIO |
f42f60ac | 5 | |
32c56ab5 | 6 | add_oiio_plugin (cineoninput.cpp |
7017ceb2 | 7 | - libcineon/Cineon.cpp libcineon/OutStream.cpp libcineon/Codec.cpp |
f42f60ac | 8 | - libcineon/Reader.cpp libcineon/CineonHeader.cpp |
7017ceb2 JR |
9 | - libcineon/ElementReadStream.cpp libcineon/InStream.cpp) |
10 | + LINK_LIBRARIES cineon) | |
f42f60ac JB |
11 | |
12 | # Note: OIIO doesn't support cineon output, so we don't compile | |
13 | # libcineon/Writer.cpp | |
14 | --- oiio-2.4.14.0/src/cineon.imageio/cineoninput.cpp.orig 2023-08-01 22:15:24.000000000 +0200 | |
15 | +++ oiio-2.4.14.0/src/cineon.imageio/cineoninput.cpp 2023-08-22 17:46:26.265122755 +0200 | |
16 | @@ -4,7 +4,7 @@ | |
7017ceb2 JR |
17 | |
18 | #include <cmath> | |
b238f81f JB |
19 | |
20 | -#include "libcineon/Cineon.h" | |
21 | +#include <Cineon.h> | |
22 | ||
3b1a691b | 23 | #include <OpenImageIO/dassert.h> |
7017ceb2 | 24 | #include <OpenImageIO/imageio.h> |
f42f60ac JB |
25 | @@ -337,8 +337,8 @@ CineonInput::open(const std::string& nam |
26 | // FIXME: do something about the time zone | |
27 | } | |
28 | { | |
29 | - char filmedge[17]; | |
30 | - m_cin.header.FilmEdgeCode(filmedge, sizeof(filmedge)); | |
31 | + char filmedge[3+3+3+10+10+1]; // should be 17 (2+2+2+6+4+NUL), but be safe in case of out-of-range values | |
32 | + m_cin.header.FilmEdgeCode(filmedge); | |
33 | if (filmedge[0]) | |
34 | m_spec.attribute("cineon:FilmEdgeCode", filmedge); | |
35 | } |