diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 09:40:25 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 12:06:06 +0300 |
| commit | cfc8d80f2cee778022359ee2354a523970a06fdf (patch) | |
| tree | e315957cc5118f7ecad19cd162d6d828b899ab12 /source/blender/imbuf/intern/oiio/openimageio_api.cpp | |
| parent | b30ab24fb823b83256fe981843069a1d73c5bbb8 (diff) | |
ImBuf: Solve re-definition warnings
The idea now is to have FFmpeg/OIIO headers listed after
the system ones. This is because FFmpeg/OIIO might define
some constants with the same name as the ones from math.h.
FFmpeg/OIIO has ifdef around defines, but math.h doesn't
check whether constants were already defined or not, which
causes some noisy warnings.
Diffstat (limited to 'source/blender/imbuf/intern/oiio/openimageio_api.cpp')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 0a2e8742ba8..b24a89c969c 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -31,11 +31,6 @@ #include <set> -#include <openimageio_api.h> -#include <OpenImageIO/imageio.h> - -OIIO_NAMESPACE_USING - #if defined(WIN32) && !defined(FREE_WINDOWS) #include "utfconv.h" #endif @@ -53,6 +48,11 @@ extern "C" #include "IMB_colormanagement_intern.h" } +#include <openimageio_api.h> +#include <OpenImageIO/imageio.h> + +OIIO_NAMESPACE_USING + using namespace std; typedef unsigned char uchar; |