Minimise StringUtils.h usage

KevinJW · KevinJW · commit ef8d8deae5e6 · 2026-01-16T19:29:51.000Z
Signed-off-by: Kevin Wheatley &lt;kevin.wheatley@framestore.com&gt;
diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h
@@ -13,6 +13,7 @@
 #include <vector>
 #include <cstdint>
 #include <map>
+#include <functional>
 
 #include "OpenColorABI.h"
 #include "OpenColorTypes.h"
diff --git a/src/OpenColorIO/FileRules.cpp b/src/OpenColorIO/FileRules.cpp
@@ -4,7 +4,6 @@
 #include <algorithm>
 #include <cctype>
 #include <cstring>
-#include <map>
 #include <regex>
 #include <sstream>
 
diff --git a/src/OpenColorIO/Mutex.h b/src/OpenColorIO/Mutex.h
@@ -7,9 +7,11 @@
 
 
 #include <mutex> 
-#include <thread>
-#include <assert.h>
+#include <cassert>
 
+#ifndef NDEBUG
+#include <thread>
+#endif
 
 /** For internal use only */
 
diff --git a/src/OpenColorIO/apphelpers/CategoryHelpers.h b/src/OpenColorIO/apphelpers/CategoryHelpers.h
@@ -5,7 +5,6 @@
 #ifndef INCLUDED_OCIO_CATEGORY_HELPERS_H
 #define INCLUDED_OCIO_CATEGORY_HELPERS_H
 
-#include <string>
 #include <vector>
 
 #include <OpenColorIO/OpenColorIO.h>
diff --git a/src/OpenColorIO/apphelpers/MixingHelpers.cpp b/src/OpenColorIO/apphelpers/MixingHelpers.cpp
@@ -10,7 +10,6 @@
 #include "CategoryHelpers.h"
 #include "ColorSpaceHelpers.h"
 #include "MixingHelpers.h"
-#include "utils/StringUtils.h"
 
 
 namespace OCIO_NAMESPACE
diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp
@@ -14,6 +14,7 @@
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "MergeConfigsHelpers.h"
+#include "SectionMerger.h"
 
 #include "Platform.h"
 #include "OCIOMYaml.h"
diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.h b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.h
@@ -6,14 +6,11 @@
 #define INCLUDED_OCIO_MERGE_CONFIG_HELPERS_H
 
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "SectionMerger.h"
 #include "utils/StringUtils.h"
-#include "Logging.h"
 
 namespace OCIO_NAMESPACE
 {
diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.h b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.h
@@ -6,14 +6,14 @@
 #define INCLUDED_OCIO_MERGE_CONFIG_SECTION_MERGER_H
 
 #include <string>
-#include <unordered_map>
 #include <vector>
+#include <functional>
 
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "ConfigUtils.h"
-#include "utils/StringUtils.h"
 #include "Logging.h"
+#include "utils/StringUtils.h"
 
 
 namespace OCIO_NAMESPACE
diff --git a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpGPU.cpp b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpGPU.cpp
@@ -8,7 +8,6 @@
 
 #include "Logging.h"
 #include "ops/exposurecontrast/ExposureContrastOpGPU.h"
-#include "utils/StringUtils.h"
 
 
 namespace OCIO_NAMESPACE
diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp
@@ -6,7 +6,6 @@
 
 #include "Logging.h"
 #include "ops/gradingtone/GradingToneOpGPU.h"
-#include "utils/StringUtils.h"
 
 
 namespace OCIO_NAMESPACE
diff --git a/src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.cpp b/src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.cpp
@@ -8,7 +8,6 @@
 
 #include "Mutex.h"
 #include "ops/matrix/MatrixOp.h"
-#include "OpBuilders.h"
 #include "Platform.h"
 #include "transforms/builtins/ACES.h"
 #include "transforms/builtins/AppleCameras.h"
@@ -19,7 +18,6 @@
 #include "transforms/builtins/PanasonicCameras.h"
 #include "transforms/builtins/RedCameras.h"
 #include "transforms/builtins/SonyCameras.h"
-#include "utils/StringUtils.h"
 
 
 namespace OCIO_NAMESPACE
diff --git a/src/bindings/python/PyBuiltinConfigRegistry.cpp b/src/bindings/python/PyBuiltinConfigRegistry.cpp
@@ -3,6 +3,7 @@
 
 #include "PyBuiltinConfigRegistry.h"
 #include "PyUtils.h"
+#include "utils/StringUtils.h"
 
 namespace OCIO_NAMESPACE
 {
diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp
@@ -5,7 +5,7 @@
 
 #include "PyBuiltinTransformRegistry.h"
 #include "PyUtils.h"
-
+#include "utils/StringUtils.h"
 
 namespace OCIO_NAMESPACE
 {
diff --git a/src/bindings/python/PyConfig.cpp b/src/bindings/python/PyConfig.cpp
@@ -6,6 +6,7 @@
 
 #include "PyOpenColorIO.h"
 #include "PyUtils.h"
+#include "utils/StringUtils.h"
 
 namespace OCIO_NAMESPACE
 {
diff --git a/src/bindings/python/PyContext.cpp b/src/bindings/python/PyContext.cpp
@@ -5,6 +5,7 @@
 
 #include "PyOpenColorIO.h"
 #include "PyUtils.h"
+#include "utils/StringUtils.h"
 
 namespace OCIO_NAMESPACE
 {
diff --git a/src/bindings/python/PyFormatMetadata.cpp b/src/bindings/python/PyFormatMetadata.cpp
@@ -5,6 +5,7 @@
 
 #include "PyOpenColorIO.h"
 #include "PyUtils.h"
+#include "utils/StringUtils.h"
 
 #include <sstream>
 
diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h
@@ -12,8 +12,6 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "utils/StringUtils.h"
-
 // Generated at build time: '${PROJECT_BINARY_DIR}/docs/_doxygen/docstrings.h'
 #include "docstrings.h"
 
diff --git a/tests/cpu/UnitTestUtils.cpp b/tests/cpu/UnitTestUtils.cpp
@@ -7,10 +7,8 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "Logging.h"
 #include "OpBuilders.h"
 #include "UnitTestUtils.h"
-#include "utils/StringUtils.h"
 
 #ifndef _WIN32
 #include <dirent.h>
diff --git a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp
@@ -3,6 +3,7 @@
 
 #include <pystring.h>
 #include <sstream>
+#include <iostream>
 
 #include "apphelpers/mergeconfigs/MergeConfigsHelpers.cpp"
 
diff --git a/tests/cpu/fileformats/FileFormatVF_tests.cpp b/tests/cpu/fileformats/FileFormatVF_tests.cpp
@@ -2,7 +2,6 @@
 // Copyright Contributors to the OpenColorIO Project.
 
 
-#include <fstream>
 #include <sstream>
 
 #include "fileformats/FileFormatVF.cpp"
diff --git a/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp b/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp
@@ -11,6 +11,10 @@
 #include "UnitTestUtils.h"
 #include "ops/lut3d/Lut3DOp.h"
 
+#if DUMP_RESULT
+#include <iostream>
+#endif
+
 namespace OCIO = OCIO_NAMESPACE;
 
 
diff --git a/tests/utils/UnitTestMain.cpp b/tests/utils/UnitTestMain.cpp
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright Contributors to the OpenColorIO Project.
 
+#include <iostream>
 
 #include "testutils/UnitTest.h"
 
