Merge remote-tracking branch 'upstream/main' into add-and-refactor-tests

Signed-off-by: Aleksandr Motsjonov <[email protected]>

Author: soswow

tests/test_image_converter.cpp

@@ -7,6 +7,11 @@
 #    undef RGB
 #endif
 
+#include "../src/rawtoaces_util/rawtoaces_util_priv.h"
+
+// must be before <OpenImageIO/unittest.h>
+#include <rawtoaces/image_converter.h>
+
 #include <OpenImageIO/unittest.h>
 #include <filesystem>
 #include <fstream>

tests/usage_example_util.cpp

@@ -1,9 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Contributors to the rawtoaces Project.
 
+// must be before <OpenImageIO/unittest.h>
+#include <rawtoaces/image_converter.h>
+
 #include <filesystem>
 #include <OpenImageIO/unittest.h>
-#include <rawtoaces/image_converter.h>
 
 // This file contains some usage examples of the util library.
 // It has only very little unit test functionality to keep the code clean.