Skip to content

Commit 82150be

Browse files
committed
fix build issues caused by the order of OIIO includes
Signed-off-by: Anton Dukhovnikov <[email protected]>
1 parent c2a61d2 commit 82150be

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

tests/test_image_converter.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
# undef RGB
88
#endif
99

10+
#include "../src/rawtoaces_util/rawtoaces_util_priv.h"
11+
12+
// must be before <OpenImageIO/unittest.h>
13+
#include <rawtoaces/image_converter.h>
14+
1015
#include <OpenImageIO/unittest.h>
1116
#include <filesystem>
1217
#include <fstream>
@@ -16,9 +21,6 @@
1621
#include <sys/stat.h> // for mkfifo
1722
#include <ctime>
1823

19-
#include "../src/rawtoaces_util/rawtoaces_util_priv.h"
20-
#include <rawtoaces/image_converter.h>
21-
2224
using namespace rta::util;
2325

2426
// Cross-platform environment variable helpers

tests/usage_example_util.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// Copyright Contributors to the rawtoaces Project.
33

4+
// must be before <OpenImageIO/unittest.h>
5+
#include <rawtoaces/image_converter.h>
6+
47
#include <filesystem>
58
#include <OpenImageIO/unittest.h>
6-
#include <rawtoaces/image_converter.h>
79

810
// This file contains some usage examples of the util library.
911
// It has only very little unit test functionality to keep the code clean.

0 commit comments

Comments
 (0)