Skip to content

Commit

Permalink
Fix build break against OpenColorIO master -- headers disappeared (#2817
Browse files Browse the repository at this point in the history
)

The functions we depend on are all still there, they just moved from
these headers into the main OpenColorIO.h.
  • Loading branch information
lgritz committed Jan 8, 2021
1 parent 0f11d7f commit 1843de9
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions src/libOpenImageIO/color_ocio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,19 @@
# include <OpenColorIO/OpenColorIO.h>
# if OCIO_VERSION_HEX >= MAKE_OCIO_VERSION_HEX(2, 0, 0)
# define OCIO_v2 1
# include <OpenColorIO/apphelpers/ColorSpaceHelpers.h>
# include <OpenColorIO/apphelpers/DisplayViewHelpers.h>
# include <OpenColorIO/apphelpers/ViewingPipeline.h>
// NOTE: these 3 header files were part of the pre-release OCIO 2.0 but
// eventually were removed. After OCIO v2 is released and we are fairly
// confident nobody will encounter them, we can remove these includes
// entirely.
# if __has_include(<OpenColorIO/apphelpers/ColorSpaceHelpers.h>)
# include <OpenColorIO/apphelpers/ColorSpaceHelpers.h>
# endif
# if __has_include(<OpenColorIO/apphelpers/DisplayViewHelpers.h>)
# include <OpenColorIO/apphelpers/DisplayViewHelpers.h>
# endif
# if __has_include(<OpenColorIO/apphelpers/ViewingPipeline.h>)
# include <OpenColorIO/apphelpers/ViewingPipeline.h>
# endif
# endif
namespace OCIO = OCIO_NAMESPACE;
#endif
Expand Down

0 comments on commit 1843de9

Please sign in to comment.