From cfc8d80f2cee778022359ee2354a523970a06fdf Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 20 Feb 2016 11:40:25 +0500 Subject: 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. --- source/blender/imbuf/intern/oiio/openimageio_api.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/imbuf/intern/oiio/openimageio_api.cpp') 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 -#include -#include - -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 +#include + +OIIO_NAMESPACE_USING + using namespace std; typedef unsigned char uchar; -- cgit v1.2.3