From 420422d5eb24445f92301eb3976eacc51c99d246 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 13 Jan 2026 12:54:49 +0000 Subject: [PATCH 01/48] Remove unused include Signed-off-by: Kevin Wheatley --- src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp | 2 -- tests/cpu/ColorSpace_tests.cpp | 2 -- tests/cpu/ConfigUtils_tests.cpp | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp index 33c41f293..3a972b4a0 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp @@ -8,8 +8,6 @@ #include #include -#include - #include #include "ConfigUtils.h" diff --git a/tests/cpu/ColorSpace_tests.cpp b/tests/cpu/ColorSpace_tests.cpp index 09819632e..bc66601e6 100644 --- a/tests/cpu/ColorSpace_tests.cpp +++ b/tests/cpu/ColorSpace_tests.cpp @@ -4,8 +4,6 @@ #include -#include - #include "ColorSpace.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ConfigUtils_tests.cpp b/tests/cpu/ConfigUtils_tests.cpp index db58c3f62..c485a5149 100644 --- a/tests/cpu/ConfigUtils_tests.cpp +++ b/tests/cpu/ConfigUtils_tests.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "UnitTestUtils.h" #include "ConfigUtils.h" From 0adf067ec2ac60ce56b020315ff6680ec9c5939f Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 13 Jan 2026 13:11:33 +0000 Subject: [PATCH 02/48] Clean up SectionMerger.cpp includes Signed-off-by: Kevin Wheatley --- src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp index 3a972b4a0..0fec3e68d 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp @@ -1,10 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include -#include +#include #include #include @@ -13,8 +10,6 @@ #include "ConfigUtils.h" #include "CustomKeys.h" #include "Logging.h" -#include "OCIOMYaml.h" -#include "ParseUtils.h" #include "Platform.h" #include "SectionMerger.h" #include "TokensManager.h" From b12934d1365ba0f87527e2fdf77359b7fd632065 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 13 Jan 2026 16:02:08 +0000 Subject: [PATCH 03/48] Tidy up placement of header inclusion Signed-off-by: Kevin Wheatley --- include/OpenColorIO/OpenColorTransforms.h | 1 - include/OpenColorIO/OpenColorTypes.h | 1 - src/OpenColorIO/GpuShaderUtils.cpp | 1 + src/OpenColorIO/MathUtils.cpp | 1 + src/OpenColorIO/OCIOYaml.cpp | 1 + src/OpenColorIO/OCIOZArchive.cpp | 1 - src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp | 2 ++ src/OpenColorIO/fileformats/ctf/CTFTransform.cpp | 1 + src/OpenColorIO/ops/gradingprimary/GradingPrimary.cpp | 1 + src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp | 1 + src/OpenColorIO/ops/log/LogOpCPU.cpp | 1 + src/OpenColorIO/ops/log/LogOpGPU.cpp | 1 + src/OpenColorIO/ops/lut3d/Lut3DOp.cpp | 1 - src/OpenColorIO/ops/range/RangeOpData.cpp | 1 + src/OpenColorIO/ops/range/RangeOpGPU.cpp | 2 -- src/OpenColorIO/transforms/Lut1DTransform.cpp | 1 + src/OpenColorIO/transforms/Lut3DTransform.cpp | 1 + src/apps/ocioperf/main.cpp | 1 - src/bindings/python/transforms/PyLogCameraTransform.cpp | 2 ++ tests/cpu/AVX2_tests.cpp | 1 + tests/cpu/AVX512_tests.cpp | 1 + tests/cpu/AVX_tests.cpp | 1 + tests/cpu/CPUProcessor_tests.cpp | 2 ++ tests/cpu/SSE2_tests.cpp | 1 + tests/cpu/SSE_tests.cpp | 1 + tests/cpu/fileformats/FileFormatCTF_tests.cpp | 2 ++ tests/cpu/fileformats/xmlutils/XMLReaderUtils_tests.cpp | 1 + tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp | 2 ++ tests/cpu/ops/gamma/GammaOpCPU_tests.cpp | 2 ++ tests/cpu/ops/gradinghuecurve/GradingHueCurveOpCPU_tests.cpp | 2 ++ tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp | 2 ++ tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp | 2 ++ tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp | 1 + tests/cpu/ops/log/LogOpCPU_tests.cpp | 2 ++ tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp | 2 ++ tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp | 2 ++ tests/cpu/ops/lut3d/Lut3DOp_tests.cpp | 1 + tests/cpu/transforms/BuiltinTransform_tests.cpp | 1 + tests/cpu/transforms/GradingPrimaryTransform_tests.cpp | 2 ++ tests/cpu/transforms/GradingToneTransform_tests.cpp | 2 ++ tests/gpu/GPUUnitTest.cpp | 1 + 41 files changed, 49 insertions(+), 7 deletions(-) diff --git a/include/OpenColorIO/OpenColorTransforms.h b/include/OpenColorIO/OpenColorTransforms.h index 8ef04be8c..e7f63baa9 100644 --- a/include/OpenColorIO/OpenColorTransforms.h +++ b/include/OpenColorIO/OpenColorTransforms.h @@ -6,7 +6,6 @@ #define INCLUDED_OCIO_OPENCOLORTRANSFORMS_H #include -#include #include "OpenColorTypes.h" diff --git a/include/OpenColorIO/OpenColorTypes.h b/include/OpenColorIO/OpenColorTypes.h index 8fa583374..366d1fae0 100644 --- a/include/OpenColorIO/OpenColorTypes.h +++ b/include/OpenColorIO/OpenColorTypes.h @@ -12,7 +12,6 @@ #endif #include -#include #include #include diff --git a/src/OpenColorIO/GpuShaderUtils.cpp b/src/OpenColorIO/GpuShaderUtils.cpp index fa1ca43fb..57f4a90c0 100644 --- a/src/OpenColorIO/GpuShaderUtils.cpp +++ b/src/OpenColorIO/GpuShaderUtils.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/MathUtils.cpp b/src/OpenColorIO/MathUtils.cpp index 468773c57..bfe171e80 100644 --- a/src/OpenColorIO/MathUtils.cpp +++ b/src/OpenColorIO/MathUtils.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp index c9361579f..5968e6a3e 100644 --- a/src/OpenColorIO/OCIOYaml.cpp +++ b/src/OpenColorIO/OCIOYaml.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp index 982fce682..46e9485bb 100644 --- a/src/OpenColorIO/OCIOZArchive.cpp +++ b/src/OpenColorIO/OCIOZArchive.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp index 79393fc48..be56d238b 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderHelper.h" #include "fileformats/ctf/CTFReaderUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp index 5a21b6cb1..eb47e3748 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderUtils.h" diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimary.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimary.cpp index 788640b7f..f04ae697b 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimary.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimary.cpp @@ -4,6 +4,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp index 8dc8d8d23..dcb923b3c 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include "OpenColorIO/DynamicProperty.h" diff --git a/src/OpenColorIO/ops/log/LogOpCPU.cpp b/src/OpenColorIO/ops/log/LogOpCPU.cpp index bed3c9d5a..b46f7450f 100644 --- a/src/OpenColorIO/ops/log/LogOpCPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpCPU.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #if OCIO_USE_SSE2 == 0 #include #endif diff --git a/src/OpenColorIO/ops/log/LogOpGPU.cpp b/src/OpenColorIO/ops/log/LogOpGPU.cpp index 6ea9756a6..f3341da1b 100644 --- a/src/OpenColorIO/ops/log/LogOpGPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpGPU.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp index 4f0de76f4..c552602a4 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/src/OpenColorIO/ops/range/RangeOpData.cpp b/src/OpenColorIO/ops/range/RangeOpData.cpp index 7d3509baf..d7c714728 100644 --- a/src/OpenColorIO/ops/range/RangeOpData.cpp +++ b/src/OpenColorIO/ops/range/RangeOpData.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/ops/range/RangeOpGPU.cpp b/src/OpenColorIO/ops/range/RangeOpGPU.cpp index e81791267..341025b64 100644 --- a/src/OpenColorIO/ops/range/RangeOpGPU.cpp +++ b/src/OpenColorIO/ops/range/RangeOpGPU.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include #include "MathUtils.h" diff --git a/src/OpenColorIO/transforms/Lut1DTransform.cpp b/src/OpenColorIO/transforms/Lut1DTransform.cpp index cc3a9f7f6..269d2650e 100644 --- a/src/OpenColorIO/transforms/Lut1DTransform.cpp +++ b/src/OpenColorIO/transforms/Lut1DTransform.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/transforms/Lut3DTransform.cpp b/src/OpenColorIO/transforms/Lut3DTransform.cpp index 6e1a2babe..ddbc6f0e2 100644 --- a/src/OpenColorIO/transforms/Lut3DTransform.cpp +++ b/src/OpenColorIO/transforms/Lut3DTransform.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp index 4c7837494..a8b8ebe00 100644 --- a/src/apps/ocioperf/main.cpp +++ b/src/apps/ocioperf/main.cpp @@ -9,7 +9,6 @@ #include #include -#include #include diff --git a/src/bindings/python/transforms/PyLogCameraTransform.cpp b/src/bindings/python/transforms/PyLogCameraTransform.cpp index e70de5a47..55ff63a82 100644 --- a/src/bindings/python/transforms/PyLogCameraTransform.cpp +++ b/src/bindings/python/transforms/PyLogCameraTransform.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" namespace OCIO_NAMESPACE diff --git a/tests/cpu/AVX2_tests.cpp b/tests/cpu/AVX2_tests.cpp index 1d8373fc9..304ffb046 100644 --- a/tests/cpu/AVX2_tests.cpp +++ b/tests/cpu/AVX2_tests.cpp @@ -6,6 +6,7 @@ #if OCIO_USE_AVX2 #include +#include #include diff --git a/tests/cpu/AVX512_tests.cpp b/tests/cpu/AVX512_tests.cpp index 8b8e6f9cd..70152a370 100644 --- a/tests/cpu/AVX512_tests.cpp +++ b/tests/cpu/AVX512_tests.cpp @@ -6,6 +6,7 @@ #if OCIO_USE_AVX512 #include +#include #include diff --git a/tests/cpu/AVX_tests.cpp b/tests/cpu/AVX_tests.cpp index a88b52a8a..106d6e489 100644 --- a/tests/cpu/AVX_tests.cpp +++ b/tests/cpu/AVX_tests.cpp @@ -6,6 +6,7 @@ #if OCIO_USE_AVX #include +#include #include diff --git a/tests/cpu/CPUProcessor_tests.cpp b/tests/cpu/CPUProcessor_tests.cpp index 925a75397..10ce908b1 100644 --- a/tests/cpu/CPUProcessor_tests.cpp +++ b/tests/cpu/CPUProcessor_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "CPUProcessor.cpp" #include "ops/lut1d/Lut1DOp.h" diff --git a/tests/cpu/SSE2_tests.cpp b/tests/cpu/SSE2_tests.cpp index b7d2961cf..8a6dd0e28 100644 --- a/tests/cpu/SSE2_tests.cpp +++ b/tests/cpu/SSE2_tests.cpp @@ -6,6 +6,7 @@ #if OCIO_USE_SSE2 #include +#include #include diff --git a/tests/cpu/SSE_tests.cpp b/tests/cpu/SSE_tests.cpp index a08e25f69..d1b5302fe 100644 --- a/tests/cpu/SSE_tests.cpp +++ b/tests/cpu/SSE_tests.cpp @@ -5,6 +5,7 @@ #include +#include #include diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp index 4dc12578a..5d6d338ae 100644 --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "BitDepthUtils.h" #include "fileformats/FileFormatCTF.cpp" #include "ops/fixedfunction/FixedFunctionOp.h" diff --git a/tests/cpu/fileformats/xmlutils/XMLReaderUtils_tests.cpp b/tests/cpu/fileformats/xmlutils/XMLReaderUtils_tests.cpp index 44aa7d59f..1bc7d559f 100644 --- a/tests/cpu/fileformats/xmlutils/XMLReaderUtils_tests.cpp +++ b/tests/cpu/fileformats/xmlutils/XMLReaderUtils_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "fileformats/xmlutils/XMLReaderUtils.cpp" diff --git a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp index 99b6b8a38..eace8f84f 100644 --- a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp +++ b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/exposurecontrast/ExposureContrastOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp index 467e1029e..b81804e92 100644 --- a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp +++ b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gamma/GammaOpCPU.cpp" #include "MathUtils.h" diff --git a/tests/cpu/ops/gradinghuecurve/GradingHueCurveOpCPU_tests.cpp b/tests/cpu/ops/gradinghuecurve/GradingHueCurveOpCPU_tests.cpp index 5fe9ad4f9..44018327f 100644 --- a/tests/cpu/ops/gradinghuecurve/GradingHueCurveOpCPU_tests.cpp +++ b/tests/cpu/ops/gradinghuecurve/GradingHueCurveOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gradinghuecurve/GradingHueCurveOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp b/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp index 14535386f..f6d0c3b66 100644 --- a/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gradingprimary/GradingPrimaryOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp index cd9005cd3..42383d778 100644 --- a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp b/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp index 625084f4d..e44494494 100644 --- a/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include "ops/gradingtone/GradingToneOpCPU.cpp" diff --git a/tests/cpu/ops/log/LogOpCPU_tests.cpp b/tests/cpu/ops/log/LogOpCPU_tests.cpp index 9826f6a1f..974044744 100644 --- a/tests/cpu/ops/log/LogOpCPU_tests.cpp +++ b/tests/cpu/ops/log/LogOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/log/LogOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp index f4fa4aa9c..0a3fcebce 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/lut1d/Lut1DOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp index 01a5822d1..47ff7e24b 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/lut1d/Lut1DOpData.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp b/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp index 6377c7778..ae32f4e89 100644 --- a/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp +++ b/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp @@ -4,6 +4,7 @@ #include #include +#include #ifndef _WIN32 #include #endif diff --git a/tests/cpu/transforms/BuiltinTransform_tests.cpp b/tests/cpu/transforms/BuiltinTransform_tests.cpp index cc57edf41..5c97af9ed 100644 --- a/tests/cpu/transforms/BuiltinTransform_tests.cpp +++ b/tests/cpu/transforms/BuiltinTransform_tests.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "transforms/BuiltinTransform.cpp" diff --git a/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp b/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp index 355e7a97d..6e1109ad0 100644 --- a/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp +++ b/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "MathUtils.h" #include "transforms/GradingPrimaryTransform.cpp" diff --git a/tests/cpu/transforms/GradingToneTransform_tests.cpp b/tests/cpu/transforms/GradingToneTransform_tests.cpp index 692cb6e83..f3b5722f2 100644 --- a/tests/cpu/transforms/GradingToneTransform_tests.cpp +++ b/tests/cpu/transforms/GradingToneTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/GradingToneTransform.cpp" #include "testutils/UnitTest.h" diff --git a/tests/gpu/GPUUnitTest.cpp b/tests/gpu/GPUUnitTest.cpp index 650813121..4f990d12c 100644 --- a/tests/gpu/GPUUnitTest.cpp +++ b/tests/gpu/GPUUnitTest.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include From d6a6a072b1a7e829891316a66a05c9c13572d757 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 13 Jan 2026 16:18:18 +0000 Subject: [PATCH 04/48] fstream include tidy up Signed-off-by: Kevin Wheatley --- include/OpenColorIO/OpenColorIO.h | 1 - src/OpenColorIO/OCIOZArchive.h | 1 - src/OpenColorIO/Platform.cpp | 1 + src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp | 1 + src/OpenColorIO/fileformats/FileFormatCTF.cpp | 1 - src/OpenColorIO/transforms/CDLTransform.cpp | 1 - tests/cpu/Config_tests.cpp | 1 + tests/cpu/FileRules_tests.cpp | 2 -- tests/cpu/OCIOZArchive_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCTF_tests.cpp | 1 + tests/cpu/transforms/CDLTransform_tests.cpp | 1 + 11 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h index ad294fc80..3c28b0869 100644 --- a/include/OpenColorIO/OpenColorIO.h +++ b/include/OpenColorIO/OpenColorIO.h @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/src/OpenColorIO/OCIOZArchive.h b/src/OpenColorIO/OCIOZArchive.h index 5bdbc6315..8518a3f91 100644 --- a/src/OpenColorIO/OCIOZArchive.h +++ b/src/OpenColorIO/OCIOZArchive.h @@ -6,7 +6,6 @@ #define INCLUDED_OCIO_ARCHIVEUTILS_H #include -#include #include #include #include diff --git a/src/OpenColorIO/Platform.cpp b/src/OpenColorIO/Platform.cpp index 0e7fc68b2..bacc7f584 100644 --- a/src/OpenColorIO/Platform.cpp +++ b/src/OpenColorIO/Platform.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp index ab74ed997..bbf8e8643 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp index b1f039303..97c45d4a8 100644 --- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/src/OpenColorIO/transforms/CDLTransform.cpp b/src/OpenColorIO/transforms/CDLTransform.cpp index 393bec4db..eb6d36e6b 100755 --- a/src/OpenColorIO/transforms/CDLTransform.cpp +++ b/src/OpenColorIO/transforms/CDLTransform.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp index b3d69c168..95ed49b0a 100644 --- a/tests/cpu/Config_tests.cpp +++ b/tests/cpu/Config_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/tests/cpu/FileRules_tests.cpp b/tests/cpu/FileRules_tests.cpp index 141c05efd..b9c1d05c6 100644 --- a/tests/cpu/FileRules_tests.cpp +++ b/tests/cpu/FileRules_tests.cpp @@ -2,8 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. -#include - #include "FileRules.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/OCIOZArchive_tests.cpp b/tests/cpu/OCIOZArchive_tests.cpp index bc1d2c497..c7cb26c96 100644 --- a/tests/cpu/OCIOZArchive_tests.cpp +++ b/tests/cpu/OCIOZArchive_tests.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpenColorIO/OpenColorIO.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp index 5d6d338ae..c4c8c9927 100644 --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "BitDepthUtils.h" #include "fileformats/FileFormatCTF.cpp" diff --git a/tests/cpu/transforms/CDLTransform_tests.cpp b/tests/cpu/transforms/CDLTransform_tests.cpp index 06bfe56db..5f3c1cad5 100644 --- a/tests/cpu/transforms/CDLTransform_tests.cpp +++ b/tests/cpu/transforms/CDLTransform_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "ops/exponent/ExponentOp.h" #include "ops/matrix/MatrixOpData.h" From e20712ebfd0c13b7a350826b0acf1a32f2f41257 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 13 Jan 2026 17:13:59 +0000 Subject: [PATCH 05/48] Minimise inclusions Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Baker.cpp | 2 +- src/OpenColorIO/Context.cpp | 2 +- src/OpenColorIO/ImagePacking.cpp | 6 ------ src/OpenColorIO/Logging.cpp | 1 - src/OpenColorIO/LookParse.cpp | 2 +- src/OpenColorIO/ParseUtils.cpp | 2 +- src/OpenColorIO/PathUtils.cpp | 1 - src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatPandora.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatVF.cpp | 2 +- src/OpenColorIO/ops/log/LogOp.cpp | 1 - src/OpenColorIO/ops/lut1d/Lut1DOp.cpp | 1 - src/apputils/strutil.cpp | 2 -- src/bindings/python/PyConfigIOProxy.cpp | 1 - 14 files changed, 7 insertions(+), 20 deletions(-) diff --git a/src/OpenColorIO/Baker.cpp b/src/OpenColorIO/Baker.cpp index e92a4f3d3..cd26dae26 100755 --- a/src/OpenColorIO/Baker.cpp +++ b/src/OpenColorIO/Baker.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp index b7e71ae6e..c9edd1559 100644 --- a/src/OpenColorIO/Context.cpp +++ b/src/OpenColorIO/Context.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include #include #include #include diff --git a/src/OpenColorIO/ImagePacking.cpp b/src/OpenColorIO/ImagePacking.cpp index 3c24c9a58..0acd10226 100644 --- a/src/OpenColorIO/ImagePacking.cpp +++ b/src/OpenColorIO/ImagePacking.cpp @@ -1,12 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include -#include -#include -#include #include diff --git a/src/OpenColorIO/Logging.cpp b/src/OpenColorIO/Logging.cpp index e40692db7..fb2296e26 100644 --- a/src/OpenColorIO/Logging.cpp +++ b/src/OpenColorIO/Logging.cpp @@ -3,7 +3,6 @@ #include #include -#include #include diff --git a/src/OpenColorIO/LookParse.cpp b/src/OpenColorIO/LookParse.cpp index e70a09cf4..29a8f6ae6 100644 --- a/src/OpenColorIO/LookParse.cpp +++ b/src/OpenColorIO/LookParse.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include #include diff --git a/src/OpenColorIO/ParseUtils.cpp b/src/OpenColorIO/ParseUtils.cpp index 47d4f2641..d0788d38a 100644 --- a/src/OpenColorIO/ParseUtils.cpp +++ b/src/OpenColorIO/ParseUtils.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp index 3a68d366b..48a992ff9 100644 --- a/src/OpenColorIO/PathUtils.cpp +++ b/src/OpenColorIO/PathUtils.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp index 6a76d968d..90a8451c7 100755 --- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatPandora.cpp b/src/OpenColorIO/fileformats/FileFormatPandora.cpp index 6d3632152..2644c3d6c 100755 --- a/src/OpenColorIO/fileformats/FileFormatPandora.cpp +++ b/src/OpenColorIO/fileformats/FileFormatPandora.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include #include #include diff --git a/src/OpenColorIO/fileformats/FileFormatVF.cpp b/src/OpenColorIO/fileformats/FileFormatVF.cpp index 902603034..ea0bff149 100755 --- a/src/OpenColorIO/fileformats/FileFormatVF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatVF.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/src/OpenColorIO/ops/log/LogOp.cpp b/src/OpenColorIO/ops/log/LogOp.cpp index 8eeff9b3b..7a9d59c18 100644 --- a/src/OpenColorIO/ops/log/LogOp.cpp +++ b/src/OpenColorIO/ops/log/LogOp.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp index 412462414..15f651f0a 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include diff --git a/src/apputils/strutil.cpp b/src/apputils/strutil.cpp index 747596f2e..3854ab492 100644 --- a/src/apputils/strutil.cpp +++ b/src/apputils/strutil.cpp @@ -33,8 +33,6 @@ #include #include #include -#include -#include #include "strutil.h" diff --git a/src/bindings/python/PyConfigIOProxy.cpp b/src/bindings/python/PyConfigIOProxy.cpp index 2c9aac83f..70384187f 100644 --- a/src/bindings/python/PyConfigIOProxy.cpp +++ b/src/bindings/python/PyConfigIOProxy.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include "PyOpenColorIO.h" From eab529cd2485f60674e4aa063b71df235513aba9 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 13 Jan 2026 18:09:56 +0000 Subject: [PATCH 06/48] Remove unused PrivateTypes includes Signed-off-by: Kevin Wheatley --- src/OpenColorIO/ColorSpace.cpp | 1 - src/OpenColorIO/ColorSpaceSet.cpp | 1 - src/OpenColorIO/Context.cpp | 1 - src/OpenColorIO/Display.h | 1 - src/OpenColorIO/Logging.cpp | 1 - src/OpenColorIO/OpBuilders.h | 1 - src/OpenColorIO/ParseUtils.h | 1 - src/OpenColorIO/PrivateTypes.h | 5 +---- src/OpenColorIO/Processor.cpp | 2 ++ src/OpenColorIO/Processor.h | 1 - src/OpenColorIO/TokensManager.h | 1 - src/OpenColorIO/fileformats/FormatMetadata.h | 1 - src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h | 1 - src/OpenColorIO/ops/OpTools.h | 1 - src/OpenColorIO/ops/lut1d/Lut1DOpData.h | 1 - src/OpenColorIO/ops/lut3d/Lut3DOpData.h | 1 - src/OpenColorIO/transforms/FileTransform.h | 1 - 17 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/OpenColorIO/ColorSpace.cpp b/src/OpenColorIO/ColorSpace.cpp index 98f776fe1..111b29720 100644 --- a/src/OpenColorIO/ColorSpace.cpp +++ b/src/OpenColorIO/ColorSpace.cpp @@ -10,7 +10,6 @@ #include "TokensManager.h" #include "Platform.h" -#include "PrivateTypes.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/ColorSpaceSet.cpp b/src/OpenColorIO/ColorSpaceSet.cpp index 99c659a61..1040704ff 100644 --- a/src/OpenColorIO/ColorSpaceSet.cpp +++ b/src/OpenColorIO/ColorSpaceSet.cpp @@ -6,7 +6,6 @@ #include -#include "PrivateTypes.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp index c9edd1559..a2764d68a 100644 --- a/src/OpenColorIO/Context.cpp +++ b/src/OpenColorIO/Context.cpp @@ -16,7 +16,6 @@ #include "Mutex.h" #include "OCIOZArchive.h" #include "PathUtils.h" -#include "PrivateTypes.h" #include "utils/StringUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/Display.h b/src/OpenColorIO/Display.h index 43e1b2cc9..f63ca5a78 100644 --- a/src/OpenColorIO/Display.h +++ b/src/OpenColorIO/Display.h @@ -12,7 +12,6 @@ #include #include "Platform.h" -#include "PrivateTypes.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/Logging.cpp b/src/OpenColorIO/Logging.cpp index fb2296e26..dd5ad9e30 100644 --- a/src/OpenColorIO/Logging.cpp +++ b/src/OpenColorIO/Logging.cpp @@ -9,7 +9,6 @@ #include "Logging.h" #include "Mutex.h" #include "Platform.h" -#include "PrivateTypes.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/OpBuilders.h b/src/OpenColorIO/OpBuilders.h index 369c2d001..d2143f194 100644 --- a/src/OpenColorIO/OpBuilders.h +++ b/src/OpenColorIO/OpBuilders.h @@ -9,7 +9,6 @@ #include "Op.h" #include "LookParse.h" -#include "PrivateTypes.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ParseUtils.h b/src/OpenColorIO/ParseUtils.h index 095e8b206..81a72512d 100644 --- a/src/OpenColorIO/ParseUtils.h +++ b/src/OpenColorIO/ParseUtils.h @@ -11,7 +11,6 @@ #include -#include "PrivateTypes.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/PrivateTypes.h b/src/OpenColorIO/PrivateTypes.h index 43226c4fc..857f31d07 100644 --- a/src/OpenColorIO/PrivateTypes.h +++ b/src/OpenColorIO/PrivateTypes.h @@ -9,6 +9,7 @@ #include #include +#include #include @@ -16,15 +17,11 @@ namespace OCIO_NAMESPACE { // Stl types of OCIO classes typedef std::map StringMap; -typedef std::map StringBoolMap; typedef std::set StringSet; typedef std::vector ConstTransformVec; typedef std::vector LookVec; -typedef std::vector TransformDirectionVec; - - } // namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/Processor.cpp b/src/OpenColorIO/Processor.cpp index dab0287df..0dca023f2 100755 --- a/src/OpenColorIO/Processor.cpp +++ b/src/OpenColorIO/Processor.cpp @@ -17,6 +17,8 @@ #include "Processor.h" #include "TransformBuilder.h" #include "utils/StringUtils.h" +#include "PrivateTypes.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/Processor.h b/src/OpenColorIO/Processor.h index 2bbddd9f2..2a8e4513c 100644 --- a/src/OpenColorIO/Processor.h +++ b/src/OpenColorIO/Processor.h @@ -10,7 +10,6 @@ #include "Caching.h" #include "Mutex.h" #include "Op.h" -#include "PrivateTypes.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/TokensManager.h b/src/OpenColorIO/TokensManager.h index 706487289..f25a41b51 100644 --- a/src/OpenColorIO/TokensManager.h +++ b/src/OpenColorIO/TokensManager.h @@ -10,7 +10,6 @@ #include -#include "PrivateTypes.h" #include "utils/StringUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/fileformats/FormatMetadata.h b/src/OpenColorIO/fileformats/FormatMetadata.h index 35c8cb2e0..0c182846a 100644 --- a/src/OpenColorIO/fileformats/FormatMetadata.h +++ b/src/OpenColorIO/fileformats/FormatMetadata.h @@ -10,7 +10,6 @@ #include -#include "PrivateTypes.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h index 203d3bcdf..5df6d8b15 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h @@ -11,7 +11,6 @@ #include "fileformats/xmlutils/XMLReaderUtils.h" #include "ops/cdl/CDLOpData.h" -#include "PrivateTypes.h" #include "transforms/CDLTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/ops/OpTools.h b/src/OpenColorIO/ops/OpTools.h index e103dab39..a9bc4a89c 100644 --- a/src/OpenColorIO/ops/OpTools.h +++ b/src/OpenColorIO/ops/OpTools.h @@ -8,7 +8,6 @@ #include #include "Op.h" -#include "PrivateTypes.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpData.h b/src/OpenColorIO/ops/lut1d/Lut1DOpData.h index d06ca8da6..f85e931b7 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpData.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpData.h @@ -8,7 +8,6 @@ #include "Op.h" #include "ops/OpArray.h" -#include "PrivateTypes.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpData.h b/src/OpenColorIO/ops/lut3d/Lut3DOpData.h index 370f496c7..940ba1391 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpData.h +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpData.h @@ -10,7 +10,6 @@ #include "Op.h" #include "ops/OpArray.h" -#include "PrivateTypes.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/FileTransform.h b/src/OpenColorIO/transforms/FileTransform.h index 19b2b8c73..68c204a39 100644 --- a/src/OpenColorIO/transforms/FileTransform.h +++ b/src/OpenColorIO/transforms/FileTransform.h @@ -12,7 +12,6 @@ #include "Op.h" #include "ops/noop/NoOps.h" -#include "PrivateTypes.h" #include "utils/StringUtils.h" From fde9068ebba848e15e27df3a2ee7aa083d2cc875 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 14 Jan 2026 10:05:43 +0000 Subject: [PATCH 07/48] Tidy up usage Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Baker.cpp | 1 + src/OpenColorIO/CPUProcessor.cpp | 1 + src/OpenColorIO/ConfigUtils.cpp | 2 ++ src/OpenColorIO/GpuShaderClassWrapper.cpp | 1 + src/OpenColorIO/GpuShaderClassWrapper.h | 1 - src/OpenColorIO/GpuShaderUtils.cpp | 1 + src/OpenColorIO/ImageDesc.cpp | 2 +- src/OpenColorIO/MathUtils.cpp | 1 - src/OpenColorIO/OCIOYaml.cpp | 1 + src/OpenColorIO/OCIOZArchive.h | 1 - src/OpenColorIO/Op.h | 2 +- src/OpenColorIO/ParseUtils.h | 1 - src/OpenColorIO/Platform.h | 1 + src/OpenColorIO/SystemMonitor_macos.cpp | 1 + src/OpenColorIO/ViewTransform.cpp | 1 + src/OpenColorIO/ViewingRules.cpp | 1 + src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp | 1 + src/OpenColorIO/fileformats/FileFormatCC.cpp | 2 ++ src/OpenColorIO/fileformats/FileFormatCCC.cpp | 1 + src/OpenColorIO/fileformats/FileFormatCDL.cpp | 1 + src/OpenColorIO/fileformats/FileFormatHDL.cpp | 1 + src/OpenColorIO/fileformats/FileFormatIridasCube.cpp | 1 + src/OpenColorIO/fileformats/FileFormatIridasItx.cpp | 1 + src/OpenColorIO/fileformats/FileFormatIridasLook.cpp | 1 + src/OpenColorIO/fileformats/FileFormatPandora.cpp | 2 +- src/OpenColorIO/fileformats/FileFormatResolveCube.cpp | 4 +--- src/OpenColorIO/fileformats/FileFormatTruelight.cpp | 1 + src/OpenColorIO/fileformats/FileFormatUtils.cpp | 1 + src/OpenColorIO/fileformats/FileFormatVF.cpp | 2 +- src/OpenColorIO/fileformats/FormatMetadata.cpp | 1 - src/OpenColorIO/fileformats/cdl/CDLWriter.cpp | 2 -- src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp | 1 + src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h | 1 + src/OpenColorIO/ops/allocation/AllocationOp.cpp | 1 + src/OpenColorIO/ops/fixedfunction/FixedFunctionOpGPU.cpp | 1 + src/OpenColorIO/ops/gamma/GammaOp.cpp | 2 ++ src/OpenColorIO/ops/log/LogOp.cpp | 1 + src/OpenColorIO/ops/log/LogUtils.cpp | 1 + src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp | 1 + src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp | 1 + src/OpenColorIO/transforms/AllocationTransform.cpp | 2 +- src/OpenColorIO/transforms/ColorSpaceTransform.cpp | 1 + src/OpenColorIO/transforms/DisplayViewTransform.cpp | 1 + src/OpenColorIO/transforms/ExponentTransform.cpp | 1 + src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp | 1 + src/OpenColorIO/transforms/ExposureContrastTransform.cpp | 3 +++ src/OpenColorIO/transforms/FixedFunctionTransform.cpp | 1 + src/OpenColorIO/transforms/GradingHueCurveTransform.cpp | 1 + src/OpenColorIO/transforms/GradingPrimaryTransform.cpp | 1 + src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp | 1 + src/OpenColorIO/transforms/GradingToneTransform.cpp | 1 + src/OpenColorIO/transforms/LogAffineTransform.cpp | 4 +--- src/OpenColorIO/transforms/LogCameraTransform.cpp | 4 +--- src/OpenColorIO/transforms/LogTransform.cpp | 4 +--- src/OpenColorIO/transforms/LookTransform.cpp | 6 +++--- src/OpenColorIO/transforms/MatrixTransform.cpp | 1 + src/apps/ociobakelut/ocioicc.cpp | 1 - src/apps/ociodisplay/main.cpp | 1 - src/apps/ociomakeclf/main.cpp | 1 + src/apps/ociomergeconfigs/main.cpp | 1 + src/apps/ocioperf/main.cpp | 1 + src/bindings/java/JNIColorSpace.cpp | 1 - src/bindings/java/JNIContext.cpp | 1 - src/bindings/java/JNIGpuShaderDesc.cpp | 1 - src/bindings/java/JNILook.cpp | 1 - src/bindings/java/JNIProcessor.cpp | 1 - src/bindings/java/JNIUtil.cpp | 3 +++ src/bindings/python/PyBuiltinTransformRegistry.cpp | 3 +++ src/bindings/python/PyCPUProcessor.cpp | 1 - src/bindings/python/PyGradingData.cpp | 2 -- src/bindings/python/PyImageDesc.cpp | 3 +++ src/bindings/python/PyNamedTransform.cpp | 2 -- src/bindings/python/PyProcessorMetadata.cpp | 2 -- src/bindings/python/PyUtils.h | 1 + src/bindings/python/apphelpers/PyMergeConfigs.cpp | 3 +++ src/bindings/python/apphelpers/PyMixingHelpers.cpp | 2 -- src/bindings/python/transforms/PyLut3DTransform.cpp | 2 -- tests/cpu/Baker_tests.cpp | 2 ++ tests/cpu/CPUProcessor_tests.cpp | 1 + tests/cpu/Caching_tests.cpp | 2 ++ tests/cpu/ConfigUtils_tests.cpp | 2 ++ tests/cpu/Config_tests.cpp | 1 + tests/cpu/Display_tests.cpp | 2 ++ tests/cpu/DynamicProperty_tests.cpp | 2 -- tests/cpu/FileRules_tests.cpp | 2 ++ tests/cpu/GpuShader_tests.cpp | 2 ++ tests/cpu/MathUtils_tests.cpp | 1 + tests/cpu/NamedTransform_tests.cpp | 2 ++ tests/cpu/OCIOZArchive_tests.cpp | 1 + tests/cpu/PathUtils_tests.cpp | 2 ++ tests/cpu/UnitTestUtils.cpp | 2 ++ tests/cpu/ViewingRules_tests.cpp | 2 ++ tests/cpu/apphelpers/CategoryHelpers_tests.cpp | 2 ++ tests/cpu/apphelpers/ColorSpaceHelpers_tests.cpp | 2 ++ tests/cpu/apphelpers/DisplayViewHelpers_tests.cpp | 2 ++ tests/cpu/apphelpers/LegacyViewingPipeline_tests.cpp | 2 ++ tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp | 1 + tests/cpu/apphelpers/MixingHelpers_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormat3DL_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCCC_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCC_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCDL_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCSP_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCTF_tests.cpp | 1 + tests/cpu/fileformats/FileFormatHDL_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatIridasCube_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatIridasItx_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatIridasLook_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatPandora_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatResolveCube_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatSpi1D_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatSpi3D_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatSpiMtx_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatTruelight_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatVF_tests.cpp | 1 + tests/cpu/fileformats/FormatMetadata_tests.cpp | 2 ++ tests/cpu/fileformats/ctf/CTFTransform_tests.cpp | 2 ++ tests/cpu/ops/cdl/CDLOp_tests.cpp | 1 + tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp | 1 + tests/cpu/ops/gamma/GammaOpCPU_tests.cpp | 1 + tests/cpu/ops/gradinghuecurve/GradingHueCurve_tests.cpp | 2 ++ tests/cpu/ops/gradingrgbcurve/GradingBSplineCurve_tests.cpp | 2 ++ tests/cpu/ops/gradingrgbcurve/GradingRGBCurve_tests.cpp | 2 ++ tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp | 1 + tests/cpu/transforms/BuiltinTransform_tests.cpp | 1 + tests/cpu/transforms/DisplayViewTransform_tests.cpp | 2 ++ tests/cpu/transforms/FileTransform_tests.cpp | 1 + tests/cpu/transforms/GradingHueCurveTransform_tests.cpp | 2 ++ tests/cpu/transforms/GradingPrimaryTransform_tests.cpp | 1 + tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp | 2 ++ tests/cpu/transforms/GradingToneTransform_tests.cpp | 1 + tests/cpu/transforms/GroupTransform_tests.cpp | 2 ++ tests/cpu/transforms/LookTransform_tests.cpp | 2 ++ tests/cpu/transforms/Lut1DTransform_tests.cpp | 2 ++ tests/cpu/transforms/Lut3DTransform_tests.cpp | 2 ++ .../transforms/builtins/BuiltinTransformRegistry_tests.cpp | 2 ++ tests/gpu/CDLOp_test.cpp | 1 - tests/gpu/Lut1DOp_test.cpp | 1 - tests/gpu/Lut3DOp_test.cpp | 1 - tests/gpu/RangeOp_test.cpp | 4 ---- tests/osl/UnitTestOSL.cpp | 2 ++ 141 files changed, 176 insertions(+), 54 deletions(-) diff --git a/src/OpenColorIO/Baker.cpp b/src/OpenColorIO/Baker.cpp index cd26dae26..5e0d6c957 100755 --- a/src/OpenColorIO/Baker.cpp +++ b/src/OpenColorIO/Baker.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/CPUProcessor.cpp b/src/OpenColorIO/CPUProcessor.cpp index 033083aed..c0d27c248 100644 --- a/src/OpenColorIO/CPUProcessor.cpp +++ b/src/OpenColorIO/CPUProcessor.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/ConfigUtils.cpp b/src/OpenColorIO/ConfigUtils.cpp index 9a5ecfcda..cb7f4c4dc 100644 --- a/src/OpenColorIO/ConfigUtils.cpp +++ b/src/OpenColorIO/ConfigUtils.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "ConfigUtils.h" diff --git a/src/OpenColorIO/GpuShaderClassWrapper.cpp b/src/OpenColorIO/GpuShaderClassWrapper.cpp index 675bd4716..5a13bac9e 100644 --- a/src/OpenColorIO/GpuShaderClassWrapper.cpp +++ b/src/OpenColorIO/GpuShaderClassWrapper.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/GpuShaderClassWrapper.h b/src/OpenColorIO/GpuShaderClassWrapper.h index cbe01b354..12527b46b 100644 --- a/src/OpenColorIO/GpuShaderClassWrapper.h +++ b/src/OpenColorIO/GpuShaderClassWrapper.h @@ -5,7 +5,6 @@ #define INCLUDED_OCIO_GPUSHADERCLASSWRAPPER_H #include -#include #include #include diff --git a/src/OpenColorIO/GpuShaderUtils.cpp b/src/OpenColorIO/GpuShaderUtils.cpp index 57f4a90c0..6843f6941 100644 --- a/src/OpenColorIO/GpuShaderUtils.cpp +++ b/src/OpenColorIO/GpuShaderUtils.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/ImageDesc.cpp b/src/OpenColorIO/ImageDesc.cpp index 2f045f159..5ba6c07b6 100644 --- a/src/OpenColorIO/ImageDesc.cpp +++ b/src/OpenColorIO/ImageDesc.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/src/OpenColorIO/MathUtils.cpp b/src/OpenColorIO/MathUtils.cpp index bfe171e80..fa1986025 100644 --- a/src/OpenColorIO/MathUtils.cpp +++ b/src/OpenColorIO/MathUtils.cpp @@ -3,7 +3,6 @@ #include -#include #include #include #include diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp index 5968e6a3e..8c31c3910 100644 --- a/src/OpenColorIO/OCIOYaml.cpp +++ b/src/OpenColorIO/OCIOYaml.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/OCIOZArchive.h b/src/OpenColorIO/OCIOZArchive.h index 8518a3f91..cc11e1973 100644 --- a/src/OpenColorIO/OCIOZArchive.h +++ b/src/OpenColorIO/OCIOZArchive.h @@ -5,7 +5,6 @@ #ifndef INCLUDED_OCIO_ARCHIVEUTILS_H #define INCLUDED_OCIO_ARCHIVEUTILS_H -#include #include #include #include diff --git a/src/OpenColorIO/Op.h b/src/OpenColorIO/Op.h index 895c426d8..c78cb0f3d 100644 --- a/src/OpenColorIO/Op.h +++ b/src/OpenColorIO/Op.h @@ -5,7 +5,7 @@ #ifndef INCLUDED_OCIO_OP_H #define INCLUDED_OCIO_OP_H -#include +#include #include #include diff --git a/src/OpenColorIO/ParseUtils.h b/src/OpenColorIO/ParseUtils.h index 81a72512d..199219128 100644 --- a/src/OpenColorIO/ParseUtils.h +++ b/src/OpenColorIO/ParseUtils.h @@ -5,7 +5,6 @@ #define INCLUDED_OCIO_PARSEUTILS_H -#include #include #include diff --git a/src/OpenColorIO/Platform.h b/src/OpenColorIO/Platform.h index 67413c76f..50652eb39 100644 --- a/src/OpenColorIO/Platform.h +++ b/src/OpenColorIO/Platform.h @@ -22,6 +22,7 @@ #include #include +#include // Missing functions on Windows. diff --git a/src/OpenColorIO/SystemMonitor_macos.cpp b/src/OpenColorIO/SystemMonitor_macos.cpp index 4b212e685..4b9f6032a 100644 --- a/src/OpenColorIO/SystemMonitor_macos.cpp +++ b/src/OpenColorIO/SystemMonitor_macos.cpp @@ -8,6 +8,7 @@ #endif +#include #include #include diff --git a/src/OpenColorIO/ViewTransform.cpp b/src/OpenColorIO/ViewTransform.cpp index c14d6021a..57cb1a7f1 100644 --- a/src/OpenColorIO/ViewTransform.cpp +++ b/src/OpenColorIO/ViewTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/ViewingRules.cpp b/src/OpenColorIO/ViewingRules.cpp index 2db7d1e49..1a7ff20ad 100644 --- a/src/OpenColorIO/ViewingRules.cpp +++ b/src/OpenColorIO/ViewingRules.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp index 3afddf347..c6bde76fe 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatCC.cpp b/src/OpenColorIO/fileformats/FileFormatCC.cpp index d8791f819..d42778fec 100755 --- a/src/OpenColorIO/fileformats/FileFormatCC.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCC.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "fileformats/cdl/CDLParser.h" diff --git a/src/OpenColorIO/fileformats/FileFormatCCC.cpp b/src/OpenColorIO/fileformats/FileFormatCCC.cpp index bad7723ef..14c822a2f 100755 --- a/src/OpenColorIO/fileformats/FileFormatCCC.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCCC.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatCDL.cpp b/src/OpenColorIO/fileformats/FileFormatCDL.cpp index 5da6aae95..625c834ec 100755 --- a/src/OpenColorIO/fileformats/FileFormatCDL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCDL.cpp @@ -27,6 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatHDL.cpp b/src/OpenColorIO/fileformats/FileFormatHDL.cpp index 16e0ffab5..a96218431 100755 --- a/src/OpenColorIO/fileformats/FileFormatHDL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatHDL.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp b/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp index ca2965e37..d96815baa 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp b/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp index ae6282efb..c2ea5c313 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp index 0ba209a90..0d9c36508 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatPandora.cpp b/src/OpenColorIO/fileformats/FileFormatPandora.cpp index 2644c3d6c..36f2f6cb8 100755 --- a/src/OpenColorIO/fileformats/FileFormatPandora.cpp +++ b/src/OpenColorIO/fileformats/FileFormatPandora.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp b/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp index 6b5e0da8d..b2a77795e 100755 --- a/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp +++ b/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp @@ -2,9 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include -#include -#include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatTruelight.cpp b/src/OpenColorIO/fileformats/FileFormatTruelight.cpp index 0d95261cc..586f8c6aa 100755 --- a/src/OpenColorIO/fileformats/FileFormatTruelight.cpp +++ b/src/OpenColorIO/fileformats/FileFormatTruelight.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatUtils.cpp b/src/OpenColorIO/fileformats/FileFormatUtils.cpp index 1e1906ba9..d0f94be79 100644 --- a/src/OpenColorIO/fileformats/FileFormatUtils.cpp +++ b/src/OpenColorIO/fileformats/FileFormatUtils.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include "fileformats/FileFormatUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatVF.cpp b/src/OpenColorIO/fileformats/FileFormatVF.cpp index ea0bff149..3c11ef18d 100755 --- a/src/OpenColorIO/fileformats/FileFormatVF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatVF.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include diff --git a/src/OpenColorIO/fileformats/FormatMetadata.cpp b/src/OpenColorIO/fileformats/FormatMetadata.cpp index 8b5fe1cfa..eb89ec399 100644 --- a/src/OpenColorIO/fileformats/FormatMetadata.cpp +++ b/src/OpenColorIO/fileformats/FormatMetadata.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include diff --git a/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp b/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp index 809785ec9..83219477a 100644 --- a/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp +++ b/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "fileformats/cdl/CDLWriter.h" #include "fileformats/xmlutils/XMLReaderUtils.h" #include "fileformats/xmlutils/XMLWriterUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp index be56d238b..913193ddc 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderHelper.h" diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h index 5df6d8b15..6b86833a6 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h @@ -6,6 +6,7 @@ #include +#include #include diff --git a/src/OpenColorIO/ops/allocation/AllocationOp.cpp b/src/OpenColorIO/ops/allocation/AllocationOp.cpp index e8141e38f..11729f88e 100644 --- a/src/OpenColorIO/ops/allocation/AllocationOp.cpp +++ b/src/OpenColorIO/ops/allocation/AllocationOp.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpGPU.cpp b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpGPU.cpp index 6f3070d55..8699c7c1d 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpGPU.cpp +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpGPU.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/ops/gamma/GammaOp.cpp b/src/OpenColorIO/ops/gamma/GammaOp.cpp index 9d6afccc7..aaf16219e 100644 --- a/src/OpenColorIO/ops/gamma/GammaOp.cpp +++ b/src/OpenColorIO/ops/gamma/GammaOp.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "GpuShaderUtils.h" diff --git a/src/OpenColorIO/ops/log/LogOp.cpp b/src/OpenColorIO/ops/log/LogOp.cpp index 7a9d59c18..feb674d37 100644 --- a/src/OpenColorIO/ops/log/LogOp.cpp +++ b/src/OpenColorIO/ops/log/LogOp.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/ops/log/LogUtils.cpp b/src/OpenColorIO/ops/log/LogUtils.cpp index 77548acfe..e02333777 100644 --- a/src/OpenColorIO/ops/log/LogUtils.cpp +++ b/src/OpenColorIO/ops/log/LogUtils.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp index f90185980..fb81b2be8 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp index e81bd180b..79aab8fd3 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/AllocationTransform.cpp b/src/OpenColorIO/transforms/AllocationTransform.cpp index eeca74431..5782bb55a 100755 --- a/src/OpenColorIO/transforms/AllocationTransform.cpp +++ b/src/OpenColorIO/transforms/AllocationTransform.cpp @@ -2,8 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include +#include #include diff --git a/src/OpenColorIO/transforms/ColorSpaceTransform.cpp b/src/OpenColorIO/transforms/ColorSpaceTransform.cpp index 2039ea66b..cd79715a6 100755 --- a/src/OpenColorIO/transforms/ColorSpaceTransform.cpp +++ b/src/OpenColorIO/transforms/ColorSpaceTransform.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/transforms/DisplayViewTransform.cpp b/src/OpenColorIO/transforms/DisplayViewTransform.cpp index 629008cf3..2288283ee 100644 --- a/src/OpenColorIO/transforms/DisplayViewTransform.cpp +++ b/src/OpenColorIO/transforms/DisplayViewTransform.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/transforms/ExponentTransform.cpp b/src/OpenColorIO/transforms/ExponentTransform.cpp index 1ceb57675..22eaf615b 100755 --- a/src/OpenColorIO/transforms/ExponentTransform.cpp +++ b/src/OpenColorIO/transforms/ExponentTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp b/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp index 5e93f0aec..44eb6dfc6 100644 --- a/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp +++ b/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/ExposureContrastTransform.cpp b/src/OpenColorIO/transforms/ExposureContrastTransform.cpp index 49b8bbb31..5a3f1ca96 100644 --- a/src/OpenColorIO/transforms/ExposureContrastTransform.cpp +++ b/src/OpenColorIO/transforms/ExposureContrastTransform.cpp @@ -1,10 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "transforms/ExposureContrastTransform.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/transforms/FixedFunctionTransform.cpp b/src/OpenColorIO/transforms/FixedFunctionTransform.cpp index 07baef12a..a71025dd0 100644 --- a/src/OpenColorIO/transforms/FixedFunctionTransform.cpp +++ b/src/OpenColorIO/transforms/FixedFunctionTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp b/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp index da959e7b4..83e47d4ed 100644 --- a/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp +++ b/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp b/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp index c013866c9..8caaacfe6 100644 --- a/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp +++ b/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp b/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp index e9772e667..a8904ce83 100644 --- a/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp +++ b/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/GradingToneTransform.cpp b/src/OpenColorIO/transforms/GradingToneTransform.cpp index 5031612d9..392b4d4fa 100644 --- a/src/OpenColorIO/transforms/GradingToneTransform.cpp +++ b/src/OpenColorIO/transforms/GradingToneTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/transforms/LogAffineTransform.cpp b/src/OpenColorIO/transforms/LogAffineTransform.cpp index 6711a75fe..38be100b4 100644 --- a/src/OpenColorIO/transforms/LogAffineTransform.cpp +++ b/src/OpenColorIO/transforms/LogAffineTransform.cpp @@ -1,9 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include +#include #include diff --git a/src/OpenColorIO/transforms/LogCameraTransform.cpp b/src/OpenColorIO/transforms/LogCameraTransform.cpp index 1f4188417..b812629da 100644 --- a/src/OpenColorIO/transforms/LogCameraTransform.cpp +++ b/src/OpenColorIO/transforms/LogCameraTransform.cpp @@ -1,9 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include +#include #include diff --git a/src/OpenColorIO/transforms/LogTransform.cpp b/src/OpenColorIO/transforms/LogTransform.cpp index ad6d13d15..db80e57e2 100755 --- a/src/OpenColorIO/transforms/LogTransform.cpp +++ b/src/OpenColorIO/transforms/LogTransform.cpp @@ -1,9 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include +#include #include diff --git a/src/OpenColorIO/transforms/LookTransform.cpp b/src/OpenColorIO/transforms/LookTransform.cpp index 8d41ba628..68a064029 100755 --- a/src/OpenColorIO/transforms/LookTransform.cpp +++ b/src/OpenColorIO/transforms/LookTransform.cpp @@ -1,10 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include -#include +#include + +#include #include "ContextVariableUtils.h" #include "LookParse.h" diff --git a/src/OpenColorIO/transforms/MatrixTransform.cpp b/src/OpenColorIO/transforms/MatrixTransform.cpp index ff73b918a..e9293c146 100755 --- a/src/OpenColorIO/transforms/MatrixTransform.cpp +++ b/src/OpenColorIO/transforms/MatrixTransform.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/apps/ociobakelut/ocioicc.cpp b/src/apps/ociobakelut/ocioicc.cpp index 55f5d7e40..a946275c7 100644 --- a/src/apps/ociobakelut/ocioicc.cpp +++ b/src/apps/ociobakelut/ocioicc.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/src/apps/ociodisplay/main.cpp b/src/apps/ociodisplay/main.cpp index ed7f09759..e59416c81 100644 --- a/src/apps/ociodisplay/main.cpp +++ b/src/apps/ociodisplay/main.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/src/apps/ociomakeclf/main.cpp b/src/apps/ociomakeclf/main.cpp index b79c77132..892d7fdcd 100644 --- a/src/apps/ociomakeclf/main.cpp +++ b/src/apps/ociomakeclf/main.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include diff --git a/src/apps/ociomergeconfigs/main.cpp b/src/apps/ociomergeconfigs/main.cpp index 7069e15f9..00d48d42e 100644 --- a/src/apps/ociomergeconfigs/main.cpp +++ b/src/apps/ociomergeconfigs/main.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp index a8b8ebe00..f14c907ae 100644 --- a/src/apps/ocioperf/main.cpp +++ b/src/apps/ocioperf/main.cpp @@ -10,6 +10,7 @@ #include #include #include +#include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/bindings/java/JNIColorSpace.cpp b/src/bindings/java/JNIColorSpace.cpp index 423da186c..a1254b989 100644 --- a/src/bindings/java/JNIColorSpace.cpp +++ b/src/bindings/java/JNIColorSpace.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include "OpenColorIO/OpenColorIO.h" diff --git a/src/bindings/java/JNIContext.cpp b/src/bindings/java/JNIContext.cpp index 9d2d25527..4093b1ea0 100644 --- a/src/bindings/java/JNIContext.cpp +++ b/src/bindings/java/JNIContext.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include "OpenColorIO/OpenColorIO.h" #include "OpenColorIOJNI.h" diff --git a/src/bindings/java/JNIGpuShaderDesc.cpp b/src/bindings/java/JNIGpuShaderDesc.cpp index 3ceedf3be..2f151b340 100644 --- a/src/bindings/java/JNIGpuShaderDesc.cpp +++ b/src/bindings/java/JNIGpuShaderDesc.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include "OpenColorIO/OpenColorIO.h" #include "OpenColorIOJNI.h" diff --git a/src/bindings/java/JNILook.cpp b/src/bindings/java/JNILook.cpp index fc76c6692..ce482a164 100644 --- a/src/bindings/java/JNILook.cpp +++ b/src/bindings/java/JNILook.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include "OpenColorIO/OpenColorIO.h" diff --git a/src/bindings/java/JNIProcessor.cpp b/src/bindings/java/JNIProcessor.cpp index 1e6b456da..a2449e4a7 100644 --- a/src/bindings/java/JNIProcessor.cpp +++ b/src/bindings/java/JNIProcessor.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include "OpenColorIO/OpenColorIO.h" diff --git a/src/bindings/java/JNIUtil.cpp b/src/bindings/java/JNIUtil.cpp index eae5fbe2a..3887f2a57 100644 --- a/src/bindings/java/JNIUtil.cpp +++ b/src/bindings/java/JNIUtil.cpp @@ -1,10 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "JNIUtil.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp index c1fc3bad5..a00601a09 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.cpp +++ b/src/bindings/python/PyBuiltinTransformRegistry.cpp @@ -1,9 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyBuiltinTransformRegistry.h" #include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyCPUProcessor.cpp b/src/bindings/python/PyCPUProcessor.cpp index e5786ba24..e6ce5015c 100644 --- a/src/bindings/python/PyCPUProcessor.cpp +++ b/src/bindings/python/PyCPUProcessor.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include "PyDynamicProperty.h" diff --git a/src/bindings/python/PyGradingData.cpp b/src/bindings/python/PyGradingData.cpp index a1a093d7b..eb2ecb82d 100644 --- a/src/bindings/python/PyGradingData.cpp +++ b/src/bindings/python/PyGradingData.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyImageDesc.cpp b/src/bindings/python/PyImageDesc.cpp index ff762b1ff..a30d915d5 100644 --- a/src/bindings/python/PyImageDesc.cpp +++ b/src/bindings/python/PyImageDesc.cpp @@ -1,8 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyImageDesc.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyNamedTransform.cpp b/src/bindings/python/PyNamedTransform.cpp index 10205a88f..9d3b70967 100644 --- a/src/bindings/python/PyNamedTransform.cpp +++ b/src/bindings/python/PyNamedTransform.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyProcessorMetadata.cpp b/src/bindings/python/PyProcessorMetadata.cpp index 736790f2d..55977f760 100644 --- a/src/bindings/python/PyProcessorMetadata.cpp +++ b/src/bindings/python/PyProcessorMetadata.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyUtils.h b/src/bindings/python/PyUtils.h index 8e0ca44ef..81508894a 100644 --- a/src/bindings/python/PyUtils.h +++ b/src/bindings/python/PyUtils.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "PyOpenColorIO.h" diff --git a/src/bindings/python/apphelpers/PyMergeConfigs.cpp b/src/bindings/python/apphelpers/PyMergeConfigs.cpp index d5104bf55..a75d1adf2 100644 --- a/src/bindings/python/apphelpers/PyMergeConfigs.cpp +++ b/src/bindings/python/apphelpers/PyMergeConfigs.cpp @@ -1,9 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyMixingHelpers.cpp b/src/bindings/python/apphelpers/PyMixingHelpers.cpp index 5711b1182..94203c3f4 100644 --- a/src/bindings/python/apphelpers/PyMixingHelpers.cpp +++ b/src/bindings/python/apphelpers/PyMixingHelpers.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/transforms/PyLut3DTransform.cpp b/src/bindings/python/transforms/PyLut3DTransform.cpp index bf5d282d8..2d91f7f05 100644 --- a/src/bindings/python/transforms/PyLut3DTransform.cpp +++ b/src/bindings/python/transforms/PyLut3DTransform.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include "PyTransform.h" namespace OCIO_NAMESPACE diff --git a/tests/cpu/Baker_tests.cpp b/tests/cpu/Baker_tests.cpp index db68bb7e4..b139c83d8 100644 --- a/tests/cpu/Baker_tests.cpp +++ b/tests/cpu/Baker_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "Baker.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/CPUProcessor_tests.cpp b/tests/cpu/CPUProcessor_tests.cpp index 10ce908b1..081cd6159 100644 --- a/tests/cpu/CPUProcessor_tests.cpp +++ b/tests/cpu/CPUProcessor_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "CPUProcessor.cpp" diff --git a/tests/cpu/Caching_tests.cpp b/tests/cpu/Caching_tests.cpp index 94f93ba23..45f926846 100644 --- a/tests/cpu/Caching_tests.cpp +++ b/tests/cpu/Caching_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "Caching.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ConfigUtils_tests.cpp b/tests/cpu/ConfigUtils_tests.cpp index c485a5149..0917a7a38 100644 --- a/tests/cpu/ConfigUtils_tests.cpp +++ b/tests/cpu/ConfigUtils_tests.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "UnitTestUtils.h" #include "ConfigUtils.h" diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp index 95ed49b0a..39b3aa335 100644 --- a/tests/cpu/Config_tests.cpp +++ b/tests/cpu/Config_tests.cpp @@ -4,6 +4,7 @@ #include #include +#include #include diff --git a/tests/cpu/Display_tests.cpp b/tests/cpu/Display_tests.cpp index f2646aec6..1732db19c 100644 --- a/tests/cpu/Display_tests.cpp +++ b/tests/cpu/Display_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "Display.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/DynamicProperty_tests.cpp b/tests/cpu/DynamicProperty_tests.cpp index ce00daed7..7a9e4d488 100644 --- a/tests/cpu/DynamicProperty_tests.cpp +++ b/tests/cpu/DynamicProperty_tests.cpp @@ -2,8 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. -#include - #include "DynamicProperty.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/FileRules_tests.cpp b/tests/cpu/FileRules_tests.cpp index b9c1d05c6..fd5001a48 100644 --- a/tests/cpu/FileRules_tests.cpp +++ b/tests/cpu/FileRules_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "FileRules.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/GpuShader_tests.cpp b/tests/cpu/GpuShader_tests.cpp index eb2bc09dc..742dd6cff 100644 --- a/tests/cpu/GpuShader_tests.cpp +++ b/tests/cpu/GpuShader_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "GpuShader.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/MathUtils_tests.cpp b/tests/cpu/MathUtils_tests.cpp index fda8c82b5..a6dfd1b1e 100644 --- a/tests/cpu/MathUtils_tests.cpp +++ b/tests/cpu/MathUtils_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "MathUtils.cpp" diff --git a/tests/cpu/NamedTransform_tests.cpp b/tests/cpu/NamedTransform_tests.cpp index 5a05cae41..5ffb62c0b 100644 --- a/tests/cpu/NamedTransform_tests.cpp +++ b/tests/cpu/NamedTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "NamedTransform.cpp" #include "Platform.h" diff --git a/tests/cpu/OCIOZArchive_tests.cpp b/tests/cpu/OCIOZArchive_tests.cpp index c7cb26c96..9ccbef31f 100644 --- a/tests/cpu/OCIOZArchive_tests.cpp +++ b/tests/cpu/OCIOZArchive_tests.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include "OpenColorIO/OpenColorIO.h" #include "testutils/UnitTest.h" diff --git a/tests/cpu/PathUtils_tests.cpp b/tests/cpu/PathUtils_tests.cpp index d7d2b3432..d67f30881 100644 --- a/tests/cpu/PathUtils_tests.cpp +++ b/tests/cpu/PathUtils_tests.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PathUtils.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/UnitTestUtils.cpp b/tests/cpu/UnitTestUtils.cpp index e09b7f5ec..f3cf688ed 100644 --- a/tests/cpu/UnitTestUtils.cpp +++ b/tests/cpu/UnitTestUtils.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "Logging.h" diff --git a/tests/cpu/ViewingRules_tests.cpp b/tests/cpu/ViewingRules_tests.cpp index a58ffaf63..4a798bd5f 100644 --- a/tests/cpu/ViewingRules_tests.cpp +++ b/tests/cpu/ViewingRules_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ViewingRules.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/apphelpers/CategoryHelpers_tests.cpp b/tests/cpu/apphelpers/CategoryHelpers_tests.cpp index a65f79e51..3d0fd0eac 100644 --- a/tests/cpu/apphelpers/CategoryHelpers_tests.cpp +++ b/tests/cpu/apphelpers/CategoryHelpers_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "apphelpers/CategoryHelpers.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/apphelpers/ColorSpaceHelpers_tests.cpp b/tests/cpu/apphelpers/ColorSpaceHelpers_tests.cpp index 1ac402b40..212625980 100644 --- a/tests/cpu/apphelpers/ColorSpaceHelpers_tests.cpp +++ b/tests/cpu/apphelpers/ColorSpaceHelpers_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "apphelpers/ColorSpaceHelpers.cpp" #include "testutils/UnitTest.h" #include "UnitTestLogUtils.h" diff --git a/tests/cpu/apphelpers/DisplayViewHelpers_tests.cpp b/tests/cpu/apphelpers/DisplayViewHelpers_tests.cpp index 2ee1ca258..46e119003 100644 --- a/tests/cpu/apphelpers/DisplayViewHelpers_tests.cpp +++ b/tests/cpu/apphelpers/DisplayViewHelpers_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "apphelpers/DisplayViewHelpers.cpp" #include "testutils/UnitTest.h" #include "UnitTestLogUtils.h" diff --git a/tests/cpu/apphelpers/LegacyViewingPipeline_tests.cpp b/tests/cpu/apphelpers/LegacyViewingPipeline_tests.cpp index 1c41d9dd9..11a187694 100644 --- a/tests/cpu/apphelpers/LegacyViewingPipeline_tests.cpp +++ b/tests/cpu/apphelpers/LegacyViewingPipeline_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "apphelpers/LegacyViewingPipeline.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp index 26dd83acc..0c8bd7597 100644 --- a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp +++ b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include "apphelpers/mergeconfigs/MergeConfigsHelpers.cpp" diff --git a/tests/cpu/apphelpers/MixingHelpers_tests.cpp b/tests/cpu/apphelpers/MixingHelpers_tests.cpp index eda330b5c..5e69d4792 100644 --- a/tests/cpu/apphelpers/MixingHelpers_tests.cpp +++ b/tests/cpu/apphelpers/MixingHelpers_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "apphelpers/MixingHelpers.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormat3DL_tests.cpp b/tests/cpu/fileformats/FileFormat3DL_tests.cpp index e237694f9..408f08f8d 100644 --- a/tests/cpu/fileformats/FileFormat3DL_tests.cpp +++ b/tests/cpu/fileformats/FileFormat3DL_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormat3DL.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatCCC_tests.cpp b/tests/cpu/fileformats/FileFormatCCC_tests.cpp index 74c19e57c..81f3468fb 100644 --- a/tests/cpu/fileformats/FileFormatCCC_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCCC_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatCCC.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatCC_tests.cpp b/tests/cpu/fileformats/FileFormatCC_tests.cpp index 4b3145577..b3d79b0d6 100644 --- a/tests/cpu/fileformats/FileFormatCC_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCC_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatCC.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatCDL_tests.cpp b/tests/cpu/fileformats/FileFormatCDL_tests.cpp index cdd4a840b..bcf3d33e8 100644 --- a/tests/cpu/fileformats/FileFormatCDL_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCDL_tests.cpp @@ -27,6 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include + #include "fileformats/FileFormatCDL.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatCSP_tests.cpp b/tests/cpu/fileformats/FileFormatCSP_tests.cpp index 00541c774..1dee552be 100644 --- a/tests/cpu/fileformats/FileFormatCSP_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCSP_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatCSP.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp index c4c8c9927..61adc3c0a 100644 --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp @@ -4,6 +4,7 @@ #include #include +#include #include "BitDepthUtils.h" #include "fileformats/FileFormatCTF.cpp" diff --git a/tests/cpu/fileformats/FileFormatHDL_tests.cpp b/tests/cpu/fileformats/FileFormatHDL_tests.cpp index 0b78d7228..0def9deae 100644 --- a/tests/cpu/fileformats/FileFormatHDL_tests.cpp +++ b/tests/cpu/fileformats/FileFormatHDL_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatHDL.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatIridasCube_tests.cpp b/tests/cpu/fileformats/FileFormatIridasCube_tests.cpp index b834ce10a..5287a3ed9 100644 --- a/tests/cpu/fileformats/FileFormatIridasCube_tests.cpp +++ b/tests/cpu/fileformats/FileFormatIridasCube_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatIridasCube.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatIridasItx_tests.cpp b/tests/cpu/fileformats/FileFormatIridasItx_tests.cpp index 242183d72..601c35710 100644 --- a/tests/cpu/fileformats/FileFormatIridasItx_tests.cpp +++ b/tests/cpu/fileformats/FileFormatIridasItx_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatIridasItx.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatIridasLook_tests.cpp b/tests/cpu/fileformats/FileFormatIridasLook_tests.cpp index 6a864de07..6f9320664 100644 --- a/tests/cpu/fileformats/FileFormatIridasLook_tests.cpp +++ b/tests/cpu/fileformats/FileFormatIridasLook_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatIridasLook.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatPandora_tests.cpp b/tests/cpu/fileformats/FileFormatPandora_tests.cpp index 3ec6454e9..4189f93a7 100644 --- a/tests/cpu/fileformats/FileFormatPandora_tests.cpp +++ b/tests/cpu/fileformats/FileFormatPandora_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatPandora.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatResolveCube_tests.cpp b/tests/cpu/fileformats/FileFormatResolveCube_tests.cpp index 6888d63d8..a5329118a 100644 --- a/tests/cpu/fileformats/FileFormatResolveCube_tests.cpp +++ b/tests/cpu/fileformats/FileFormatResolveCube_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatResolveCube.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatSpi1D_tests.cpp b/tests/cpu/fileformats/FileFormatSpi1D_tests.cpp index 17f840e7a..e1cfb77a0 100644 --- a/tests/cpu/fileformats/FileFormatSpi1D_tests.cpp +++ b/tests/cpu/fileformats/FileFormatSpi1D_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatSpi1D.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatSpi3D_tests.cpp b/tests/cpu/fileformats/FileFormatSpi3D_tests.cpp index 40264f77c..7c463ada3 100644 --- a/tests/cpu/fileformats/FileFormatSpi3D_tests.cpp +++ b/tests/cpu/fileformats/FileFormatSpi3D_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatSpi3D.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatSpiMtx_tests.cpp b/tests/cpu/fileformats/FileFormatSpiMtx_tests.cpp index 64f9e666c..8074186f1 100644 --- a/tests/cpu/fileformats/FileFormatSpiMtx_tests.cpp +++ b/tests/cpu/fileformats/FileFormatSpiMtx_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatSpiMtx.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatTruelight_tests.cpp b/tests/cpu/fileformats/FileFormatTruelight_tests.cpp index 79e1f5460..48d0d59ef 100644 --- a/tests/cpu/fileformats/FileFormatTruelight_tests.cpp +++ b/tests/cpu/fileformats/FileFormatTruelight_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FileFormatTruelight.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/FileFormatVF_tests.cpp b/tests/cpu/fileformats/FileFormatVF_tests.cpp index a90d10fef..9d482e233 100644 --- a/tests/cpu/fileformats/FileFormatVF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatVF_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "fileformats/FileFormatVF.cpp" diff --git a/tests/cpu/fileformats/FormatMetadata_tests.cpp b/tests/cpu/fileformats/FormatMetadata_tests.cpp index fdc447a46..5569c8ac2 100644 --- a/tests/cpu/fileformats/FormatMetadata_tests.cpp +++ b/tests/cpu/fileformats/FormatMetadata_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/FormatMetadata.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/fileformats/ctf/CTFTransform_tests.cpp b/tests/cpu/fileformats/ctf/CTFTransform_tests.cpp index c5ec9c2e9..a8457adac 100644 --- a/tests/cpu/fileformats/ctf/CTFTransform_tests.cpp +++ b/tests/cpu/fileformats/ctf/CTFTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/ctf/CTFTransform.cpp" #include "ops/matrix/MatrixOpData.h" diff --git a/tests/cpu/ops/cdl/CDLOp_tests.cpp b/tests/cpu/ops/cdl/CDLOp_tests.cpp index f4e222051..02c734c3d 100644 --- a/tests/cpu/ops/cdl/CDLOp_tests.cpp +++ b/tests/cpu/ops/cdl/CDLOp_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "ops/cdl/CDLOp.cpp" diff --git a/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp b/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp index 7af081d04..195a63fa8 100644 --- a/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp +++ b/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "ops/fixedfunction/FixedFunctionOpCPU.cpp" diff --git a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp index b81804e92..beb28b63e 100644 --- a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp +++ b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "ops/gamma/GammaOpCPU.cpp" diff --git a/tests/cpu/ops/gradinghuecurve/GradingHueCurve_tests.cpp b/tests/cpu/ops/gradinghuecurve/GradingHueCurve_tests.cpp index 621846cf6..9bdadc7ba 100644 --- a/tests/cpu/ops/gradinghuecurve/GradingHueCurve_tests.cpp +++ b/tests/cpu/ops/gradinghuecurve/GradingHueCurve_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "DynamicProperty.h" #include "ops/gradinghuecurve/GradingHueCurve.cpp" diff --git a/tests/cpu/ops/gradingrgbcurve/GradingBSplineCurve_tests.cpp b/tests/cpu/ops/gradingrgbcurve/GradingBSplineCurve_tests.cpp index b0f5a48c4..d9de92b98 100644 --- a/tests/cpu/ops/gradingrgbcurve/GradingBSplineCurve_tests.cpp +++ b/tests/cpu/ops/gradingrgbcurve/GradingBSplineCurve_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gradingrgbcurve/GradingBSplineCurve.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurve_tests.cpp b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurve_tests.cpp index 167463a2e..497ecc9d7 100644 --- a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurve_tests.cpp +++ b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurve_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "DynamicProperty.h" #include "ops/gradingrgbcurve/GradingRGBCurve.cpp" diff --git a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp index 0a3fcebce..2b3558c6d 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "ops/lut1d/Lut1DOpCPU.cpp" diff --git a/tests/cpu/transforms/BuiltinTransform_tests.cpp b/tests/cpu/transforms/BuiltinTransform_tests.cpp index 5c97af9ed..99a5ae6f2 100644 --- a/tests/cpu/transforms/BuiltinTransform_tests.cpp +++ b/tests/cpu/transforms/BuiltinTransform_tests.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include "transforms/BuiltinTransform.cpp" diff --git a/tests/cpu/transforms/DisplayViewTransform_tests.cpp b/tests/cpu/transforms/DisplayViewTransform_tests.cpp index 082ea3ee0..b3a1852ff 100644 --- a/tests/cpu/transforms/DisplayViewTransform_tests.cpp +++ b/tests/cpu/transforms/DisplayViewTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/DisplayViewTransform.cpp" #include "ops/cdl/CDLOpData.h" diff --git a/tests/cpu/transforms/FileTransform_tests.cpp b/tests/cpu/transforms/FileTransform_tests.cpp index 9b78b9c50..5cc371fc5 100644 --- a/tests/cpu/transforms/FileTransform_tests.cpp +++ b/tests/cpu/transforms/FileTransform_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "transforms/FileTransform.cpp" diff --git a/tests/cpu/transforms/GradingHueCurveTransform_tests.cpp b/tests/cpu/transforms/GradingHueCurveTransform_tests.cpp index 26d5bba75..a7776f528 100644 --- a/tests/cpu/transforms/GradingHueCurveTransform_tests.cpp +++ b/tests/cpu/transforms/GradingHueCurveTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gradingrgbcurve/GradingBSplineCurve.h" #include "transforms/GradingHueCurveTransform.cpp" diff --git a/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp b/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp index 6e1109ad0..edc007b65 100644 --- a/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp +++ b/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "MathUtils.h" diff --git a/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp b/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp index 26b568f8f..27e2c7bf9 100644 --- a/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp +++ b/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/gradingrgbcurve/GradingBSplineCurve.h" #include "transforms/GradingRGBCurveTransform.cpp" diff --git a/tests/cpu/transforms/GradingToneTransform_tests.cpp b/tests/cpu/transforms/GradingToneTransform_tests.cpp index f3b5722f2..84483bbff 100644 --- a/tests/cpu/transforms/GradingToneTransform_tests.cpp +++ b/tests/cpu/transforms/GradingToneTransform_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "transforms/GradingToneTransform.cpp" diff --git a/tests/cpu/transforms/GroupTransform_tests.cpp b/tests/cpu/transforms/GroupTransform_tests.cpp index 67a0f656d..438518db7 100644 --- a/tests/cpu/transforms/GroupTransform_tests.cpp +++ b/tests/cpu/transforms/GroupTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/GroupTransform.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/transforms/LookTransform_tests.cpp b/tests/cpu/transforms/LookTransform_tests.cpp index 1a2c5e801..03ff59725 100644 --- a/tests/cpu/transforms/LookTransform_tests.cpp +++ b/tests/cpu/transforms/LookTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/cdl/CDLOpData.h" #include "ops/fixedfunction/FixedFunctionOpData.h" #include "ops/gamma/GammaOpData.h" diff --git a/tests/cpu/transforms/Lut1DTransform_tests.cpp b/tests/cpu/transforms/Lut1DTransform_tests.cpp index f31e9dc0f..4b67c9e82 100644 --- a/tests/cpu/transforms/Lut1DTransform_tests.cpp +++ b/tests/cpu/transforms/Lut1DTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/Lut1DTransform.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/transforms/Lut3DTransform_tests.cpp b/tests/cpu/transforms/Lut3DTransform_tests.cpp index db3296e7d..44d7485d6 100644 --- a/tests/cpu/transforms/Lut3DTransform_tests.cpp +++ b/tests/cpu/transforms/Lut3DTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/Lut3DTransform.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp b/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp index c67245deb..f64d3d976 100644 --- a/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp +++ b/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/builtins/BuiltinTransformRegistry.cpp" #include "testutils/UnitTest.h" diff --git a/tests/gpu/CDLOp_test.cpp b/tests/gpu/CDLOp_test.cpp index 3ad29d9e6..c4bda4339 100644 --- a/tests/gpu/CDLOp_test.cpp +++ b/tests/gpu/CDLOp_test.cpp @@ -3,7 +3,6 @@ #include -#include #include #include diff --git a/tests/gpu/Lut1DOp_test.cpp b/tests/gpu/Lut1DOp_test.cpp index cb7669761..2ee2acc48 100644 --- a/tests/gpu/Lut1DOp_test.cpp +++ b/tests/gpu/Lut1DOp_test.cpp @@ -3,7 +3,6 @@ #include -#include #include #include diff --git a/tests/gpu/Lut3DOp_test.cpp b/tests/gpu/Lut3DOp_test.cpp index d1ee3aa3d..a6ce1f75d 100644 --- a/tests/gpu/Lut3DOp_test.cpp +++ b/tests/gpu/Lut3DOp_test.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include diff --git a/tests/gpu/RangeOp_test.cpp b/tests/gpu/RangeOp_test.cpp index 3ae2c9001..16d0c3c53 100644 --- a/tests/gpu/RangeOp_test.cpp +++ b/tests/gpu/RangeOp_test.cpp @@ -1,10 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include - #include #include "GPUUnitTest.h" diff --git a/tests/osl/UnitTestOSL.cpp b/tests/osl/UnitTestOSL.cpp index 7f09055ed..851344aae 100644 --- a/tests/osl/UnitTestOSL.cpp +++ b/tests/osl/UnitTestOSL.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "UnitTestOSL.h" #include From 4b4fdaa760c3c8740e60034a3b0901ce77be0c1b Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 14 Jan 2026 10:40:57 +0000 Subject: [PATCH 08/48] Reduce usage of "OCIOZArchive.h" Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Context.cpp | 1 - src/OpenColorIO/PathUtils.cpp | 2 +- src/OpenColorIO/transforms/FileTransform.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp index a2764d68a..d33f0b26b 100644 --- a/src/OpenColorIO/Context.cpp +++ b/src/OpenColorIO/Context.cpp @@ -14,7 +14,6 @@ #include "ContextVariableUtils.h" #include "HashUtils.h" #include "Mutex.h" -#include "OCIOZArchive.h" #include "PathUtils.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp index 48a992ff9..99b5a7fcb 100644 --- a/src/OpenColorIO/PathUtils.cpp +++ b/src/OpenColorIO/PathUtils.cpp @@ -12,7 +12,7 @@ #include "PathUtils.h" #include "Platform.h" #include "utils/StringUtils.h" -#include "OCIOZArchive.h" + #if !defined(_WIN32) #include diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp index 33da5f307..f0a90b584 100755 --- a/src/OpenColorIO/transforms/FileTransform.cpp +++ b/src/OpenColorIO/transforms/FileTransform.cpp @@ -17,7 +17,6 @@ #include "FileTransform.h" #include "Logging.h" #include "Mutex.h" -#include "OCIOZArchive.h" #include "ops/noop/NoOps.h" #include "PathUtils.h" #include "Platform.h" From 9cc80f8cdee71738b17dbf4e9428f1883322a320 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 14 Jan 2026 11:16:08 +0000 Subject: [PATCH 09/48] Tidy "XMLReaderUtils.h" Signed-off-by: Kevin Wheatley --- src/OpenColorIO/fileformats/FileFormatCC.cpp | 1 - src/OpenColorIO/fileformats/cdl/CDLWriter.cpp | 2 +- src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/OpenColorIO/fileformats/FileFormatCC.cpp b/src/OpenColorIO/fileformats/FileFormatCC.cpp index d42778fec..5a24a1005 100755 --- a/src/OpenColorIO/fileformats/FileFormatCC.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCC.cpp @@ -7,7 +7,6 @@ #include "fileformats/cdl/CDLParser.h" #include "fileformats/cdl/CDLWriter.h" -#include "fileformats/xmlutils/XMLReaderUtils.h" #include "fileformats/xmlutils/XMLWriterUtils.h" #include "transforms/FileTransform.h" #include "OpBuilders.h" diff --git a/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp b/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp index 83219477a..55d270f8e 100644 --- a/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp +++ b/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp @@ -6,7 +6,7 @@ #include "fileformats/xmlutils/XMLWriterUtils.h" #include "ParseUtils.h" #include "transforms/CDLTransform.h" -#include "transforms/FileTransform.h" +#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h index 9a813a255..babd923ed 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h @@ -12,10 +12,7 @@ #include -#include "MathUtils.h" -#include "utils/StringUtils.h" #include "utils/NumberUtils.h" -#include "Platform.h" namespace OCIO_NAMESPACE From f25fa3a31e2ada27c033d5b0a07c73dfa87f549d Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 14 Jan 2026 12:33:34 +0000 Subject: [PATCH 10/48] Clean up MatrixOp.h usage Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Baker.cpp | 1 - src/OpenColorIO/Op.cpp | 1 + src/OpenColorIO/OpOptimizers.cpp | 3 ++- src/OpenColorIO/ops/gamma/GammaOpData.cpp | 3 --- src/OpenColorIO/ops/lut1d/Lut1DOp.cpp | 8 +------- src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp | 4 ++-- src/OpenColorIO/ops/lut3d/Lut3DOp.cpp | 10 +++------- src/OpenColorIO/ops/matrix/MatrixOp.h | 2 -- src/OpenColorIO/ops/range/RangeOp.cpp | 1 + src/OpenColorIO/ops/range/RangeOp.h | 2 -- src/OpenColorIO/ops/range/RangeOpData.h | 5 ++++- src/OpenColorIO/transforms/builtins/ACES.cpp | 1 + src/OpenColorIO/transforms/builtins/AppleCameras.cpp | 2 -- .../transforms/builtins/PanasonicCameras.cpp | 3 --- src/OpenColorIO/transforms/builtins/SonyCameras.cpp | 3 --- tests/cpu/OpOptimizers_tests.cpp | 5 ++++- tests/cpu/Op_tests.cpp | 4 +++- tests/cpu/ops/lut3d/Lut3DOp_tests.cpp | 2 +- tests/cpu/ops/noop/NoOps_tests.cpp | 2 ++ tests/cpu/ops/range/RangeOp_tests.cpp | 4 ++-- tests/cpu/transforms/BuiltinTransform_tests.cpp | 11 +++++++---- 21 files changed, 34 insertions(+), 43 deletions(-) diff --git a/src/OpenColorIO/Baker.cpp b/src/OpenColorIO/Baker.cpp index 5e0d6c957..d93cb520f 100755 --- a/src/OpenColorIO/Baker.cpp +++ b/src/OpenColorIO/Baker.cpp @@ -9,7 +9,6 @@ #include "transforms/FileTransform.h" #include "BakingUtils.h" -#include "MathUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp index 7e95baecf..6301c6b15 100755 --- a/src/OpenColorIO/Op.cpp +++ b/src/OpenColorIO/Op.cpp @@ -23,6 +23,7 @@ #include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "ops/range/RangeOp.h" +#include "ops/matrix/MatrixOp.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/OpOptimizers.cpp b/src/OpenColorIO/OpOptimizers.cpp index 164123f41..f4b98da7d 100755 --- a/src/OpenColorIO/OpOptimizers.cpp +++ b/src/OpenColorIO/OpOptimizers.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include @@ -13,6 +12,8 @@ #include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "ops/range/RangeOp.h" +#include "ops/matrix/MatrixOp.h" +#include "ops/matrix/MatrixOpData.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gamma/GammaOpData.cpp b/src/OpenColorIO/ops/gamma/GammaOpData.cpp index baf0bc728..6c06389af 100644 --- a/src/OpenColorIO/ops/gamma/GammaOpData.cpp +++ b/src/OpenColorIO/ops/gamma/GammaOpData.cpp @@ -6,11 +6,8 @@ #include -#include "BitDepthUtils.h" #include "ops/gamma/GammaOpData.h" -#include "ops/matrix/MatrixOp.h" #include "ops/range/RangeOpData.h" -#include "ParseUtils.h" #include "Platform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp index 15f651f0a..19cccabe5 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOp.cpp @@ -2,21 +2,15 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include -#include "BitDepthUtils.h" -#include "HashUtils.h" -#include "GpuShaderUtils.h" + #include "MathUtils.h" #include "ops/lut1d/Lut1DOp.h" #include "ops/lut1d/Lut1DOpCPU.h" #include "ops/lut1d/Lut1DOpGPU.h" -#include "ops/matrix/MatrixOp.h" -#include "ops/OpTools.h" -#include "SSE.h" #include "transforms/Lut1DTransform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp index a12a7a3e1..0a6f93f3d 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp @@ -1,8 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include -#include +#include #include @@ -11,7 +12,6 @@ #include "MathUtils.h" #include "ops/lut1d/Lut1DOp.h" #include "ops/lut1d/Lut1DOpData.h" -#include "ops/matrix/MatrixOp.h" #include "ops/OpTools.h" #include "ops/range/RangeOpData.h" diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp index c552602a4..b9d370ca9 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOp.cpp @@ -1,21 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include +#include #include +#include #include -#include "BitDepthUtils.h" -#include "GpuShaderUtils.h" -#include "HashUtils.h" -#include "MathUtils.h" #include "ops/lut3d/Lut3DOp.h" #include "ops/lut3d/Lut3DOpCPU.h" #include "ops/lut3d/Lut3DOpGPU.h" -#include "ops/matrix/MatrixOp.h" -#include "ops/OpTools.h" + #include "transforms/Lut3DTransform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/matrix/MatrixOp.h b/src/OpenColorIO/ops/matrix/MatrixOp.h index d8020976d..c563da2d2 100644 --- a/src/OpenColorIO/ops/matrix/MatrixOp.h +++ b/src/OpenColorIO/ops/matrix/MatrixOp.h @@ -5,8 +5,6 @@ #ifndef INCLUDED_OCIO_MATRIXOFFSETOP_H #define INCLUDED_OCIO_MATRIXOFFSETOP_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp index f708908fb..402f491c0 100644 --- a/src/OpenColorIO/ops/range/RangeOp.cpp +++ b/src/OpenColorIO/ops/range/RangeOp.cpp @@ -17,6 +17,7 @@ #include "ops/range/RangeOpGPU.h" #include "ops/range/RangeOp.h" #include "transforms/RangeTransform.h" +#include "ops/matrix/MatrixOp.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/range/RangeOp.h b/src/OpenColorIO/ops/range/RangeOp.h index 4ec219466..fb21f7311 100644 --- a/src/OpenColorIO/ops/range/RangeOp.h +++ b/src/OpenColorIO/ops/range/RangeOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_RANGEOP_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/range/RangeOpData.h b/src/OpenColorIO/ops/range/RangeOpData.h index 9fdde8ec6..8498dd60e 100644 --- a/src/OpenColorIO/ops/range/RangeOpData.h +++ b/src/OpenColorIO/ops/range/RangeOpData.h @@ -6,10 +6,13 @@ #define INCLUDED_OCIO_RANGEOPDATA_H +#include + #include #include "Op.h" -#include "ops/matrix/MatrixOp.h" +#include "ops/matrix/MatrixOpData.h" + namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp index 8f08c5829..7c2397406 100644 --- a/src/OpenColorIO/transforms/builtins/ACES.cpp +++ b/src/OpenColorIO/transforms/builtins/ACES.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/transforms/builtins/AppleCameras.cpp b/src/OpenColorIO/transforms/builtins/AppleCameras.cpp index efc496233..3dfbd8475 100644 --- a/src/OpenColorIO/transforms/builtins/AppleCameras.cpp +++ b/src/OpenColorIO/transforms/builtins/AppleCameras.cpp @@ -7,8 +7,6 @@ #include #include "ops/matrix/MatrixOp.h" -#include "ops/fixedfunction/FixedFunctionOp.h" -#include "ops/range/RangeOp.h" #include "transforms/builtins/AppleCameras.h" #include "transforms/builtins/BuiltinTransformRegistry.h" #include "transforms/builtins/ColorMatrixHelpers.h" diff --git a/src/OpenColorIO/transforms/builtins/PanasonicCameras.cpp b/src/OpenColorIO/transforms/builtins/PanasonicCameras.cpp index 12b5ad10c..ed773c998 100644 --- a/src/OpenColorIO/transforms/builtins/PanasonicCameras.cpp +++ b/src/OpenColorIO/transforms/builtins/PanasonicCameras.cpp @@ -2,8 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. -#include - #include #include "ops/matrix/MatrixOp.h" @@ -11,7 +9,6 @@ #include "transforms/builtins/ACES.h" #include "transforms/builtins/BuiltinTransformRegistry.h" #include "transforms/builtins/ColorMatrixHelpers.h" -#include "transforms/builtins/OpHelpers.h" #include "transforms/builtins/PanasonicCameras.h" diff --git a/src/OpenColorIO/transforms/builtins/SonyCameras.cpp b/src/OpenColorIO/transforms/builtins/SonyCameras.cpp index 18d9655e4..5a6156212 100644 --- a/src/OpenColorIO/transforms/builtins/SonyCameras.cpp +++ b/src/OpenColorIO/transforms/builtins/SonyCameras.cpp @@ -2,15 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. -#include - #include #include "ops/log/LogOp.h" #include "ops/matrix/MatrixOp.h" #include "transforms/builtins/ACES.h" #include "transforms/builtins/BuiltinTransformRegistry.h" -#include "transforms/builtins/OpHelpers.h" #include "transforms/builtins/SonyCameras.h" diff --git a/tests/cpu/OpOptimizers_tests.cpp b/tests/cpu/OpOptimizers_tests.cpp index bffb1b6ad..bb53005d0 100644 --- a/tests/cpu/OpOptimizers_tests.cpp +++ b/tests/cpu/OpOptimizers_tests.cpp @@ -2,6 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. +#include +#include +#include + #include "OpOptimizers.cpp" #include "ops/cdl/CDLOp.h" @@ -13,7 +17,6 @@ #include "ops/matrix/MatrixOp.h" #include "ops/range/RangeOp.h" #include "testutils/UnitTest.h" -#include "transforms/FileTransform.h" #include "UnitTestUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/Op_tests.cpp b/tests/cpu/Op_tests.cpp index d6c1fb3c0..dbc00b07a 100644 --- a/tests/cpu/Op_tests.cpp +++ b/tests/cpu/Op_tests.cpp @@ -2,11 +2,13 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "Op.cpp" #include "ops/noop/NoOps.h" #include "testutils/UnitTest.h" -#include "UnitTestUtils.h" +#include "ops/matrix/MatrixOp.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp b/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp index ae32f4e89..36ff8ea38 100644 --- a/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp +++ b/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp @@ -9,7 +9,7 @@ #include #endif -#include "BitDepthUtils.h" +#include "ops/matrix/MatrixOp.h" #include "OpBuilders.h" #include "ops/lut3d/Lut3DOp.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/noop/NoOps_tests.cpp b/tests/cpu/ops/noop/NoOps_tests.cpp index 9f23640ed..7e5cc6b5f 100644 --- a/tests/cpu/ops/noop/NoOps_tests.cpp +++ b/tests/cpu/ops/noop/NoOps_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/noop/NoOps.cpp" #include "ops/lut1d/Lut1DOp.h" diff --git a/tests/cpu/ops/range/RangeOp_tests.cpp b/tests/cpu/ops/range/RangeOp_tests.cpp index 2a52227a6..c865c01fd 100644 --- a/tests/cpu/ops/range/RangeOp_tests.cpp +++ b/tests/cpu/ops/range/RangeOp_tests.cpp @@ -2,8 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include "BitDepthUtils.h" -#include "ops/matrix/MatrixOp.h" +#include +#include #include "ops/range/RangeOp.cpp" diff --git a/tests/cpu/transforms/BuiltinTransform_tests.cpp b/tests/cpu/transforms/BuiltinTransform_tests.cpp index 99a5ae6f2..41d8b7558 100644 --- a/tests/cpu/transforms/BuiltinTransform_tests.cpp +++ b/tests/cpu/transforms/BuiltinTransform_tests.cpp @@ -2,18 +2,21 @@ // Copyright Contributors to the OpenColorIO Project. +#include +#include #include -#include +#include #include +#include #include +#include +#include #include #include "transforms/BuiltinTransform.cpp" #include "ops/lut3d/Lut3DOp.h" -#include "ops/matrix/MatrixOp.h" -#include "Platform.h" -#include "transforms/builtins/ACES.h" + #include "transforms/builtins/ColorMatrixHelpers.h" #include "transforms/builtins/OpHelpers.h" #include "testutils/UnitTest.h" From 5ae0330a5750676659d4d04dd9117a31f0b62c24 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 14 Jan 2026 15:01:48 +0000 Subject: [PATCH 11/48] Tidy up / Signed-off-by: Kevin Wheatley --- src/OpenColorIO/CPUInfo.cpp | 2 +- src/OpenColorIO/CPUProcessor.cpp | 4 +--- src/OpenColorIO/Look.cpp | 4 +--- src/OpenColorIO/MathUtils.cpp | 2 +- src/OpenColorIO/OCIOZArchive.cpp | 3 +-- src/OpenColorIO/Op.cpp | 1 - src/OpenColorIO/Processor.cpp | 3 +-- src/OpenColorIO/SystemMonitor.cpp | 3 ++- src/OpenColorIO/TokensManager.h | 1 - src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp | 2 +- src/OpenColorIO/apphelpers/DisplayViewHelpers.cpp | 6 +----- .../apphelpers/mergeconfigs/MergeConfigsHelpers.cpp | 8 +++----- src/OpenColorIO/fileformats/FileFormatCTF.cpp | 8 ++++---- src/OpenColorIO/fileformats/FileFormatIridasItx.cpp | 5 +---- src/OpenColorIO/fileformats/FileFormatSpi1D.cpp | 2 -- src/OpenColorIO/fileformats/FileFormatVF.cpp | 2 -- src/OpenColorIO/fileformats/cdl/CDLParser.cpp | 4 +++- src/OpenColorIO/fileformats/cdl/CDLReaderHelper.cpp | 4 ++++ src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp | 2 +- src/OpenColorIO/fileformats/ctf/CTFReaderUtils.cpp | 1 - src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.cpp | 4 ++-- src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h | 2 +- src/OpenColorIO/ops/allocation/AllocationOp.cpp | 3 ++- src/OpenColorIO/ops/cdl/CDLOp.cpp | 5 ----- src/OpenColorIO/ops/cdl/CDLOpCPU.cpp | 3 +-- src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.cpp | 2 -- src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.cpp | 2 -- src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.cpp | 2 -- src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.cpp | 2 -- src/OpenColorIO/ops/gradingtone/GradingToneOp.cpp | 2 -- src/OpenColorIO/ops/log/LogOp.cpp | 6 ------ src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp | 1 - src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp | 1 - src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp | 1 - src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp | 2 -- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp | 1 - src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp | 1 - src/OpenColorIO/ops/matrix/MatrixOp.cpp | 5 ----- src/OpenColorIO/ops/noop/NoOps.cpp | 6 ++++-- src/OpenColorIO/ops/range/RangeOp.cpp | 4 ---- src/OpenColorIO/transforms/CDLTransform.cpp | 8 ++------ src/OpenColorIO/transforms/ColorSpaceTransform.cpp | 4 ++-- src/OpenColorIO/transforms/ExponentTransform.cpp | 2 -- .../transforms/ExponentWithLinearTransform.cpp | 2 -- src/OpenColorIO/transforms/FileTransform.cpp | 5 ++--- src/OpenColorIO/transforms/FixedFunctionTransform.cpp | 3 +-- src/OpenColorIO/transforms/GradingHueCurveTransform.cpp | 2 +- src/OpenColorIO/transforms/GradingPrimaryTransform.cpp | 1 - src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp | 2 +- src/OpenColorIO/transforms/GradingToneTransform.cpp | 1 - src/OpenColorIO/transforms/Lut1DTransform.cpp | 2 -- src/OpenColorIO/transforms/Lut3DTransform.cpp | 2 -- src/OpenColorIO/transforms/RangeTransform.cpp | 3 --- src/apps/ociobakelut/ocioicc.cpp | 3 --- src/apps/ociomakeclf/main.cpp | 6 ++++-- src/apps/ociowrite/main.cpp | 2 -- src/apputils/strutil.h | 2 -- tests/cpu/Config_tests.cpp | 2 ++ tests/cpu/Context_tests.cpp | 5 ++--- tests/cpu/Exception_tests.cpp | 2 +- tests/cpu/FileRules_tests.cpp | 2 ++ tests/cpu/Op_tests.cpp | 1 + tests/cpu/UnitTestMain.cpp | 2 +- tests/cpu/UnitTestUtils.cpp | 1 + tests/cpu/ops/allocation/AllocationOp_tests.cpp | 2 ++ tests/cpu/ops/exponent/ExponentOp_tests.cpp | 2 ++ tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp | 1 + tests/cpu/ops/lut1d/Lut1DOp_tests.cpp | 2 +- tests/cpu/ops/matrix/MatrixOp_tests.cpp | 3 +++ tests/cpu/transforms/CDLTransform_tests.cpp | 2 ++ tests/cpu/transforms/ExponentTransform_tests.cpp | 2 +- tests/gpu/GPUUnitTest.cpp | 2 +- tests/testutils/UnitTest.cpp | 2 +- 73 files changed, 73 insertions(+), 132 deletions(-) diff --git a/src/OpenColorIO/CPUInfo.cpp b/src/OpenColorIO/CPUInfo.cpp index edf341792..0b71de2e5 100644 --- a/src/OpenColorIO/CPUInfo.cpp +++ b/src/OpenColorIO/CPUInfo.cpp @@ -3,7 +3,7 @@ #include "CPUInfo.h" -#include +#include #if _WIN32 #include diff --git a/src/OpenColorIO/CPUProcessor.cpp b/src/OpenColorIO/CPUProcessor.cpp index c0d27c248..0c92308fe 100644 --- a/src/OpenColorIO/CPUProcessor.cpp +++ b/src/OpenColorIO/CPUProcessor.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include @@ -9,9 +9,7 @@ #include "BitDepthUtils.h" #include "CPUProcessor.h" #include "ops/lut1d/Lut1DOpCPU.h" -#include "ops/lut3d/Lut3DOpCPU.h" #include "ops/matrix/MatrixOp.h" -#include "ops/range/RangeOpCPU.h" #include "ScanlineHelper.h" diff --git a/src/OpenColorIO/Look.cpp b/src/OpenColorIO/Look.cpp index 14af74235..49371eb16 100644 --- a/src/OpenColorIO/Look.cpp +++ b/src/OpenColorIO/Look.cpp @@ -2,9 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. -#include #include -#include #include @@ -78,7 +76,7 @@ Look::Look() Look::~Look() { delete m_impl; - m_impl = NULL; + m_impl = nullptr; } LookRcPtr Look::createEditableCopy() const diff --git a/src/OpenColorIO/MathUtils.cpp b/src/OpenColorIO/MathUtils.cpp index fa1986025..a2a94094a 100644 --- a/src/OpenColorIO/MathUtils.cpp +++ b/src/OpenColorIO/MathUtils.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include #include diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp index 46e9485bb..09846f3ce 100644 --- a/src/OpenColorIO/OCIOZArchive.cpp +++ b/src/OpenColorIO/OCIOZArchive.cpp @@ -5,13 +5,12 @@ #include #include #include -#include +#include #include #include -#include "Mutex.h" #include "Platform.h" #include "utils/StringUtils.h" #include "transforms/FileTransform.h" diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp index 6301c6b15..8b75a957b 100755 --- a/src/OpenColorIO/Op.cpp +++ b/src/OpenColorIO/Op.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/Processor.cpp b/src/OpenColorIO/Processor.cpp index 0dca023f2..fe6cb9ebc 100755 --- a/src/OpenColorIO/Processor.cpp +++ b/src/OpenColorIO/Processor.cpp @@ -1,8 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include +#include #include #include diff --git a/src/OpenColorIO/SystemMonitor.cpp b/src/OpenColorIO/SystemMonitor.cpp index 8ee5e915e..ffb672fdb 100644 --- a/src/OpenColorIO/SystemMonitor.cpp +++ b/src/OpenColorIO/SystemMonitor.cpp @@ -4,7 +4,8 @@ #include #include -#include +#include +#include #include diff --git a/src/OpenColorIO/TokensManager.h b/src/OpenColorIO/TokensManager.h index f25a41b51..b96786154 100644 --- a/src/OpenColorIO/TokensManager.h +++ b/src/OpenColorIO/TokensManager.h @@ -5,7 +5,6 @@ #ifndef INCLUDED_OCIO_TOKENS_MANAGER_H #define INCLUDED_OCIO_TOKENS_MANAGER_H -#include #include #include diff --git a/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp b/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp index 7161bbc11..444058d07 100644 --- a/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp +++ b/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include #include diff --git a/src/OpenColorIO/apphelpers/DisplayViewHelpers.cpp b/src/OpenColorIO/apphelpers/DisplayViewHelpers.cpp index d4055f46c..f6bd2c3e7 100644 --- a/src/OpenColorIO/apphelpers/DisplayViewHelpers.cpp +++ b/src/OpenColorIO/apphelpers/DisplayViewHelpers.cpp @@ -2,17 +2,13 @@ // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include +#include #include -#include #include #include "CategoryHelpers.h" #include "utils/StringUtils.h" -#include "LegacyViewingPipeline.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp index bbf8e8643..78a1953af 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp @@ -2,9 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include -#include -#include +#include + #include #include #include @@ -14,8 +13,7 @@ #include #include "MergeConfigsHelpers.h" -#include "Logging.h" -#include "ParseUtils.h" + #include "Platform.h" #include "OCIOMYaml.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp index 97c45d4a8..c1ea431b1 100644 --- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp @@ -1,9 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include +#include #include +#include #include @@ -13,7 +15,6 @@ #include "fileformats/ctf/CTFTransform.h" #include "fileformats/ctf/CTFReaderHelper.h" #include "fileformats/ctf/CTFReaderUtils.h" -#include "fileformats/FileFormatUtils.h" #include "fileformats/xmlutils/XMLReaderHelper.h" #include "fileformats/xmlutils/XMLReaderUtils.h" #include "fileformats/xmlutils/XMLWriterUtils.h" @@ -22,9 +23,8 @@ #include "ops/range/RangeOp.h" #include "BakingUtils.h" #include "OpBuilders.h" -#include "ops/noop/NoOps.h" -#include "Platform.h" #include "TransformBuilder.h" +#include "Platform.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp b/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp index c2ea5c313..86e1d9161 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasItx.cpp @@ -1,16 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include + #include #include #include #include "fileformats/FileFormatUtils.h" -#include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "BakingUtils.h" #include "ParseUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp b/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp index 1cdc51b22..fb2e831ea 100755 --- a/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp +++ b/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include @@ -12,7 +11,6 @@ #include "ops/lut1d/Lut1DOp.h" #include "ops/matrix/MatrixOp.h" #include "BakingUtils.h" -#include "ParseUtils.h" #include "Platform.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatVF.cpp b/src/OpenColorIO/fileformats/FileFormatVF.cpp index 3c11ef18d..c5b4220ac 100755 --- a/src/OpenColorIO/fileformats/FileFormatVF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatVF.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include #include diff --git a/src/OpenColorIO/fileformats/cdl/CDLParser.cpp b/src/OpenColorIO/fileformats/cdl/CDLParser.cpp index 1c02d7670..dc4cd25da 100644 --- a/src/OpenColorIO/fileformats/cdl/CDLParser.cpp +++ b/src/OpenColorIO/fileformats/cdl/CDLParser.cpp @@ -2,6 +2,9 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include +#include +#include #include "expat.h" #include "fileformats/cdl/CDLParser.h" @@ -9,7 +12,6 @@ #include "fileformats/xmlutils/XMLReaderHelper.h" #include "fileformats/xmlutils/XMLReaderUtils.h" #include "transforms/CDLTransform.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/fileformats/cdl/CDLReaderHelper.cpp b/src/OpenColorIO/fileformats/cdl/CDLReaderHelper.cpp index 38eaab76d..27a3e5064 100644 --- a/src/OpenColorIO/fileformats/cdl/CDLReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/cdl/CDLReaderHelper.cpp @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include +#include + #include "fileformats/cdl/CDLReaderHelper.h" #include "fileformats/xmlutils/XMLReaderUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp index 913193ddc..01d216051 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderHelper.h" @@ -11,7 +12,6 @@ #include "Logging.h" #include "MathUtils.h" #include "ops/log/LogUtils.h" -#include "ParseUtils.h" #include "Platform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderUtils.cpp b/src/OpenColorIO/fileformats/ctf/CTFReaderUtils.cpp index ffd73cbd4..b870065de 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderUtils.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderUtils.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include "fileformats/ctf/CTFReaderUtils.h" diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.cpp b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.cpp index d5b5be5dc..b1116a632 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.cpp @@ -2,12 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include "fileformats/xmlutils/XMLReaderHelper.h" #include "fileformats/xmlutils/XMLReaderUtils.h" #include "Logging.h" -#include "ParseUtils.h" -#include "Platform.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h index 6b86833a6..384431a21 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h @@ -5,7 +5,7 @@ #define INCLUDED_OCIO_FILEFORMATS_XMLUTILS_XMLREADERHELPER_H -#include +#include #include #include diff --git a/src/OpenColorIO/ops/allocation/AllocationOp.cpp b/src/OpenColorIO/ops/allocation/AllocationOp.cpp index 11729f88e..e480b6368 100644 --- a/src/OpenColorIO/ops/allocation/AllocationOp.cpp +++ b/src/OpenColorIO/ops/allocation/AllocationOp.cpp @@ -1,8 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include +#include #include diff --git a/src/OpenColorIO/ops/cdl/CDLOp.cpp b/src/OpenColorIO/ops/cdl/CDLOp.cpp index bd0511ea4..a0f0bd391 100644 --- a/src/OpenColorIO/ops/cdl/CDLOp.cpp +++ b/src/OpenColorIO/ops/cdl/CDLOp.cpp @@ -1,15 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "BitDepthUtils.h" -#include "GpuShaderUtils.h" -#include "HashUtils.h" -#include "MathUtils.h" #include "ops/cdl/CDLOp.h" #include "ops/cdl/CDLOpCPU.h" #include "ops/cdl/CDLOpGPU.h" diff --git a/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp b/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp index 982e992f1..1f9344011 100644 --- a/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp +++ b/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp @@ -3,11 +3,10 @@ #include #include -#include +#include #include -#include "BitDepthUtils.h" #include "CDLOpCPU.h" #include "SSE.h" diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.cpp b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.cpp index 4f9569ef1..a0a799f44 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.cpp +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "GpuShaderUtils.h" #include "ops/fixedfunction/FixedFunctionOpCPU.h" #include "ops/fixedfunction/FixedFunctionOpGPU.h" #include "ops/fixedfunction/FixedFunctionOp.h" diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.cpp b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.cpp index 191530131..64b13b05d 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.cpp +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "GpuShaderUtils.h" #include "ops/gradinghuecurve/GradingHueCurveOpCPU.h" #include "ops/gradinghuecurve/GradingHueCurveOpGPU.h" #include "ops/gradinghuecurve/GradingHueCurveOp.h" diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.cpp index 5bb2f960b..cc61a14a3 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "GpuShaderUtils.h" #include "ops/gradingprimary/GradingPrimaryOpCPU.h" #include "ops/gradingprimary/GradingPrimaryOpGPU.h" #include "ops/gradingprimary/GradingPrimaryOp.h" diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.cpp index 598ae28e6..503d3ff57 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "GpuShaderUtils.h" #include "ops/gradingrgbcurve/GradingRGBCurveOpCPU.h" #include "ops/gradingrgbcurve/GradingRGBCurveOpGPU.h" #include "ops/gradingrgbcurve/GradingRGBCurveOp.h" diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOp.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOp.cpp index 5968210e7..edc6d6cba 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOp.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOp.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "GpuShaderUtils.h" #include "ops/gradingtone/GradingToneOpCPU.h" #include "ops/gradingtone/GradingToneOpGPU.h" #include "ops/gradingtone/GradingToneOp.h" diff --git a/src/OpenColorIO/ops/log/LogOp.cpp b/src/OpenColorIO/ops/log/LogOp.cpp index feb674d37..834a0e608 100644 --- a/src/OpenColorIO/ops/log/LogOp.cpp +++ b/src/OpenColorIO/ops/log/LogOp.cpp @@ -1,16 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include -#include #include #include -#include "HashUtils.h" -#include "GpuShaderUtils.h" -#include "MathUtils.h" #include "ops/log/LogOpCPU.h" #include "ops/log/LogOpData.h" #include "ops/log/LogOpGPU.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp index e0d1648b2..51af4a2e3 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp @@ -5,7 +5,6 @@ #if OCIO_USE_AVX #include -#include #include "AVX.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp index 32e59ff67..87f6088fa 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp @@ -5,7 +5,6 @@ #if OCIO_USE_AVX2 #include -#include #include "AVX2.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp index 7ca2dbd05..94e46c6ca 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp @@ -5,7 +5,6 @@ #if OCIO_USE_AVX512 #include -#include #include "AVX512.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp index c170e1791..acad06b9e 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp @@ -5,8 +5,6 @@ #if OCIO_USE_SSE2 -#include - #include "SSE2.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp index 96a4ff6f6..e62ea9b8b 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp @@ -5,7 +5,6 @@ #if OCIO_USE_AVX2 #include -#include #include "AVX2.h" diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp index b659dad4a..1486d2bd9 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp @@ -5,7 +5,6 @@ #if OCIO_USE_AVX512 #include -#include #include "AVX512.h" diff --git a/src/OpenColorIO/ops/matrix/MatrixOp.cpp b/src/OpenColorIO/ops/matrix/MatrixOp.cpp index 93505a284..fb491b0bf 100644 --- a/src/OpenColorIO/ops/matrix/MatrixOp.cpp +++ b/src/OpenColorIO/ops/matrix/MatrixOp.cpp @@ -1,15 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "BitDepthUtils.h" -#include "GpuShaderUtils.h" -#include "HashUtils.h" -#include "MathUtils.h" #include "ops/matrix/MatrixOp.h" #include "ops/matrix/MatrixOpCPU.h" #include "ops/matrix/MatrixOpGPU.h" diff --git a/src/OpenColorIO/ops/noop/NoOps.cpp b/src/OpenColorIO/ops/noop/NoOps.cpp index cf71b1fde..698399e77 100644 --- a/src/OpenColorIO/ops/noop/NoOps.cpp +++ b/src/OpenColorIO/ops/noop/NoOps.cpp @@ -3,13 +3,15 @@ #include -#include +#include +#include +#include +#include #include #include "ops/allocation/AllocationOp.h" #include "NoOps.h" -#include "OpBuilders.h" #include "Op.h" #include "ops/lut3d/Lut3DOp.h" diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp index 402f491c0..7cb49b101 100644 --- a/src/OpenColorIO/ops/range/RangeOp.cpp +++ b/src/OpenColorIO/ops/range/RangeOp.cpp @@ -1,16 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include #include -#include "GpuShaderUtils.h" -#include "HashUtils.h" -#include "MathUtils.h" #include "ops/lut1d/Lut1DOpData.h" #include "ops/lut3d/Lut3DOpData.h" #include "ops/range/RangeOpCPU.h" diff --git a/src/OpenColorIO/transforms/CDLTransform.cpp b/src/OpenColorIO/transforms/CDLTransform.cpp index eb6d36e6b..79cfe0922 100755 --- a/src/OpenColorIO/transforms/CDLTransform.cpp +++ b/src/OpenColorIO/transforms/CDLTransform.cpp @@ -1,18 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include -#include +#include #include #include "fileformats/cdl/CDLParser.h" -#include "Logging.h" -#include "MathUtils.h" -#include "Mutex.h" -#include "OpBuilders.h" #include "ParseUtils.h" -#include "Platform.h" #include "transforms/CDLTransform.h" #include "transforms/FileTransform.h" diff --git a/src/OpenColorIO/transforms/ColorSpaceTransform.cpp b/src/OpenColorIO/transforms/ColorSpaceTransform.cpp index cd79715a6..d66ff45ba 100755 --- a/src/OpenColorIO/transforms/ColorSpaceTransform.cpp +++ b/src/OpenColorIO/transforms/ColorSpaceTransform.cpp @@ -2,7 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include +#include #include #include @@ -11,7 +12,6 @@ #include "NamedTransform.h" #include "OpBuilders.h" #include "ops/allocation/AllocationOp.h" -#include "ops/noop/NoOps.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/ExponentTransform.cpp b/src/OpenColorIO/transforms/ExponentTransform.cpp index 22eaf615b..4d7af0a96 100755 --- a/src/OpenColorIO/transforms/ExponentTransform.cpp +++ b/src/OpenColorIO/transforms/ExponentTransform.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "OpBuilders.h" #include "transforms/ExponentTransform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp b/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp index 44eb6dfc6..53cf18dca 100644 --- a/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp +++ b/src/OpenColorIO/transforms/ExponentWithLinearTransform.cpp @@ -1,12 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include -#include "OpBuilders.h" #include "transforms/ExponentWithLinearTransform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp index f0a90b584..40302bcbe 100755 --- a/src/OpenColorIO/transforms/FileTransform.cpp +++ b/src/OpenColorIO/transforms/FileTransform.cpp @@ -5,9 +5,9 @@ #include #include #include -#include +#include +#include #include -#include #include @@ -18,7 +18,6 @@ #include "Logging.h" #include "Mutex.h" #include "ops/noop/NoOps.h" -#include "PathUtils.h" #include "Platform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/transforms/FixedFunctionTransform.cpp b/src/OpenColorIO/transforms/FixedFunctionTransform.cpp index a71025dd0..a414fd661 100644 --- a/src/OpenColorIO/transforms/FixedFunctionTransform.cpp +++ b/src/OpenColorIO/transforms/FixedFunctionTransform.cpp @@ -1,12 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include -#include "OpBuilders.h" #include "transforms/FixedFunctionTransform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp b/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp index 83e47d4ed..91ac9412d 100644 --- a/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp +++ b/src/OpenColorIO/transforms/GradingHueCurveTransform.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include diff --git a/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp b/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp index 8caaacfe6..bbc992919 100644 --- a/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp +++ b/src/OpenColorIO/transforms/GradingPrimaryTransform.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp b/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp index a8904ce83..ad197abf9 100644 --- a/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp +++ b/src/OpenColorIO/transforms/GradingRGBCurveTransform.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include diff --git a/src/OpenColorIO/transforms/GradingToneTransform.cpp b/src/OpenColorIO/transforms/GradingToneTransform.cpp index 392b4d4fa..e2015d0c9 100644 --- a/src/OpenColorIO/transforms/GradingToneTransform.cpp +++ b/src/OpenColorIO/transforms/GradingToneTransform.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/transforms/Lut1DTransform.cpp b/src/OpenColorIO/transforms/Lut1DTransform.cpp index 269d2650e..bb17c4106 100644 --- a/src/OpenColorIO/transforms/Lut1DTransform.cpp +++ b/src/OpenColorIO/transforms/Lut1DTransform.cpp @@ -2,9 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include -#include #include #include diff --git a/src/OpenColorIO/transforms/Lut3DTransform.cpp b/src/OpenColorIO/transforms/Lut3DTransform.cpp index ddbc6f0e2..66b8e31d4 100644 --- a/src/OpenColorIO/transforms/Lut3DTransform.cpp +++ b/src/OpenColorIO/transforms/Lut3DTransform.cpp @@ -2,9 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include -#include #include #include diff --git a/src/OpenColorIO/transforms/RangeTransform.cpp b/src/OpenColorIO/transforms/RangeTransform.cpp index 745cb20e3..8030857d8 100644 --- a/src/OpenColorIO/transforms/RangeTransform.cpp +++ b/src/OpenColorIO/transforms/RangeTransform.cpp @@ -1,11 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include -#include "MathUtils.h" #include "transforms/RangeTransform.h" namespace OCIO_NAMESPACE diff --git a/src/apps/ociobakelut/ocioicc.cpp b/src/apps/ociobakelut/ocioicc.cpp index a946275c7..3bedb3b88 100644 --- a/src/apps/ociobakelut/ocioicc.cpp +++ b/src/apps/ociobakelut/ocioicc.cpp @@ -1,11 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include #include -#include #include #include diff --git a/src/apps/ociomakeclf/main.cpp b/src/apps/ociomakeclf/main.cpp index 892d7fdcd..840cc3657 100644 --- a/src/apps/ociomakeclf/main.cpp +++ b/src/apps/ociomakeclf/main.cpp @@ -2,11 +2,13 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include +#include +#include #include -#include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ociowrite/main.cpp b/src/apps/ociowrite/main.cpp index 7af352d2b..df5383594 100644 --- a/src/apps/ociowrite/main.cpp +++ b/src/apps/ociowrite/main.cpp @@ -6,9 +6,7 @@ #include #include #include -#include #include -#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apputils/strutil.h b/src/apputils/strutil.h index bb6fd8760..ce60e67dc 100644 --- a/src/apputils/strutil.h +++ b/src/apputils/strutil.h @@ -42,8 +42,6 @@ #include #include -#include -#include #ifndef OPENCOLORIO_PRINTF_ARGS diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp index 39b3aa335..e5b7aad8e 100644 --- a/tests/cpu/Config_tests.cpp +++ b/tests/cpu/Config_tests.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include #include diff --git a/tests/cpu/Context_tests.cpp b/tests/cpu/Context_tests.cpp index 3372d8f36..417ffc181 100644 --- a/tests/cpu/Context_tests.cpp +++ b/tests/cpu/Context_tests.cpp @@ -2,14 +2,13 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include +#include #include #include "Context.cpp" -#include "PathUtils.h" -#include "Platform.h" #include "testutils/UnitTest.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/Exception_tests.cpp b/tests/cpu/Exception_tests.cpp index e75c8d1d1..c00beb877 100644 --- a/tests/cpu/Exception_tests.cpp +++ b/tests/cpu/Exception_tests.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include "Exception.cpp" diff --git a/tests/cpu/FileRules_tests.cpp b/tests/cpu/FileRules_tests.cpp index fd5001a48..37d2519dc 100644 --- a/tests/cpu/FileRules_tests.cpp +++ b/tests/cpu/FileRules_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include +#include #include #include "FileRules.cpp" diff --git a/tests/cpu/Op_tests.cpp b/tests/cpu/Op_tests.cpp index dbc00b07a..79724a3ec 100644 --- a/tests/cpu/Op_tests.cpp +++ b/tests/cpu/Op_tests.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include #include "Op.cpp" diff --git a/tests/cpu/UnitTestMain.cpp b/tests/cpu/UnitTestMain.cpp index 6986d7226..848230aa3 100644 --- a/tests/cpu/UnitTestMain.cpp +++ b/tests/cpu/UnitTestMain.cpp @@ -7,7 +7,7 @@ #include #endif -#include +#include #include "testutils/UnitTest.h" #include "apputils/argparse.h" diff --git a/tests/cpu/UnitTestUtils.cpp b/tests/cpu/UnitTestUtils.cpp index f3cf688ed..74e53e214 100644 --- a/tests/cpu/UnitTestUtils.cpp +++ b/tests/cpu/UnitTestUtils.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/tests/cpu/ops/allocation/AllocationOp_tests.cpp b/tests/cpu/ops/allocation/AllocationOp_tests.cpp index b48bf14bd..4c200dd08 100644 --- a/tests/cpu/ops/allocation/AllocationOp_tests.cpp +++ b/tests/cpu/ops/allocation/AllocationOp_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/allocation/AllocationOp.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/exponent/ExponentOp_tests.cpp b/tests/cpu/ops/exponent/ExponentOp_tests.cpp index a0db512f7..40be17e05 100644 --- a/tests/cpu/ops/exponent/ExponentOp_tests.cpp +++ b/tests/cpu/ops/exponent/ExponentOp_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/exponent/ExponentOp.cpp" #include "ops/noop/NoOps.h" diff --git a/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp index 47ff7e24b..79e9eb851 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "ops/lut1d/Lut1DOpData.cpp" diff --git a/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp index cf20b9d38..2f3ccb214 100644 --- a/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include "ops/lut1d/Lut1DOp.cpp" diff --git a/tests/cpu/ops/matrix/MatrixOp_tests.cpp b/tests/cpu/ops/matrix/MatrixOp_tests.cpp index 47b09e7ff..5ec72299b 100644 --- a/tests/cpu/ops/matrix/MatrixOp_tests.cpp +++ b/tests/cpu/ops/matrix/MatrixOp_tests.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include +#include #include "ops/log/LogOp.h" diff --git a/tests/cpu/transforms/CDLTransform_tests.cpp b/tests/cpu/transforms/CDLTransform_tests.cpp index 5f3c1cad5..c28459339 100644 --- a/tests/cpu/transforms/CDLTransform_tests.cpp +++ b/tests/cpu/transforms/CDLTransform_tests.cpp @@ -4,6 +4,7 @@ #include #include +#include #include "ops/exponent/ExponentOp.h" #include "ops/matrix/MatrixOpData.h" @@ -14,6 +15,7 @@ #include "UnitTestUtils.h" #include "Platform.h" +#include "OpBuilders.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/transforms/ExponentTransform_tests.cpp b/tests/cpu/transforms/ExponentTransform_tests.cpp index 329636a3e..ca528163a 100644 --- a/tests/cpu/transforms/ExponentTransform_tests.cpp +++ b/tests/cpu/transforms/ExponentTransform_tests.cpp @@ -2,8 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include "OpBuilders.h" #include "ops/exponent/ExponentOp.h" -#include "ops/gamma/GammaOp.h" #include "transforms/ExponentTransform.cpp" #include "testutils/UnitTest.h" diff --git a/tests/gpu/GPUUnitTest.cpp b/tests/gpu/GPUUnitTest.cpp index 4f990d12c..3d4b4839d 100644 --- a/tests/gpu/GPUUnitTest.cpp +++ b/tests/gpu/GPUUnitTest.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/testutils/UnitTest.cpp b/tests/testutils/UnitTest.cpp index 3269f56b2..3c3000790 100644 --- a/tests/testutils/UnitTest.cpp +++ b/tests/testutils/UnitTest.cpp @@ -7,7 +7,7 @@ #include #endif -#include +#include #include "apputils/argparse.h" #include "UnitTest.h" From 20d5ac4f7f58eb9fed0c7a8a04e53755c89e6945 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 14:30:08 +0000 Subject: [PATCH 12/48] claen up includes for apps Signed-off-by: Kevin Wheatley --- src/apps/ocioarchive/main.cpp | 2 ++ src/apps/ociobakelut/main.cpp | 4 ++-- src/apps/ociocheck/main.cpp | 2 +- src/apps/ocioconvert/main.cpp | 2 +- src/apps/ociodisplay/main.cpp | 4 ++-- src/apps/ociolutimage/main.cpp | 1 + src/apps/ociomakeclf/main.cpp | 1 + src/apps/ociomergeconfigs/main.cpp | 3 ++- src/apps/ocioperf/main.cpp | 5 +++-- src/apputils/argparse.cpp | 1 - 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp index 68054a6da..22efa9370 100644 --- a/src/apps/ocioarchive/main.cpp +++ b/src/apps/ocioarchive/main.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include #include "utils/StringUtils.h" diff --git a/src/apps/ociobakelut/main.cpp b/src/apps/ociobakelut/main.cpp index 95a9377fa..dbc8dd452 100644 --- a/src/apps/ociobakelut/main.cpp +++ b/src/apps/ociobakelut/main.cpp @@ -2,12 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. -#include #include #include +#include #include #include -#include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ociocheck/main.cpp b/src/apps/ociocheck/main.cpp index 5a0c24524..ff163a788 100644 --- a/src/apps/ociocheck/main.cpp +++ b/src/apps/ociocheck/main.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp index 31a5ed354..1ddbbb26c 100644 --- a/src/apps/ocioconvert/main.cpp +++ b/src/apps/ocioconvert/main.cpp @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ociodisplay/main.cpp b/src/apps/ociodisplay/main.cpp index e59416c81..b7d51264f 100644 --- a/src/apps/ociodisplay/main.cpp +++ b/src/apps/ociodisplay/main.cpp @@ -7,10 +7,10 @@ #include #include #include -#include #include #include -#include +#include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ociolutimage/main.cpp b/src/apps/ociolutimage/main.cpp index c34831ce4..1096c8ab2 100644 --- a/src/apps/ociolutimage/main.cpp +++ b/src/apps/ociolutimage/main.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ociomakeclf/main.cpp b/src/apps/ociomakeclf/main.cpp index 840cc3657..ba946796c 100644 --- a/src/apps/ociomakeclf/main.cpp +++ b/src/apps/ociomakeclf/main.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ociomergeconfigs/main.cpp b/src/apps/ociomergeconfigs/main.cpp index 00d48d42e..e1a456d85 100644 --- a/src/apps/ociomergeconfigs/main.cpp +++ b/src/apps/ociomergeconfigs/main.cpp @@ -4,12 +4,13 @@ #include #include #include +#include #include +#include #include #include -#include "utils/StringUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp index f14c907ae..0fbbb096b 100644 --- a/src/apps/ocioperf/main.cpp +++ b/src/apps/ocioperf/main.cpp @@ -5,12 +5,13 @@ #include #include "apputils/argparse.h" -#include "utils/StringUtils.h" #include -#include #include +#include #include +#include +#include namespace OCIO = OCIO_NAMESPACE; diff --git a/src/apputils/argparse.cpp b/src/apputils/argparse.cpp index d3dfd542a..4312c6aed 100644 --- a/src/apputils/argparse.cpp +++ b/src/apputils/argparse.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include "strutil.h" From 9b9619b26c18cfcc934b3d8b040a024059413a79 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 14:31:49 +0000 Subject: [PATCH 13/48] Tidy system headers for bindings and app helpers Signed-off-by: Kevin Wheatley --- src/bindings/java/JNIColorSpace.cpp | 3 --- src/bindings/java/JNIConfig.cpp | 1 - src/bindings/java/JNILook.cpp | 3 --- src/bindings/java/JNIProcessor.cpp | 2 -- src/bindings/java/JNIUtil.cpp | 1 + src/bindings/python/PyUtils.cpp | 4 ++++ src/libutils/oglapphelpers/metalapp.h | 1 + src/libutils/oglapphelpers/oglapp.h | 1 + 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/bindings/java/JNIColorSpace.cpp b/src/bindings/java/JNIColorSpace.cpp index a1254b989..69e2fc471 100644 --- a/src/bindings/java/JNIColorSpace.cpp +++ b/src/bindings/java/JNIColorSpace.cpp @@ -1,9 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include - #include "OpenColorIO/OpenColorIO.h" #include "OpenColorIOJNI.h" #include "JNIUtil.h" diff --git a/src/bindings/java/JNIConfig.cpp b/src/bindings/java/JNIConfig.cpp index b474974bf..8b40ee421 100644 --- a/src/bindings/java/JNIConfig.cpp +++ b/src/bindings/java/JNIConfig.cpp @@ -3,7 +3,6 @@ #include #include -#include #include "OpenColorIO/OpenColorIO.h" #include "OpenColorIOJNI.h" diff --git a/src/bindings/java/JNILook.cpp b/src/bindings/java/JNILook.cpp index ce482a164..2016360c9 100644 --- a/src/bindings/java/JNILook.cpp +++ b/src/bindings/java/JNILook.cpp @@ -1,9 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include - #include "OpenColorIO/OpenColorIO.h" #include "OpenColorIOJNI.h" #include "JNIUtil.h" diff --git a/src/bindings/java/JNIProcessor.cpp b/src/bindings/java/JNIProcessor.cpp index a2449e4a7..eec7ab57e 100644 --- a/src/bindings/java/JNIProcessor.cpp +++ b/src/bindings/java/JNIProcessor.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include "OpenColorIO/OpenColorIO.h" #include "OpenColorIOJNI.h" diff --git a/src/bindings/java/JNIUtil.cpp b/src/bindings/java/JNIUtil.cpp index 3887f2a57..ab7835985 100644 --- a/src/bindings/java/JNIUtil.cpp +++ b/src/bindings/java/JNIUtil.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/bindings/python/PyUtils.cpp b/src/bindings/python/PyUtils.cpp index fbf1afc31..82fd2062a 100644 --- a/src/bindings/python/PyUtils.cpp +++ b/src/bindings/python/PyUtils.cpp @@ -2,7 +2,11 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include +#include +#include #include "PyUtils.h" diff --git a/src/libutils/oglapphelpers/metalapp.h b/src/libutils/oglapphelpers/metalapp.h index 37fba1401..f312da59c 100644 --- a/src/libutils/oglapphelpers/metalapp.h +++ b/src/libutils/oglapphelpers/metalapp.h @@ -5,6 +5,7 @@ #ifndef INCLUDED_OCIO_METALAPP_H #define INCLUDED_OCIO_METALAPP_H +#include #include diff --git a/src/libutils/oglapphelpers/oglapp.h b/src/libutils/oglapphelpers/oglapp.h index 34b2f7d07..0db286f9b 100644 --- a/src/libutils/oglapphelpers/oglapp.h +++ b/src/libutils/oglapphelpers/oglapp.h @@ -176,6 +176,7 @@ class ScreenApp: public OglApp #ifdef OCIO_HEADLESS_ENABLED +#include #include class HeadlessApp: public OglApp From 0d6ee632a5498c40c3ae2c798267e0dca5e8dcf9 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 15:50:23 +0000 Subject: [PATCH 14/48] Add a number of system includes Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Baker.cpp | 2 ++ src/OpenColorIO/BakingUtils.cpp | 3 +++ src/OpenColorIO/ColorSpace.cpp | 3 +++ src/OpenColorIO/ColorSpaceSet.cpp | 1 + src/OpenColorIO/ConfigUtils.h | 2 ++ src/OpenColorIO/Context.cpp | 1 + src/OpenColorIO/Display.cpp | 1 + src/OpenColorIO/Display.h | 1 + src/OpenColorIO/Exception.cpp | 2 ++ src/OpenColorIO/FileRules.h | 2 +- src/OpenColorIO/GpuShaderClassWrapper.cpp | 5 +++++ src/OpenColorIO/GpuShaderClassWrapper.h | 2 +- src/OpenColorIO/OCIOZArchive.cpp | 2 ++ src/OpenColorIO/Op.cpp | 4 ++++ src/OpenColorIO/ParseUtils.cpp | 4 ++++ src/OpenColorIO/PathUtils.cpp | 3 +++ src/OpenColorIO/ScanlineHelper.h | 2 ++ src/OpenColorIO/TokensManager.h | 2 +- src/OpenColorIO/ViewingRules.cpp | 1 + src/OpenColorIO/apphelpers/CategoryHelpers.cpp | 1 + src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp | 6 +++++- .../apphelpers/mergeconfigs/MergeConfigsHelpers.cpp | 3 ++- src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp | 1 + src/OpenColorIO/fileformats/FileFormatCTF.cpp | 1 + src/OpenColorIO/fileformats/FileFormatICC.cpp | 1 + src/OpenColorIO/fileformats/FileFormatSpi1D.cpp | 1 + src/OpenColorIO/fileformats/FileFormatSpi3D.cpp | 2 ++ src/OpenColorIO/fileformats/FormatMetadata.h | 2 +- src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp | 2 ++ src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h | 5 +++++ src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h | 1 + src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h | 1 + src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.h | 2 ++ src/OpenColorIO/ops/allocation/AllocationOp.h | 4 ++++ src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp | 2 +- src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.h | 3 +++ src/OpenColorIO/ops/gamma/GammaOpData.h | 3 +++ .../ops/gradingrgbcurve/GradingBSplineCurve.cpp | 4 ++++ src/OpenColorIO/ops/gradingtone/GradingTone.cpp | 1 + src/OpenColorIO/ops/log/LogOpData.h | 4 ++++ src/OpenColorIO/ops/log/LogUtils.h | 2 ++ src/OpenColorIO/transforms/FileTransform.cpp | 1 + src/OpenColorIO/transforms/FixedFunctionTransform.cpp | 2 ++ src/OpenColorIO/transforms/GroupTransform.cpp | 3 +++ src/OpenColorIO/transforms/GroupTransform.h | 5 +++++ src/OpenColorIO/transforms/builtins/ACES.cpp | 1 + .../transforms/builtins/BuiltinTransformRegistry.h | 3 +++ tests/cpu/AVX_tests.cpp | 4 ++++ tests/cpu/Caching_tests.cpp | 1 + tests/cpu/Config_tests.cpp | 1 + tests/cpu/Exception_tests.cpp | 1 + tests/cpu/OCIOZArchive_tests.cpp | 5 +++++ tests/cpu/ParseUtils_tests.cpp | 3 +++ tests/cpu/SSE_tests.cpp | 2 ++ tests/cpu/UnitTestMain.cpp | 5 +++++ .../ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp | 4 ++++ .../ops/exposurecontrast/ExposureContrastOpData_tests.cpp | 1 + .../cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp | 1 + .../ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp | 3 +++ tests/cpu/ops/log/LogOpCPU_tests.cpp | 3 +++ tests/cpu/ops/log/LogOpData_tests.cpp | 1 + tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp | 3 +++ tests/cpu/transforms/CDLTransform_tests.cpp | 1 + tests/cpu/transforms/FileTransform_tests.cpp | 3 ++- .../builtins/BuiltinTransformRegistry_tests.cpp | 1 + tests/gpu/FixedFunctionOp_test.cpp | 6 +++++- tests/gpu/GPUUnitTest.cpp | 3 +++ tests/gpu/GradingHueCurveOp_test.cpp | 2 ++ tests/osl/UnitTestMain.cpp | 5 +++++ tests/osl/UnitTestOSL.cpp | 4 ++++ tests/osl/UnitTestOSL.h | 1 + tests/testutils/UnitTest.cpp | 8 ++++++++ tests/testutils/UnitTest.h | 3 +++ tests/utils/NumberUtils_tests.cpp | 1 + 74 files changed, 177 insertions(+), 9 deletions(-) diff --git a/src/OpenColorIO/Baker.cpp b/src/OpenColorIO/Baker.cpp index d93cb520f..2271b8bad 100755 --- a/src/OpenColorIO/Baker.cpp +++ b/src/OpenColorIO/Baker.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include diff --git a/src/OpenColorIO/BakingUtils.cpp b/src/OpenColorIO/BakingUtils.cpp index 0929fa10c..fa66f4ec3 100644 --- a/src/OpenColorIO/BakingUtils.cpp +++ b/src/OpenColorIO/BakingUtils.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include "BakingUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ColorSpace.cpp b/src/OpenColorIO/ColorSpace.cpp index 111b29720..abdfda035 100644 --- a/src/OpenColorIO/ColorSpace.cpp +++ b/src/OpenColorIO/ColorSpace.cpp @@ -3,8 +3,11 @@ #include #include +#include #include +#include #include +#include #include diff --git a/src/OpenColorIO/ColorSpaceSet.cpp b/src/OpenColorIO/ColorSpaceSet.cpp index 1040704ff..2bb3f7151 100644 --- a/src/OpenColorIO/ColorSpaceSet.cpp +++ b/src/OpenColorIO/ColorSpaceSet.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/ConfigUtils.h b/src/OpenColorIO/ConfigUtils.h index 4965a6e2d..a401f01e8 100644 --- a/src/OpenColorIO/ConfigUtils.h +++ b/src/OpenColorIO/ConfigUtils.h @@ -4,6 +4,8 @@ #ifndef INCLUDED_OCIO_CONFIG_UTILS_H #define INCLUDED_OCIO_CONFIG_UTILS_H +#include + #include namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/Context.cpp b/src/OpenColorIO/Context.cpp index d33f0b26b..b5697002a 100644 --- a/src/OpenColorIO/Context.cpp +++ b/src/OpenColorIO/Context.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include diff --git a/src/OpenColorIO/Display.cpp b/src/OpenColorIO/Display.cpp index 4280b9923..b0271ab47 100644 --- a/src/OpenColorIO/Display.cpp +++ b/src/OpenColorIO/Display.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/OpenColorIO/Display.h b/src/OpenColorIO/Display.h index f63ca5a78..621e1af38 100644 --- a/src/OpenColorIO/Display.h +++ b/src/OpenColorIO/Display.h @@ -8,6 +8,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/Exception.cpp b/src/OpenColorIO/Exception.cpp index 061324e13..af68e0bff 100644 --- a/src/OpenColorIO/Exception.cpp +++ b/src/OpenColorIO/Exception.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/FileRules.h b/src/OpenColorIO/FileRules.h index 9b4d81598..745a8d0ff 100644 --- a/src/OpenColorIO/FileRules.h +++ b/src/OpenColorIO/FileRules.h @@ -5,7 +5,7 @@ #ifndef INCLUDED_OCIO_FILERULES_H #define INCLUDED_OCIO_FILERULES_H -#include +#include #include diff --git a/src/OpenColorIO/GpuShaderClassWrapper.cpp b/src/OpenColorIO/GpuShaderClassWrapper.cpp index 5a13bac9e..80eec52bd 100644 --- a/src/OpenColorIO/GpuShaderClassWrapper.cpp +++ b/src/OpenColorIO/GpuShaderClassWrapper.cpp @@ -2,7 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include +#include +#include +#include #include diff --git a/src/OpenColorIO/GpuShaderClassWrapper.h b/src/OpenColorIO/GpuShaderClassWrapper.h index 12527b46b..a9754efcb 100644 --- a/src/OpenColorIO/GpuShaderClassWrapper.h +++ b/src/OpenColorIO/GpuShaderClassWrapper.h @@ -5,7 +5,7 @@ #define INCLUDED_OCIO_GPUSHADERCLASSWRAPPER_H #include -#include +#include #include #include diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp index 09846f3ce..53617b019 100644 --- a/src/OpenColorIO/OCIOZArchive.cpp +++ b/src/OpenColorIO/OCIOZArchive.cpp @@ -2,10 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include #include #include #include +#include #include diff --git a/src/OpenColorIO/Op.cpp b/src/OpenColorIO/Op.cpp index 8b75a957b..590df998e 100755 --- a/src/OpenColorIO/Op.cpp +++ b/src/OpenColorIO/Op.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include +#include +#include +#include #include diff --git a/src/OpenColorIO/ParseUtils.cpp b/src/OpenColorIO/ParseUtils.cpp index d0788d38a..ef0bff75b 100644 --- a/src/OpenColorIO/ParseUtils.cpp +++ b/src/OpenColorIO/ParseUtils.cpp @@ -5,7 +5,11 @@ #include #include #include +#include #include +#include +#include +#include #include diff --git a/src/OpenColorIO/PathUtils.cpp b/src/OpenColorIO/PathUtils.cpp index 99b5a7fcb..3a5c3a322 100644 --- a/src/OpenColorIO/PathUtils.cpp +++ b/src/OpenColorIO/PathUtils.cpp @@ -2,7 +2,9 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include +#include #include @@ -15,6 +17,7 @@ #if !defined(_WIN32) +#include #include #include #else diff --git a/src/OpenColorIO/ScanlineHelper.h b/src/OpenColorIO/ScanlineHelper.h index f2a7a9c0f..91d3210d4 100644 --- a/src/OpenColorIO/ScanlineHelper.h +++ b/src/OpenColorIO/ScanlineHelper.h @@ -5,6 +5,8 @@ #ifndef INCLUDED_OCIO_SCANLINEHELPER_H #define INCLUDED_OCIO_SCANLINEHELPER_H +#include + #include #include "ImagePacking.h" diff --git a/src/OpenColorIO/TokensManager.h b/src/OpenColorIO/TokensManager.h index b96786154..b698ab322 100644 --- a/src/OpenColorIO/TokensManager.h +++ b/src/OpenColorIO/TokensManager.h @@ -5,7 +5,7 @@ #ifndef INCLUDED_OCIO_TOKENS_MANAGER_H #define INCLUDED_OCIO_TOKENS_MANAGER_H -#include +#include #include diff --git a/src/OpenColorIO/ViewingRules.cpp b/src/OpenColorIO/ViewingRules.cpp index 1a7ff20ad..e2a40c4e9 100644 --- a/src/OpenColorIO/ViewingRules.cpp +++ b/src/OpenColorIO/ViewingRules.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/apphelpers/CategoryHelpers.cpp b/src/OpenColorIO/apphelpers/CategoryHelpers.cpp index 33aa2ade2..6b7e57e88 100644 --- a/src/OpenColorIO/apphelpers/CategoryHelpers.cpp +++ b/src/OpenColorIO/apphelpers/CategoryHelpers.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp b/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp index 444058d07..f33350f05 100644 --- a/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp +++ b/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp @@ -5,8 +5,12 @@ #include #include #include +#include #include -#include +#include +#include +#include +#include #include diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp index 78a1953af..2a424a466 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp @@ -4,8 +4,9 @@ #include #include +#include #include -#include +#include #include #include diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp index 0fec3e68d..8c67f3790 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp index c1ea431b1..4e48c139f 100644 --- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatICC.cpp b/src/OpenColorIO/fileformats/FileFormatICC.cpp index 69c0145d8..bf65b9422 100755 --- a/src/OpenColorIO/fileformats/FileFormatICC.cpp +++ b/src/OpenColorIO/fileformats/FileFormatICC.cpp @@ -4,6 +4,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp b/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp index fb2e831ea..3e5e33577 100755 --- a/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp +++ b/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatSpi3D.cpp b/src/OpenColorIO/fileformats/FileFormatSpi3D.cpp index c3ef153f4..33f20069f 100755 --- a/src/OpenColorIO/fileformats/FileFormatSpi3D.cpp +++ b/src/OpenColorIO/fileformats/FileFormatSpi3D.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include diff --git a/src/OpenColorIO/fileformats/FormatMetadata.h b/src/OpenColorIO/fileformats/FormatMetadata.h index 0c182846a..691c215ea 100644 --- a/src/OpenColorIO/fileformats/FormatMetadata.h +++ b/src/OpenColorIO/fileformats/FormatMetadata.h @@ -4,7 +4,7 @@ #ifndef INCLUDED_OCIO_OPS_METADATA_H #define INCLUDED_OCIO_OPS_METADATA_H -#include +#include #include #include diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp index 01d216051..5e47f800e 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp @@ -3,7 +3,9 @@ #include #include +#include #include +#include #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderHelper.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h index e4e1bacec..7f3e7dbc4 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h @@ -4,6 +4,11 @@ #ifndef INCLUDED_OCIO_FILEFORMATS_CTF_CTFREADERHELPER_H #define INCLUDED_OCIO_FILEFORMATS_CTF_CTFREADERHELPER_H +#include +#include + +#include + #include "fileformats/xmlutils/XMLReaderHelper.h" #include "fileformats/ctf/CTFTransform.h" #include "fileformats/ctf/IndexMapping.h" diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h index 384431a21..fcdd46821 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderHelper.h @@ -7,6 +7,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h index babd923ed..9cdaacb94 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h @@ -9,6 +9,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.h b/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.h index c5ea12089..c07a5489a 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.h +++ b/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.h @@ -6,6 +6,8 @@ #include #include +#include +#include #include diff --git a/src/OpenColorIO/ops/allocation/AllocationOp.h b/src/OpenColorIO/ops/allocation/AllocationOp.h index edc3303d6..26b2a0dcf 100644 --- a/src/OpenColorIO/ops/allocation/AllocationOp.h +++ b/src/OpenColorIO/ops/allocation/AllocationOp.h @@ -5,6 +5,10 @@ #ifndef INCLUDED_OCIO_ALLOCATIONOP_H #define INCLUDED_OCIO_ALLOCATIONOP_H +#include +#include +#include + #include #include "Op.h" diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp index ed7fcb362..629d3ce3f 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.h b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.h index c7c92589d..9ff401d23 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.h +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.h @@ -6,6 +6,9 @@ #define INCLUDED_OCIO_FIXEDFUNCTIONOPDATA_H +#include +#include + #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gamma/GammaOpData.h b/src/OpenColorIO/ops/gamma/GammaOpData.h index 086e8f55b..fa9567b54 100644 --- a/src/OpenColorIO/ops/gamma/GammaOpData.h +++ b/src/OpenColorIO/ops/gamma/GammaOpData.h @@ -6,6 +6,9 @@ #define INCLUDED_OCIO_GAMMAOPDATA_H +#include +#include + #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp index dcb923b3c..1658e23db 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.cpp @@ -2,9 +2,13 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include #include #include +#include +#include +#include #include #include "OpenColorIO/DynamicProperty.h" diff --git a/src/OpenColorIO/ops/gradingtone/GradingTone.cpp b/src/OpenColorIO/ops/gradingtone/GradingTone.cpp index 932b0a6d1..065e1fc81 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingTone.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingTone.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/ops/log/LogOpData.h b/src/OpenColorIO/ops/log/LogOpData.h index 3c8ddc3e2..cf395cb88 100644 --- a/src/OpenColorIO/ops/log/LogOpData.h +++ b/src/OpenColorIO/ops/log/LogOpData.h @@ -5,6 +5,10 @@ #ifndef INCLUDED_OCIO_OPS_LOG_LOGOPDATA_H #define INCLUDED_OCIO_OPS_LOG_LOGOPDATA_H +#include +#include +#include + #include #include "Op.h" diff --git a/src/OpenColorIO/ops/log/LogUtils.h b/src/OpenColorIO/ops/log/LogUtils.h index 44246914a..30656488a 100644 --- a/src/OpenColorIO/ops/log/LogUtils.h +++ b/src/OpenColorIO/ops/log/LogUtils.h @@ -5,6 +5,8 @@ #ifndef INCLUDED_OCIO_LOGUTILS_H #define INCLUDED_OCIO_LOGUTILS_H +#include + #include #include "ops/log/LogOpData.h" diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp index 40302bcbe..75d067b2f 100755 --- a/src/OpenColorIO/transforms/FileTransform.cpp +++ b/src/OpenColorIO/transforms/FileTransform.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/transforms/FixedFunctionTransform.cpp b/src/OpenColorIO/transforms/FixedFunctionTransform.cpp index a414fd661..c2a9a71cb 100644 --- a/src/OpenColorIO/transforms/FixedFunctionTransform.cpp +++ b/src/OpenColorIO/transforms/FixedFunctionTransform.cpp @@ -2,7 +2,9 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include #include diff --git a/src/OpenColorIO/transforms/GroupTransform.cpp b/src/OpenColorIO/transforms/GroupTransform.cpp index 89ba45c26..28851fdfd 100755 --- a/src/OpenColorIO/transforms/GroupTransform.cpp +++ b/src/OpenColorIO/transforms/GroupTransform.cpp @@ -2,7 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include +#include +#include #include diff --git a/src/OpenColorIO/transforms/GroupTransform.h b/src/OpenColorIO/transforms/GroupTransform.h index 038404088..592918d18 100644 --- a/src/OpenColorIO/transforms/GroupTransform.h +++ b/src/OpenColorIO/transforms/GroupTransform.h @@ -5,8 +5,13 @@ #ifndef INCLUDED_OCIO_GROUPTRANSFORM_H #define INCLUDED_OCIO_GROUPTRANSFORM_H +#include +#include + #include +#include "fileformats/FormatMetadata.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp index 7c2397406..b341fb325 100644 --- a/src/OpenColorIO/transforms/builtins/ACES.cpp +++ b/src/OpenColorIO/transforms/builtins/ACES.cpp @@ -4,6 +4,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.h b/src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.h index 36df91720..b389a51c2 100644 --- a/src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.h +++ b/src/OpenColorIO/transforms/builtins/BuiltinTransformRegistry.h @@ -7,6 +7,9 @@ #include +#include +#include +#include #include diff --git a/tests/cpu/AVX_tests.cpp b/tests/cpu/AVX_tests.cpp index 106d6e489..11b5021f0 100644 --- a/tests/cpu/AVX_tests.cpp +++ b/tests/cpu/AVX_tests.cpp @@ -5,11 +5,15 @@ #include "CPUInfo.h" #if OCIO_USE_AVX +#include #include #include +#include #include +#include + #include #include "MathUtils.h" #include "BitDepthUtils.h" diff --git a/tests/cpu/Caching_tests.cpp b/tests/cpu/Caching_tests.cpp index 45f926846..18865420a 100644 --- a/tests/cpu/Caching_tests.cpp +++ b/tests/cpu/Caching_tests.cpp @@ -8,6 +8,7 @@ #include "testutils/UnitTest.h" #include "UnitTestUtils.h" +#include "Platform.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp index e5b7aad8e..d472b3ef6 100644 --- a/tests/cpu/Config_tests.cpp +++ b/tests/cpu/Config_tests.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/tests/cpu/Exception_tests.cpp b/tests/cpu/Exception_tests.cpp index c00beb877..77087b7cb 100644 --- a/tests/cpu/Exception_tests.cpp +++ b/tests/cpu/Exception_tests.cpp @@ -3,6 +3,7 @@ #include +#include #include "Exception.cpp" diff --git a/tests/cpu/OCIOZArchive_tests.cpp b/tests/cpu/OCIOZArchive_tests.cpp index 9ccbef31f..2b46d9ffe 100644 --- a/tests/cpu/OCIOZArchive_tests.cpp +++ b/tests/cpu/OCIOZArchive_tests.cpp @@ -1,12 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include #include +#include +#include +#include #include "OpenColorIO/OpenColorIO.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" +#include "Platform.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ParseUtils_tests.cpp b/tests/cpu/ParseUtils_tests.cpp index 246fc92fc..e4899fc48 100644 --- a/tests/cpu/ParseUtils_tests.cpp +++ b/tests/cpu/ParseUtils_tests.cpp @@ -2,6 +2,9 @@ // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include "ParseUtils.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/SSE_tests.cpp b/tests/cpu/SSE_tests.cpp index d1b5302fe..ab6a28bea 100644 --- a/tests/cpu/SSE_tests.cpp +++ b/tests/cpu/SSE_tests.cpp @@ -4,8 +4,10 @@ #if OCIO_USE_SSE2 +#include #include #include +#include #include diff --git a/tests/cpu/UnitTestMain.cpp b/tests/cpu/UnitTestMain.cpp index 848230aa3..3b6530516 100644 --- a/tests/cpu/UnitTestMain.cpp +++ b/tests/cpu/UnitTestMain.cpp @@ -8,6 +8,11 @@ #endif #include +#include +#include +#include +#include +#include #include "testutils/UnitTest.h" #include "apputils/argparse.h" diff --git a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp index eace8f84f..be3bb2ea1 100644 --- a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp +++ b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp @@ -3,6 +3,10 @@ #include +#include +#include +#include +#include #include "ops/exposurecontrast/ExposureContrastOpCPU.cpp" diff --git a/tests/cpu/ops/exposurecontrast/ExposureContrastOpData_tests.cpp b/tests/cpu/ops/exposurecontrast/ExposureContrastOpData_tests.cpp index 177e08f72..f0e2e35fb 100644 --- a/tests/cpu/ops/exposurecontrast/ExposureContrastOpData_tests.cpp +++ b/tests/cpu/ops/exposurecontrast/ExposureContrastOpData_tests.cpp @@ -5,6 +5,7 @@ #include "ops/exposurecontrast/ExposureContrastOpData.cpp" #include "testutils/UnitTest.h" +#include "Platform.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp b/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp index f6d0c3b66..4315729e9 100644 --- a/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp @@ -8,6 +8,7 @@ #include "testutils/UnitTest.h" #include "utils/StringUtils.h" +#include "MathUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp index 42383d778..3c65b498c 100644 --- a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp @@ -3,11 +3,14 @@ #include +#include +#include #include "ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp" #include "testutils/UnitTest.h" #include "utils/StringUtils.h" +#include "MathUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/log/LogOpCPU_tests.cpp b/tests/cpu/ops/log/LogOpCPU_tests.cpp index 974044744..53ecfbc8f 100644 --- a/tests/cpu/ops/log/LogOpCPU_tests.cpp +++ b/tests/cpu/ops/log/LogOpCPU_tests.cpp @@ -3,6 +3,9 @@ #include +#include +#include +#include #include "ops/log/LogOpCPU.cpp" diff --git a/tests/cpu/ops/log/LogOpData_tests.cpp b/tests/cpu/ops/log/LogOpData_tests.cpp index 57466c05f..dc667bf60 100644 --- a/tests/cpu/ops/log/LogOpData_tests.cpp +++ b/tests/cpu/ops/log/LogOpData_tests.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. +#include "ops/log/LogUtils.h" #include "ops/log/LogOpData.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp index 2b3558c6d..99bd5429e 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp @@ -4,6 +4,9 @@ #include #include +#include +#include +#include #include "ops/lut1d/Lut1DOpCPU.cpp" diff --git a/tests/cpu/transforms/CDLTransform_tests.cpp b/tests/cpu/transforms/CDLTransform_tests.cpp index c28459339..82da6ca6d 100644 --- a/tests/cpu/transforms/CDLTransform_tests.cpp +++ b/tests/cpu/transforms/CDLTransform_tests.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "ops/exponent/ExponentOp.h" #include "ops/matrix/MatrixOpData.h" diff --git a/tests/cpu/transforms/FileTransform_tests.cpp b/tests/cpu/transforms/FileTransform_tests.cpp index 5cc371fc5..d3187f6b2 100644 --- a/tests/cpu/transforms/FileTransform_tests.cpp +++ b/tests/cpu/transforms/FileTransform_tests.cpp @@ -2,7 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include "transforms/FileTransform.cpp" @@ -11,6 +11,7 @@ #include "testutils/UnitTest.h" #include "UnitTestLogUtils.h" #include "UnitTestUtils.h" +#include "Platform.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp b/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp index f64d3d976..bc11b6143 100644 --- a/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp +++ b/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp @@ -7,6 +7,7 @@ #include "transforms/builtins/BuiltinTransformRegistry.cpp" #include "testutils/UnitTest.h" +#include "Platform.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/gpu/FixedFunctionOp_test.cpp b/tests/gpu/FixedFunctionOp_test.cpp index 6c3879d85..5a41f7cbd 100644 --- a/tests/gpu/FixedFunctionOp_test.cpp +++ b/tests/gpu/FixedFunctionOp_test.cpp @@ -2,10 +2,14 @@ // Copyright Contributors to the OpenColorIO Project. + +#include +#include + #include #include "GPUUnitTest.h" -#include + namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/gpu/GPUUnitTest.cpp b/tests/gpu/GPUUnitTest.cpp index 3d4b4839d..06d0e3fdd 100644 --- a/tests/gpu/GPUUnitTest.cpp +++ b/tests/gpu/GPUUnitTest.cpp @@ -6,8 +6,11 @@ #include #include #include +#include +#include #include #include +#include #include diff --git a/tests/gpu/GradingHueCurveOp_test.cpp b/tests/gpu/GradingHueCurveOp_test.cpp index 9a1162693..8d416ea0d 100644 --- a/tests/gpu/GradingHueCurveOp_test.cpp +++ b/tests/gpu/GradingHueCurveOp_test.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "GPUUnitTest.h" diff --git a/tests/osl/UnitTestMain.cpp b/tests/osl/UnitTestMain.cpp index 5e105b571..7fc87addb 100644 --- a/tests/osl/UnitTestMain.cpp +++ b/tests/osl/UnitTestMain.cpp @@ -5,6 +5,11 @@ #include #include #include +#include +#include +#include +#include +#include #include namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/osl/UnitTestOSL.cpp b/tests/osl/UnitTestOSL.cpp index 851344aae..a499f847a 100644 --- a/tests/osl/UnitTestOSL.cpp +++ b/tests/osl/UnitTestOSL.cpp @@ -2,7 +2,11 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include +#include +#include +#include #include "UnitTestOSL.h" diff --git a/tests/osl/UnitTestOSL.h b/tests/osl/UnitTestOSL.h index 4b64c9834..2f84eea70 100644 --- a/tests/osl/UnitTestOSL.h +++ b/tests/osl/UnitTestOSL.h @@ -11,6 +11,7 @@ #include #include +#include // Trap the OSL messages in case of error. diff --git a/tests/testutils/UnitTest.cpp b/tests/testutils/UnitTest.cpp index 3c3000790..2c19183c3 100644 --- a/tests/testutils/UnitTest.cpp +++ b/tests/testutils/UnitTest.cpp @@ -8,6 +8,14 @@ #endif #include +#include +#include +#include +#include +#include +#include +#include + #include "apputils/argparse.h" #include "UnitTest.h" diff --git a/tests/testutils/UnitTest.h b/tests/testutils/UnitTest.h index f4bb339ee..42561e969 100644 --- a/tests/testutils/UnitTest.h +++ b/tests/testutils/UnitTest.h @@ -39,6 +39,9 @@ #include #include #include +#include +#include +#include extern int unit_test_failures; diff --git a/tests/utils/NumberUtils_tests.cpp b/tests/utils/NumberUtils_tests.cpp index ba03cd9a7..0d83482f2 100644 --- a/tests/utils/NumberUtils_tests.cpp +++ b/tests/utils/NumberUtils_tests.cpp @@ -6,6 +6,7 @@ #include "utils/NumberUtils.h" #include +#include namespace OCIO = OCIO_NAMESPACE; From 8daaae28b1c32e813b96c8033e903767bdb7366a Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 16:07:18 +0000 Subject: [PATCH 15/48] Start unpicking by removing unneeded OCIO internal includes Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Config.cpp | 6 ++---- src/OpenColorIO/ConfigUtils.cpp | 4 +++- src/OpenColorIO/GpuShader.cpp | 3 --- src/OpenColorIO/GpuShaderDesc.cpp | 10 ++++------ src/OpenColorIO/OCIOYaml.cpp | 17 ++++++++++------- src/OpenColorIO/Platform.cpp | 3 --- src/OpenColorIO/ScanlineHelper.cpp | 5 ++--- .../apphelpers/LegacyViewingPipeline.cpp | 4 ++-- .../apphelpers/mergeconfigs/OCIOMYaml.cpp | 4 +++- .../builtinconfigs/BuiltinConfigRegistry.cpp | 2 -- src/OpenColorIO/fileformats/FileFormat3DL.cpp | 1 - src/OpenColorIO/fileformats/FileFormatCSP.cpp | 3 --- .../fileformats/FileFormatDiscreet1DL.cpp | 4 ---- src/OpenColorIO/fileformats/FileFormatHDL.cpp | 6 +----- .../fileformats/FileFormatIridasCube.cpp | 4 ++-- .../fileformats/FileFormatIridasLook.cpp | 4 +--- .../fileformats/FileFormatResolveCube.cpp | 2 -- src/OpenColorIO/fileformats/ctf/CTFTransform.h | 2 -- src/OpenColorIO/ops/cdl/CDLOp.h | 2 -- src/OpenColorIO/ops/cdl/CDLOpData.cpp | 4 +++- src/OpenColorIO/ops/exponent/ExponentOp.cpp | 1 - .../ops/fixedfunction/FixedFunctionOp.h | 2 -- .../ops/fixedfunction/FixedFunctionOpCPU.h | 2 -- src/OpenColorIO/ops/gamma/GammaOp.h | 2 -- .../ops/gradinghuecurve/GradingHueCurve.cpp | 1 - .../ops/gradinghuecurve/GradingHueCurveOp.h | 2 -- .../gradinghuecurve/GradingHueCurveOpCPU.cpp | 2 -- .../ops/gradinghuecurve/GradingHueCurveOpCPU.h | 2 -- .../gradinghuecurve/GradingHueCurveOpData.cpp | 2 -- .../ops/gradingprimary/GradingPrimaryOp.h | 2 -- .../ops/gradingprimary/GradingPrimaryOpCPU.cpp | 10 ++++++---- .../ops/gradingprimary/GradingPrimaryOpCPU.h | 2 -- .../ops/gradingprimary/GradingPrimaryOpData.cpp | 1 - .../ops/gradingrgbcurve/GradingBSplineCurve.h | 2 +- .../ops/gradingrgbcurve/GradingRGBCurve.cpp | 1 - .../ops/gradingrgbcurve/GradingRGBCurveOp.h | 2 -- .../gradingrgbcurve/GradingRGBCurveOpCPU.cpp | 9 +++++---- .../ops/gradingrgbcurve/GradingRGBCurveOpCPU.h | 2 -- .../gradingrgbcurve/GradingRGBCurveOpData.cpp | 3 +-- src/OpenColorIO/ops/gradingtone/GradingToneOp.h | 2 -- .../ops/gradingtone/GradingToneOpCPU.cpp | 1 - .../ops/gradingtone/GradingToneOpCPU.h | 2 -- .../ops/gradingtone/GradingToneOpData.cpp | 2 -- src/OpenColorIO/ops/log/LogOp.h | 2 -- src/OpenColorIO/ops/log/LogOpCPU.cpp | 5 +---- src/OpenColorIO/ops/log/LogOpData.cpp | 7 +++---- src/OpenColorIO/ops/log/LogOpGPU.cpp | 3 +-- src/OpenColorIO/ops/lut1d/Lut1DOp.h | 2 -- src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp | 2 -- src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp | 2 -- src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp | 4 +--- src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp | 3 +-- src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp | 3 --- src/OpenColorIO/ops/matrix/MatrixOpData.cpp | 1 - src/OpenColorIO/ops/noop/NoOps.h | 2 -- src/OpenColorIO/ops/range/RangeOpCPU.cpp | 1 - src/OpenColorIO/ops/range/RangeOpData.cpp | 1 - src/OpenColorIO/ops/range/RangeOpGPU.cpp | 3 ++- .../ops/reference/ReferenceOpData.cpp | 2 -- .../transforms/DisplayViewTransform.cpp | 4 ++-- src/OpenColorIO/transforms/FileTransform.h | 4 +++- src/OpenColorIO/transforms/LookTransform.cpp | 3 +-- .../transforms/builtins/Displays.cpp | 4 +++- src/utils/StringUtils.h | 2 +- tests/cpu/Baker_tests.cpp | 3 ++- tests/cpu/CPUProcessor_tests.cpp | 5 ++--- tests/cpu/ConfigUtils_tests.cpp | 5 ++--- tests/cpu/UnitTestLogUtils.cpp | 2 -- tests/cpu/UnitTestOptimFlags.cpp | 2 -- tests/cpu/fileformats/FileFormatHDL_tests.cpp | 3 ++- .../ops/fixedfunction/FixedFunctionOp_tests.cpp | 2 -- tests/cpu/ops/gamma/GammaOpCPU_tests.cpp | 1 - tests/cpu/ops/gamma/GammaOp_tests.cpp | 3 --- tests/cpu/transforms/RangeTransform_tests.cpp | 2 -- tests/gpu/GPUUnitTest.h | 2 +- 75 files changed, 74 insertions(+), 163 deletions(-) diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp index 2ac057244..17e765fd5 100644 --- a/src/OpenColorIO/Config.cpp +++ b/src/OpenColorIO/Config.cpp @@ -11,12 +11,13 @@ #include #include #include +#include +#include #include #include -#include "builtinconfigs/BuiltinConfigRegistry.h" #include "ConfigUtils.h" #include "ContextVariableUtils.h" #include "Display.h" @@ -27,16 +28,13 @@ #include "LookParse.h" #include "MathUtils.h" #include "Mutex.h" -#include "NamedTransform.h" #include "OCIOYaml.h" #include "OCIOZArchive.h" -#include "OpBuilders.h" #include "ParseUtils.h" #include "PathUtils.h" #include "Platform.h" #include "PrivateTypes.h" #include "Processor.h" -#include "transforms/FileTransform.h" #include "utils/StringUtils.h" #include "ViewingRules.h" #include "SystemMonitor.h" diff --git a/src/OpenColorIO/ConfigUtils.cpp b/src/OpenColorIO/ConfigUtils.cpp index cb7f4c4dc..c6290d245 100644 --- a/src/OpenColorIO/ConfigUtils.cpp +++ b/src/OpenColorIO/ConfigUtils.cpp @@ -1,14 +1,16 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include +#include +#include #include #include "ConfigUtils.h" #include "MathUtils.h" #include "utils/StringUtils.h" -#include "Logging.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/GpuShader.cpp b/src/OpenColorIO/GpuShader.cpp index 665cee02f..63ca7d2a8 100644 --- a/src/OpenColorIO/GpuShader.cpp +++ b/src/OpenColorIO/GpuShader.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include #include @@ -9,10 +8,8 @@ #include -#include "DynamicProperty.h" #include "GpuShader.h" #include "ops/lut3d/Lut3DOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/GpuShaderDesc.cpp b/src/OpenColorIO/GpuShaderDesc.cpp index 574a7c359..b37061408 100644 --- a/src/OpenColorIO/GpuShaderDesc.cpp +++ b/src/OpenColorIO/GpuShaderDesc.cpp @@ -1,14 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include #include +#include #include -#include "DynamicProperty.h" #include "GpuShader.h" -#include "GpuShaderUtils.h" #include "GpuShaderClassWrapper.h" #include "HashUtils.h" #include "Logging.h" @@ -391,10 +391,8 @@ void GpuShaderCreator::finalize() if(IsDebugLoggingEnabled()) { std::ostringstream oss; - oss << std::endl - << "**" << std::endl - << "GPU Fragment Shader program" << std::endl - << getImpl()->m_shaderCode << std::endl; + oss << "\n**\nGPU Fragment Shader program\n" + << getImpl()->m_shaderCode << "\n"; LogDebug(oss.str()); } diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp index 8c31c3910..9d5ce135a 100644 --- a/src/OpenColorIO/OCIOYaml.cpp +++ b/src/OpenColorIO/OCIOYaml.cpp @@ -2,9 +2,15 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include #include #include +#include +#include +#include +#include +#include +#include #include @@ -16,11 +22,8 @@ #include "MathUtils.h" #include "OCIOYaml.h" #include "ops/exposurecontrast/ExposureContrastOpData.h" -#include "ops/gradingprimary/GradingPrimaryOpData.h" #include "ops/gradingrgbcurve/GradingRGBCurve.h" #include "ops/gradinghuecurve/GradingHueCurve.h" -#include "ops/gradingtone/GradingToneOpData.h" -#include "ops/log/LogUtils.h" #include "ParseUtils.h" #include "PathUtils.h" #include "Platform.h" @@ -4462,9 +4465,9 @@ inline void load(const YAML::Node& node, ConfigRcPtr & config, const char* filen << "." << profile_minor_version << ". "; - os << "This version of the OpenColorIO library (" << GetVersion() << ") "; - os << "is not able to load that config version."; - os << std::endl << ex.what(); + os << "This version of the OpenColorIO library (" << GetVersion() << ") " + "is not able to load that config version.\n"; + os << ex.what(); throw Exception(os.str().c_str()); } diff --git a/src/OpenColorIO/Platform.cpp b/src/OpenColorIO/Platform.cpp index bacc7f584..23e584a30 100644 --- a/src/OpenColorIO/Platform.cpp +++ b/src/OpenColorIO/Platform.cpp @@ -1,12 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include #include #include -#include #include #include diff --git a/src/OpenColorIO/ScanlineHelper.cpp b/src/OpenColorIO/ScanlineHelper.cpp index 59a0020a5..6d3d24e9c 100644 --- a/src/OpenColorIO/ScanlineHelper.cpp +++ b/src/OpenColorIO/ScanlineHelper.cpp @@ -1,13 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include - #include -#include "BitDepthUtils.h" #include "ScanlineHelper.h" +#include + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/apphelpers/LegacyViewingPipeline.cpp b/src/OpenColorIO/apphelpers/LegacyViewingPipeline.cpp index 71fe1941f..747927dae 100644 --- a/src/OpenColorIO/apphelpers/LegacyViewingPipeline.cpp +++ b/src/OpenColorIO/apphelpers/LegacyViewingPipeline.cpp @@ -2,12 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include -#include +#include #include -#include "utils/StringUtils.h" #include "LegacyViewingPipeline.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp index c6bde76fe..cdba15f4b 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp @@ -3,14 +3,16 @@ #include #include +#include #include +#include #include +#include #include #include -#include "Logging.h" #include "OCIOMYaml.h" #include "ParseUtils.h" #include "PathUtils.h" diff --git a/src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.cpp b/src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.cpp index bced3f414..3b29d4703 100644 --- a/src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.cpp +++ b/src/OpenColorIO/builtinconfigs/BuiltinConfigRegistry.cpp @@ -1,8 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include #include diff --git a/src/OpenColorIO/fileformats/FileFormat3DL.cpp b/src/OpenColorIO/fileformats/FileFormat3DL.cpp index c4d90cc77..37fb66324 100755 --- a/src/OpenColorIO/fileformats/FileFormat3DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormat3DL.cpp @@ -10,7 +10,6 @@ #include "BitDepthUtils.h" #include "fileformats/FileFormatUtils.h" -#include "MathUtils.h" #include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "BakingUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatCSP.cpp b/src/OpenColorIO/fileformats/FileFormatCSP.cpp index 418edfa57..ae99af51e 100755 --- a/src/OpenColorIO/fileformats/FileFormatCSP.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCSP.cpp @@ -3,12 +3,10 @@ #include #include -#include #include #include #include #include -#include #include #include @@ -21,7 +19,6 @@ #include "BakingUtils.h" #include "ParseUtils.h" #include "transforms/FileTransform.h" -#include "Platform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp index 90a8451c7..ba84b0199 100755 --- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp @@ -2,7 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include #include @@ -14,10 +13,7 @@ #include "BitDepthUtils.h" #include "fileformats/FileFormatUtils.h" -#include "MathUtils.h" #include "ops/lut1d/Lut1DOp.h" -#include "ops/lut3d/Lut3DOp.h" -#include "ParseUtils.h" #include "Platform.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatHDL.cpp b/src/OpenColorIO/fileformats/FileFormatHDL.cpp index a96218431..666cdc882 100755 --- a/src/OpenColorIO/fileformats/FileFormatHDL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatHDL.cpp @@ -18,20 +18,16 @@ */ -#include -#include -#include #include -#include #include #include #include #include +#include #include #include "fileformats/FileFormatUtils.h" -#include "MathUtils.h" #include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "ops/matrix/MatrixOp.h" diff --git a/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp b/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp index d96815baa..ac1832c2f 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasCube.cpp @@ -2,10 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include -#include #include +#include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp index 0d9c36508..213d0ea88 100755 --- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp +++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp @@ -3,8 +3,8 @@ #include #include -#include #include +#include #include @@ -12,9 +12,7 @@ #include "expat.h" #include "fileformats/FileFormatUtils.h" -#include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" -#include "ParseUtils.h" #include "Platform.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp b/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp index b2a77795e..0fb79fe72 100755 --- a/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp +++ b/src/OpenColorIO/fileformats/FileFormatResolveCube.cpp @@ -12,8 +12,6 @@ #include "ops/matrix/MatrixOp.h" #include "BakingUtils.h" #include "ParseUtils.h" -#include "MathUtils.h" -#include "Logging.h" #include "transforms/FileTransform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFTransform.h b/src/OpenColorIO/fileformats/ctf/CTFTransform.h index f8fb741c2..755b0543d 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFTransform.h +++ b/src/OpenColorIO/fileformats/ctf/CTFTransform.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_FILEFORMATS_CTF_CTFTRANSFORM_H -#include - #include #include "fileformats/FormatMetadata.h" diff --git a/src/OpenColorIO/ops/cdl/CDLOp.h b/src/OpenColorIO/ops/cdl/CDLOp.h index 29681c3ce..50213c4fb 100644 --- a/src/OpenColorIO/ops/cdl/CDLOp.h +++ b/src/OpenColorIO/ops/cdl/CDLOp.h @@ -5,8 +5,6 @@ #ifndef INCLUDED_OCIO_CDL_H #define INCLUDED_OCIO_CDL_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/cdl/CDLOpData.cpp b/src/OpenColorIO/ops/cdl/CDLOpData.cpp index fa214be88..82aa5b5ee 100644 --- a/src/OpenColorIO/ops/cdl/CDLOpData.cpp +++ b/src/OpenColorIO/ops/cdl/CDLOpData.cpp @@ -1,11 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include +#include +#include #include -#include "BitDepthUtils.h" #include "ops/cdl/CDLOpData.h" #include "ops/matrix/MatrixOpData.h" #include "ops/range/RangeOpData.h" diff --git a/src/OpenColorIO/ops/exponent/ExponentOp.cpp b/src/OpenColorIO/ops/exponent/ExponentOp.cpp index 41b95992c..c4921351c 100644 --- a/src/OpenColorIO/ops/exponent/ExponentOp.cpp +++ b/src/OpenColorIO/ops/exponent/ExponentOp.cpp @@ -8,7 +8,6 @@ #include -#include "HashUtils.h" #include "ops/exponent/ExponentOp.h" #include "GpuShaderUtils.h" #include "MathUtils.h" diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.h b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.h index 659f926d6..d643f2445 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.h +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_FIXEDFUNCTION_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.h b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.h index f2946eda4..6264b95f1 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.h +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.h @@ -4,8 +4,6 @@ #ifndef INCLUDED_OCIO_FIXEDFUNCTION_CPU_H #define INCLUDED_OCIO_FIXEDFUNCTION_CPU_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gamma/GammaOp.h b/src/OpenColorIO/ops/gamma/GammaOp.h index d38a46e6a..5b393fd4d 100644 --- a/src/OpenColorIO/ops/gamma/GammaOp.h +++ b/src/OpenColorIO/ops/gamma/GammaOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_GAMMA_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurve.cpp b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurve.cpp index 84e9a7177..ad8263e40 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurve.cpp +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurve.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.h b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.h index 02181e0b5..ea49f0eb7 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.h +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_HUECURVE_OP_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.cpp b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.cpp index c3728eb88..44b0a970b 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.cpp +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.cpp @@ -7,8 +7,6 @@ #include -#include "BitDepthUtils.h" -#include "MathUtils.h" #include "ops/gradinghuecurve/GradingHueCurveOpCPU.h" #include "ops/fixedfunction/FixedFunctionOpCPU.h" #include "ops/fixedfunction/FixedFunctionOpData.h" diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.h b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.h index 934e84ce0..350242dc9 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.h +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpCPU.h @@ -4,8 +4,6 @@ #ifndef INCLUDED_OCIO_GRADINGHUECURVE_CPU_H #define INCLUDED_OCIO_GRADINGHUECURVE_CPU_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp index 8d19439b2..a59ec75bc 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp @@ -5,9 +5,7 @@ #include -#include "ops/gradinghuecurve/GradingHueCurve.h" #include "ops/gradinghuecurve/GradingHueCurveOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.h b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.h index fc109559e..25befd166 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.h +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_GRADINGPRIMARY_OP_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp index f0e73d648..a89cf0289 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp @@ -1,17 +1,19 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include +#include #include -#include "BitDepthUtils.h" -#include "MathUtils.h" #include "ops/gradingprimary/GradingPrimaryOpCPU.h" #include "SSE.h" +#if OCIO_USE_SSE2 == 0 +#include +#include +#endif + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.h b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.h index f05bb41d5..9faa51afd 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.h +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.h @@ -4,8 +4,6 @@ #ifndef INCLUDED_OCIO_GRADINGPRIMARY_CPU_H #define INCLUDED_OCIO_GRADINGPRIMARY_CPU_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp index d6612195d..a2e08a943 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp @@ -7,7 +7,6 @@ #include "ops/gradingprimary/GradingPrimaryOpData.h" #include "ops/range/RangeOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.h b/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.h index f990f6788..6ba4dd4e0 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.h +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingBSplineCurve.h @@ -5,8 +5,8 @@ #ifndef INCLUDED_OCIO_GRADINGBSPLINECURVE_H #define INCLUDED_OCIO_GRADINGBSPLINECURVE_H -#include #include +#include #include diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurve.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurve.cpp index d223c5315..53efa176a 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurve.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurve.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.h b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.h index 21e5c310a..72c06919e 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.h +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_GRADINGRGBCURVE_OP_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp index 914a9881a..71d7213af 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp @@ -1,14 +1,15 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include -#include #include +#include + +#if OCIO_USE_SSE2 == 0 +#include +#endif #include -#include "BitDepthUtils.h" -#include "MathUtils.h" #include "ops/gradingrgbcurve/GradingRGBCurveOpCPU.h" #include "SSE.h" diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.h b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.h index 76d2fae54..4f0b427ef 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.h +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.h @@ -4,8 +4,6 @@ #ifndef INCLUDED_OCIO_GRADINGRGBCURVE_CPU_H #define INCLUDED_OCIO_GRADINGRGBCURVE_CPU_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp index d838811ba..7aee63fc9 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp @@ -7,8 +7,7 @@ #include "ops/gradingrgbcurve/GradingRGBCurve.h" #include "ops/gradingrgbcurve/GradingRGBCurveOpData.h" -#include "ops/range/RangeOpData.h" -#include "Platform.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOp.h b/src/OpenColorIO/ops/gradingtone/GradingToneOp.h index 9ee78f239..a9a70df0e 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOp.h +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOp.h @@ -6,8 +6,6 @@ #define INCLUDED_OCIO_GRADINGTONE_OP_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp index 83949d876..f07519991 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp @@ -7,7 +7,6 @@ #include -#include "BitDepthUtils.h" #include "MathUtils.h" #include "ops/gradingtone/GradingToneOpCPU.h" #include "SSE.h" diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.h b/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.h index 127ab5b23..de744cf24 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.h +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.h @@ -4,8 +4,6 @@ #ifndef INCLUDED_OCIO_GRADINGTONE_CPU_H #define INCLUDED_OCIO_GRADINGTONE_CPU_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp index 67e184cd3..e1b5a8a03 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp @@ -5,10 +5,8 @@ #include -#include "MathUtils.h" #include "ops/gradingtone/GradingTone.h" #include "ops/gradingtone/GradingToneOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/log/LogOp.h b/src/OpenColorIO/ops/log/LogOp.h index 9f6541975..abd4851ed 100644 --- a/src/OpenColorIO/ops/log/LogOp.h +++ b/src/OpenColorIO/ops/log/LogOp.h @@ -5,8 +5,6 @@ #ifndef INCLUDED_OCIO_LOGOPS_H #define INCLUDED_OCIO_LOGOPS_H -#include - #include #include "Op.h" diff --git a/src/OpenColorIO/ops/log/LogOpCPU.cpp b/src/OpenColorIO/ops/log/LogOpCPU.cpp index b46f7450f..ca78bd6e5 100644 --- a/src/OpenColorIO/ops/log/LogOpCPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpCPU.cpp @@ -5,18 +5,15 @@ #include #include #include +#include #if OCIO_USE_SSE2 == 0 #include #endif #include -#include "BitDepthUtils.h" -#include "MathUtils.h" #include "ops/log/LogOpCPU.h" #include "ops/log/LogUtils.h" -#include "ops/OpTools.h" -#include "Platform.h" #include "SSE.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/log/LogOpData.cpp b/src/OpenColorIO/ops/log/LogOpData.cpp index ec0589479..cf747dbdc 100644 --- a/src/OpenColorIO/ops/log/LogOpData.cpp +++ b/src/OpenColorIO/ops/log/LogOpData.cpp @@ -1,18 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include +#include +#include #include #include -#include "BitDepthUtils.h" #include "MathUtils.h" #include "ops/log/LogOpData.h" -#include "ops/log/LogUtils.h" #include "ops/matrix/MatrixOpData.h" #include "ops/range/RangeOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/log/LogOpGPU.cpp b/src/OpenColorIO/ops/log/LogOpGPU.cpp index f3341da1b..c1819ea65 100644 --- a/src/OpenColorIO/ops/log/LogOpGPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpGPU.cpp @@ -1,13 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include #include "GpuShaderUtils.h" -#include "MathUtils.h" #include "ops/log/LogOpGPU.h" #include "ops/log/LogUtils.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOp.h b/src/OpenColorIO/ops/lut1d/Lut1DOp.h index f9f224174..6ceec9b3b 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOp.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOp.h @@ -5,8 +5,6 @@ #ifndef INCLUDED_OCIO_LUT1DOP_H #define INCLUDED_OCIO_LUT1DOP_H -#include - #include #include "ops/lut1d/Lut1DOpData.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp index 6c618b9fd..ee9ac8082 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp @@ -11,8 +11,6 @@ #include "BitDepthUtils.h" #include "MathUtils.h" #include "ops/lut1d/Lut1DOpCPU.h" -#include "ops/OpTools.h" -#include "Platform.h" #include "SSE.h" #include "CPUInfo.h" diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp index d7ea8483a..c390359ad 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp @@ -8,10 +8,8 @@ #include -#include "BitDepthUtils.h" #include "MathUtils.h" #include "ops/lut3d/Lut3DOpCPU.h" -#include "ops/OpTools.h" #include "Platform.h" #include "SSE.h" #include "CPUInfo.h" diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp index e17cbcfce..008d551c1 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp @@ -2,17 +2,15 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include -#include "BitDepthUtils.h" #include "HashUtils.h" -#include "MathUtils.h" #include "ops/lut3d/Lut3DOp.h" #include "ops/lut3d/Lut3DOpData.h" #include "ops/OpTools.h" #include "ops/range/RangeOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp index 79aab8fd3..3e4497222 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpGPU.cpp @@ -1,13 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include #include "GpuShaderUtils.h" -#include "MathUtils.h" #include "ops/lut3d/Lut3DOpGPU.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp b/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp index a30e0d68e..c090d6b99 100644 --- a/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp +++ b/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp @@ -3,10 +3,7 @@ #include -#include "BitDepthUtils.h" -#include "MathUtils.h" #include "ops/matrix/MatrixOpCPU.h" -#include "Platform.h" #include "SSE.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/matrix/MatrixOpData.cpp b/src/OpenColorIO/ops/matrix/MatrixOpData.cpp index 9750b154e..2418787a3 100644 --- a/src/OpenColorIO/ops/matrix/MatrixOpData.cpp +++ b/src/OpenColorIO/ops/matrix/MatrixOpData.cpp @@ -9,7 +9,6 @@ #include "HashUtils.h" #include "MathUtils.h" #include "ops/matrix/MatrixOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/noop/NoOps.h b/src/OpenColorIO/ops/noop/NoOps.h index 8141cbe01..7b765c987 100644 --- a/src/OpenColorIO/ops/noop/NoOps.h +++ b/src/OpenColorIO/ops/noop/NoOps.h @@ -9,8 +9,6 @@ #include "Op.h" -#include - namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/range/RangeOpCPU.cpp b/src/OpenColorIO/ops/range/RangeOpCPU.cpp index b78c458b4..c041af099 100644 --- a/src/OpenColorIO/ops/range/RangeOpCPU.cpp +++ b/src/OpenColorIO/ops/range/RangeOpCPU.cpp @@ -7,7 +7,6 @@ #include #include "MathUtils.h" -#include "ops/matrix/MatrixOpCPU.h" #include "ops/range/RangeOpCPU.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/range/RangeOpData.cpp b/src/OpenColorIO/ops/range/RangeOpData.cpp index d7c714728..d834293d6 100644 --- a/src/OpenColorIO/ops/range/RangeOpData.cpp +++ b/src/OpenColorIO/ops/range/RangeOpData.cpp @@ -10,7 +10,6 @@ #include "MathUtils.h" #include "fileformats/ctf/IndexMapping.h" #include "ops/range/RangeOpData.h" -#include "Platform.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/range/RangeOpGPU.cpp b/src/OpenColorIO/ops/range/RangeOpGPU.cpp index 341025b64..854f19b0d 100644 --- a/src/OpenColorIO/ops/range/RangeOpGPU.cpp +++ b/src/OpenColorIO/ops/range/RangeOpGPU.cpp @@ -1,9 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include -#include "MathUtils.h" #include "ops/range/RangeOpGPU.h" diff --git a/src/OpenColorIO/ops/reference/ReferenceOpData.cpp b/src/OpenColorIO/ops/reference/ReferenceOpData.cpp index 4b8b766f3..58bd2d169 100644 --- a/src/OpenColorIO/ops/reference/ReferenceOpData.cpp +++ b/src/OpenColorIO/ops/reference/ReferenceOpData.cpp @@ -4,8 +4,6 @@ #include #include "ops/reference/ReferenceOpData.h" -#include "Platform.h" -#include "transforms/FileTransform.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/DisplayViewTransform.cpp b/src/OpenColorIO/transforms/DisplayViewTransform.cpp index 2288283ee..350bbfbdc 100644 --- a/src/OpenColorIO/transforms/DisplayViewTransform.cpp +++ b/src/OpenColorIO/transforms/DisplayViewTransform.cpp @@ -2,14 +2,14 @@ // Copyright Contributors to the OpenColorIO Project. -#include +#include #include +#include #include #include "ContextVariableUtils.h" #include "Display.h" -#include "NamedTransform.h" #include "OpBuilders.h" diff --git a/src/OpenColorIO/transforms/FileTransform.h b/src/OpenColorIO/transforms/FileTransform.h index 68c204a39..a2b99efe2 100644 --- a/src/OpenColorIO/transforms/FileTransform.h +++ b/src/OpenColorIO/transforms/FileTransform.h @@ -7,11 +7,13 @@ #include +#include +#include +#include #include #include "Op.h" -#include "ops/noop/NoOps.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/transforms/LookTransform.cpp b/src/OpenColorIO/transforms/LookTransform.cpp index 68a064029..bb711fd57 100755 --- a/src/OpenColorIO/transforms/LookTransform.cpp +++ b/src/OpenColorIO/transforms/LookTransform.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include @@ -10,7 +10,6 @@ #include "LookParse.h" #include "ops/noop/NoOps.h" #include "OpBuilders.h" -#include "ParseUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/transforms/builtins/Displays.cpp b/src/OpenColorIO/transforms/builtins/Displays.cpp index a3e7689b1..e04265f9d 100644 --- a/src/OpenColorIO/transforms/builtins/Displays.cpp +++ b/src/OpenColorIO/transforms/builtins/Displays.cpp @@ -3,13 +3,15 @@ #include +#include +#include +#include #include #include "ops/fixedfunction/FixedFunctionOp.h" #include "ops/gamma/GammaOp.h" #include "ops/matrix/MatrixOp.h" -#include "ops/range/RangeOp.h" #include "transforms/builtins/BuiltinTransformRegistry.h" #include "transforms/builtins/ColorMatrixHelpers.h" #include "transforms/builtins/Displays.h" diff --git a/src/utils/StringUtils.h b/src/utils/StringUtils.h index 7dbfaa1a4..e608e9211 100644 --- a/src/utils/StringUtils.h +++ b/src/utils/StringUtils.h @@ -5,7 +5,7 @@ #define INCLUDED_STRINGUTILS_H #include -#include +#include #include #include #include diff --git a/tests/cpu/Baker_tests.cpp b/tests/cpu/Baker_tests.cpp index b139c83d8..0d0aeea29 100644 --- a/tests/cpu/Baker_tests.cpp +++ b/tests/cpu/Baker_tests.cpp @@ -2,13 +2,14 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include +#include #include "Baker.cpp" #include "testutils/UnitTest.h" #include "ParseUtils.h" -#include "UnitTestUtils.h" #include "utils/StringUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/CPUProcessor_tests.cpp b/tests/cpu/CPUProcessor_tests.cpp index 081cd6159..77a67599d 100644 --- a/tests/cpu/CPUProcessor_tests.cpp +++ b/tests/cpu/CPUProcessor_tests.cpp @@ -3,13 +3,12 @@ #include +#include #include +#include #include "CPUProcessor.cpp" -#include "ops/lut1d/Lut1DOp.h" -#include "ops/lut1d/Lut1DOpData.h" -#include "ScanlineHelper.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" diff --git a/tests/cpu/ConfigUtils_tests.cpp b/tests/cpu/ConfigUtils_tests.cpp index 0917a7a38..70f370dad 100644 --- a/tests/cpu/ConfigUtils_tests.cpp +++ b/tests/cpu/ConfigUtils_tests.cpp @@ -1,13 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include - -#include "UnitTestUtils.h" +#include #include "ConfigUtils.h" #include "testutils/UnitTest.h" -#include "UnitTestLogUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/UnitTestLogUtils.cpp b/tests/cpu/UnitTestLogUtils.cpp index f55dbc11d..40b8ea7a6 100644 --- a/tests/cpu/UnitTestLogUtils.cpp +++ b/tests/cpu/UnitTestLogUtils.cpp @@ -7,8 +7,6 @@ #include #include -#include "Platform.h" -#include "testutils/UnitTest.h" #include "UnitTestLogUtils.h" namespace OCIO_NAMESPACE diff --git a/tests/cpu/UnitTestOptimFlags.cpp b/tests/cpu/UnitTestOptimFlags.cpp index b1ec6b99e..2f3d572e3 100644 --- a/tests/cpu/UnitTestOptimFlags.cpp +++ b/tests/cpu/UnitTestOptimFlags.cpp @@ -6,8 +6,6 @@ #include "UnitTestOptimFlags.h" -#include "Platform.h" - namespace OCIO = OCIO_NAMESPACE; OCIOOptimizationFlagsEnvGuard::OCIOOptimizationFlagsEnvGuard(const char * newValue) diff --git a/tests/cpu/fileformats/FileFormatHDL_tests.cpp b/tests/cpu/fileformats/FileFormatHDL_tests.cpp index 0def9deae..9fbc8698f 100644 --- a/tests/cpu/fileformats/FileFormatHDL_tests.cpp +++ b/tests/cpu/fileformats/FileFormatHDL_tests.cpp @@ -2,12 +2,13 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include +#include #include "fileformats/FileFormatHDL.cpp" #include "testutils/UnitTest.h" -#include "UnitTestUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/fixedfunction/FixedFunctionOp_tests.cpp b/tests/cpu/ops/fixedfunction/FixedFunctionOp_tests.cpp index 1f6e8cfc8..99337e229 100644 --- a/tests/cpu/ops/fixedfunction/FixedFunctionOp_tests.cpp +++ b/tests/cpu/ops/fixedfunction/FixedFunctionOp_tests.cpp @@ -4,10 +4,8 @@ #include "ops/fixedfunction/FixedFunctionOp.cpp" -#include "MathUtils.h" #include "utils/StringUtils.h" #include "testutils/UnitTest.h" -#include "UnitTestUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp index beb28b63e..0916b93cb 100644 --- a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp +++ b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp @@ -8,7 +8,6 @@ #include "ops/gamma/GammaOpCPU.cpp" #include "MathUtils.h" -#include "ParseUtils.h" #include "ops/gamma/GammaOp.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" diff --git a/tests/cpu/ops/gamma/GammaOp_tests.cpp b/tests/cpu/ops/gamma/GammaOp_tests.cpp index 6fdd5cd13..9ebbff5ad 100644 --- a/tests/cpu/ops/gamma/GammaOp_tests.cpp +++ b/tests/cpu/ops/gamma/GammaOp_tests.cpp @@ -2,11 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include "MathUtils.h" #include "ops/gamma/GammaOp.cpp" -#include "ParseUtils.h" #include "testutils/UnitTest.h" -#include "UnitTestUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/transforms/RangeTransform_tests.cpp b/tests/cpu/transforms/RangeTransform_tests.cpp index 9e4298b42..5e6840cec 100644 --- a/tests/cpu/transforms/RangeTransform_tests.cpp +++ b/tests/cpu/transforms/RangeTransform_tests.cpp @@ -2,8 +2,6 @@ // Copyright Contributors to the OpenColorIO Project. -#include - #include "transforms/RangeTransform.cpp" #include "testutils/UnitTest.h" diff --git a/tests/gpu/GPUUnitTest.h b/tests/gpu/GPUUnitTest.h index 59d07183d..5d5711e23 100644 --- a/tests/gpu/GPUUnitTest.h +++ b/tests/gpu/GPUUnitTest.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include "CPUInfoConfig.h" From 1f6a8711b8d927f1b4ef27f006edf69c2bf52e74 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 16:28:54 +0000 Subject: [PATCH 16/48] More missing includes Signed-off-by: Kevin Wheatley --- src/OpenColorIO/fileformats/FileFormatCC.cpp | 1 - src/OpenColorIO/fileformats/FileFormatPandora.cpp | 1 - src/OpenColorIO/fileformats/FileFormatSpiMtx.cpp | 1 - src/OpenColorIO/fileformats/FileFormatTruelight.cpp | 5 +++-- src/OpenColorIO/fileformats/cdl/CDLWriter.cpp | 2 ++ src/OpenColorIO/fileformats/ctf/CTFTransform.cpp | 8 ++++++-- src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.cpp | 3 +++ src/OpenColorIO/ops/log/LogOpGPU.cpp | 1 + src/OpenColorIO/transforms/MatrixTransform.cpp | 3 +++ 9 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/OpenColorIO/fileformats/FileFormatCC.cpp b/src/OpenColorIO/fileformats/FileFormatCC.cpp index 5a24a1005..d38e17e58 100755 --- a/src/OpenColorIO/fileformats/FileFormatCC.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCC.cpp @@ -10,7 +10,6 @@ #include "fileformats/xmlutils/XMLWriterUtils.h" #include "transforms/FileTransform.h" #include "OpBuilders.h" -#include "ParseUtils.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/fileformats/FileFormatPandora.cpp b/src/OpenColorIO/fileformats/FileFormatPandora.cpp index 36f2f6cb8..4973996c6 100755 --- a/src/OpenColorIO/fileformats/FileFormatPandora.cpp +++ b/src/OpenColorIO/fileformats/FileFormatPandora.cpp @@ -9,7 +9,6 @@ #include "BitDepthUtils.h" #include "fileformats/FileFormatUtils.h" -#include "ops/lut1d/Lut1DOp.h" #include "ops/lut3d/Lut3DOp.h" #include "ParseUtils.h" #include "transforms/FileTransform.h" diff --git a/src/OpenColorIO/fileformats/FileFormatSpiMtx.cpp b/src/OpenColorIO/fileformats/FileFormatSpiMtx.cpp index 663a4e9a5..e7713e251 100755 --- a/src/OpenColorIO/fileformats/FileFormatSpiMtx.cpp +++ b/src/OpenColorIO/fileformats/FileFormatSpiMtx.cpp @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include #include #include diff --git a/src/OpenColorIO/fileformats/FileFormatTruelight.cpp b/src/OpenColorIO/fileformats/FileFormatTruelight.cpp index 586f8c6aa..20e8fb3dc 100755 --- a/src/OpenColorIO/fileformats/FileFormatTruelight.cpp +++ b/src/OpenColorIO/fileformats/FileFormatTruelight.cpp @@ -2,11 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include #include #include -#include +#include #include +#include +#include #include diff --git a/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp b/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp index 55d270f8e..6aee8d323 100644 --- a/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp +++ b/src/OpenColorIO/fileformats/cdl/CDLWriter.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "fileformats/cdl/CDLWriter.h" #include "fileformats/xmlutils/XMLReaderUtils.h" #include "fileformats/xmlutils/XMLWriterUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp index eb47e3748..87f287d40 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp @@ -1,8 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include +#include #include +#include +#include +#include +#include #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderUtils.h" @@ -26,8 +32,6 @@ #include "ops/lut3d/Lut3DOpData.h" #include "ops/matrix/MatrixOpData.h" #include "ops/range/RangeOpData.h" -#include "ops/reference/ReferenceOpData.h" -#include "ParseUtils.h" #include "Platform.h" #include "transforms/CDLTransform.h" diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.cpp b/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.cpp index 30fa0a826..67f194b12 100644 --- a/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.cpp +++ b/src/OpenColorIO/fileformats/xmlutils/XMLWriterUtils.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include #include "fileformats/xmlutils/XMLWriterUtils.h" diff --git a/src/OpenColorIO/ops/log/LogOpGPU.cpp b/src/OpenColorIO/ops/log/LogOpGPU.cpp index c1819ea65..3f94e3d74 100644 --- a/src/OpenColorIO/ops/log/LogOpGPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpGPU.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/transforms/MatrixTransform.cpp b/src/OpenColorIO/transforms/MatrixTransform.cpp index e9293c146..4c327dba4 100755 --- a/src/OpenColorIO/transforms/MatrixTransform.cpp +++ b/src/OpenColorIO/transforms/MatrixTransform.cpp @@ -2,7 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include +#include #include From 0fd325c81f8e079cdb2221859491867d6c04efc2 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 17:32:27 +0000 Subject: [PATCH 17/48] Reduce dependency on BitDepthUtils.h , prefer cmath over math.h Signed-off-by: Kevin Wheatley --- src/OpenColorIO/BitDepthUtils.cpp | 2 ++ src/OpenColorIO/CPUInfo.cpp | 2 +- src/OpenColorIO/CPUProcessor.cpp | 1 + src/OpenColorIO/GpuShaderUtils.cpp | 2 +- src/OpenColorIO/ImageDesc.cpp | 3 ++- src/OpenColorIO/ImagePacking.cpp | 3 ++- src/OpenColorIO/OpOptimizers.cpp | 22 ++++++++----------- src/OpenColorIO/fileformats/FileFormat3DL.cpp | 3 +++ .../fileformats/FileFormatDiscreet1DL.cpp | 2 ++ src/OpenColorIO/ops/OpTools.cpp | 3 ++- .../ExposureContrastOpCPU.cpp | 1 - src/OpenColorIO/ops/gamma/GammaOpCPU.cpp | 5 ++++- src/OpenColorIO/ops/gamma/GammaOpUtils.cpp | 3 +-- src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp | 4 ++-- src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp | 4 ++-- src/OpenColorIO/ops/range/RangeOpData.cpp | 2 ++ tests/cpu/fileformats/FileFormatCTF_tests.cpp | 5 +++-- .../ExposureContrastOpCPU_tests.cpp | 1 + tests/gpu/LogOp_test.cpp | 4 ++-- 19 files changed, 42 insertions(+), 30 deletions(-) diff --git a/src/OpenColorIO/BitDepthUtils.cpp b/src/OpenColorIO/BitDepthUtils.cpp index 7c503fa9a..60dd48b7a 100644 --- a/src/OpenColorIO/BitDepthUtils.cpp +++ b/src/OpenColorIO/BitDepthUtils.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include #include "BitDepthUtils.h" diff --git a/src/OpenColorIO/CPUInfo.cpp b/src/OpenColorIO/CPUInfo.cpp index 0b71de2e5..869cc81a7 100644 --- a/src/OpenColorIO/CPUInfo.cpp +++ b/src/OpenColorIO/CPUInfo.cpp @@ -11,7 +11,7 @@ typedef unsigned __int32 uint32_t; typedef __int64 int64_t; #else -#include +#include #endif namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/CPUProcessor.cpp b/src/OpenColorIO/CPUProcessor.cpp index 0c92308fe..73783f36b 100644 --- a/src/OpenColorIO/CPUProcessor.cpp +++ b/src/OpenColorIO/CPUProcessor.cpp @@ -3,6 +3,7 @@ #include #include +#include #include diff --git a/src/OpenColorIO/GpuShaderUtils.cpp b/src/OpenColorIO/GpuShaderUtils.cpp index 6843f6941..0c65545b3 100644 --- a/src/OpenColorIO/GpuShaderUtils.cpp +++ b/src/OpenColorIO/GpuShaderUtils.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include diff --git a/src/OpenColorIO/ImageDesc.cpp b/src/OpenColorIO/ImageDesc.cpp index 5ba6c07b6..cdfa4ff4f 100644 --- a/src/OpenColorIO/ImageDesc.cpp +++ b/src/OpenColorIO/ImageDesc.cpp @@ -2,7 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include +#include #include #include diff --git a/src/OpenColorIO/ImagePacking.cpp b/src/OpenColorIO/ImagePacking.cpp index 0acd10226..b52ac1893 100644 --- a/src/OpenColorIO/ImagePacking.cpp +++ b/src/OpenColorIO/ImagePacking.cpp @@ -4,7 +4,8 @@ #include -#include "BitDepthUtils.h" +#include + #include "ImagePacking.h" diff --git a/src/OpenColorIO/OpOptimizers.cpp b/src/OpenColorIO/OpOptimizers.cpp index f4b98da7d..847b9e8f8 100755 --- a/src/OpenColorIO/OpOptimizers.cpp +++ b/src/OpenColorIO/OpOptimizers.cpp @@ -619,10 +619,8 @@ void OpRcPtrVec::optimize(OptimizationFlags oFlags) if (IsDebugLoggingEnabled()) { std::ostringstream oss; - oss << std::endl - << "**" << std::endl - << "Optimizing Op Vec..." << std::endl - << SerializeOpVec(*this, 4) << std::endl; + oss << "\n**\nOptimizing Op Vec...\n" + << SerializeOpVec(*this, 4) << "\n"; LogDebug(oss.str()); } @@ -639,8 +637,7 @@ void OpRcPtrVec::optimize(OptimizationFlags oFlags) OpRcPtrVec::size_type finalSize = size(); std::ostringstream os; - os << "**" << std::endl; - os << "Optimized "; + os << "**\nOptimized "; os << originalSize << "->" << finalSize << ", 1 pass, "; os << total_nooptype << " no-op types removed\n"; os << SerializeOpVec(*this, 4); @@ -727,11 +724,11 @@ void OpRcPtrVec::optimize(OptimizationFlags oFlags) if (passes == MAX_OPTIMIZATION_PASSES) { std::ostringstream os; - os << "The max number of passes, " << passes << ", "; - os << "was reached during optimization. This is likely a sign "; - os << "that either the complexity of the color transform is "; - os << "very high, or that some internal optimizers are in conflict "; - os << "(undo-ing / redo-ing the other's results)."; + os << "The max number of passes, " << passes << ", " + "was reached during optimization. This is likely a sign " + "that either the complexity of the color transform is " + "very high, or that some internal optimizers are in conflict " + "(undo-ing / redo-ing the other's results)."; LogDebug(os.str()); } @@ -740,8 +737,7 @@ void OpRcPtrVec::optimize(OptimizationFlags oFlags) OpRcPtrVec::size_type finalSize = size(); std::ostringstream os; - os << "**" << std::endl; - os << "Optimized "; + os << "**\nOptimized "; os << originalSize << "->" << finalSize << ", "; os << passes << " passes, "; os << total_nooptype << " no-op types removed, "; diff --git a/src/OpenColorIO/fileformats/FileFormat3DL.cpp b/src/OpenColorIO/fileformats/FileFormat3DL.cpp index 37fb66324..dd9f216df 100755 --- a/src/OpenColorIO/fileformats/FileFormat3DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormat3DL.cpp @@ -4,7 +4,10 @@ #include #include #include +#include #include +#include +#include #include diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp index ba84b0199..3fd10df10 100755 --- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp @@ -4,8 +4,10 @@ #include #include #include +#include #include #include +#include #include diff --git a/src/OpenColorIO/ops/OpTools.cpp b/src/OpenColorIO/ops/OpTools.cpp index 57833a1ce..2155ed2a9 100644 --- a/src/OpenColorIO/ops/OpTools.cpp +++ b/src/OpenColorIO/ops/OpTools.cpp @@ -1,9 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include -#include "BitDepthUtils.h" #include "ops/OpTools.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp index 6a3e7383a..1fa3e2d6f 100644 --- a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp +++ b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp @@ -6,7 +6,6 @@ #include -#include "BitDepthUtils.h" #include "DynamicProperty.h" #include "ops/exposurecontrast/ExposureContrastOpCPU.h" #include "SSE.h" diff --git a/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp b/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp index ace0006ca..089e0aba1 100644 --- a/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp +++ b/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp @@ -3,15 +3,18 @@ #include #include +#include #include -#include "BitDepthUtils.h" #include "ops/gamma/GammaOpCPU.h" #include "ops/gamma/GammaOpUtils.h" #include "SSE.h" +#if OCIO_USE_SSE2 == 0 +#include +#endif namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gamma/GammaOpUtils.cpp b/src/OpenColorIO/ops/gamma/GammaOpUtils.cpp index 8a158fa88..c745948a0 100644 --- a/src/OpenColorIO/ops/gamma/GammaOpUtils.cpp +++ b/src/OpenColorIO/ops/gamma/GammaOpUtils.cpp @@ -2,11 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include #include -#include "BitDepthUtils.h" #include "ops/gamma/GammaOpUtils.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp index ee9ac8082..55dc1cd53 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp @@ -2,9 +2,9 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include +#include #include -#include +#include #include diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp index c390359ad..a287c5cdf 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp @@ -2,9 +2,9 @@ // Copyright Contributors to the OpenColorIO Project. #include -#include -#include +#include #include +#include #include diff --git a/src/OpenColorIO/ops/range/RangeOpData.cpp b/src/OpenColorIO/ops/range/RangeOpData.cpp index d834293d6..237f8003a 100644 --- a/src/OpenColorIO/ops/range/RangeOpData.cpp +++ b/src/OpenColorIO/ops/range/RangeOpData.cpp @@ -1,8 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include #include +#include #include diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp index 61adc3c0a..1c759e43b 100644 --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp @@ -3,14 +3,15 @@ #include -#include +#include +#include #include +#include #include "BitDepthUtils.h" #include "fileformats/FileFormatCTF.cpp" #include "ops/fixedfunction/FixedFunctionOp.h" #include "ops/gradingrgbcurve/GradingRGBCurve.h" -#include "ops/gradinghuecurve/GradingHueCurve.h" #include "testutils/UnitTest.h" #include "UnitTestLogUtils.h" #include "UnitTestUtils.h" diff --git a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp index be3bb2ea1..521e3c74b 100644 --- a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp +++ b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp @@ -9,6 +9,7 @@ #include #include "ops/exposurecontrast/ExposureContrastOpCPU.cpp" +#include "BitDepthUtils.h" #include "testutils/UnitTest.h" diff --git a/tests/gpu/LogOp_test.cpp b/tests/gpu/LogOp_test.cpp index 188f840df..f2ad49fe7 100644 --- a/tests/gpu/LogOp_test.cpp +++ b/tests/gpu/LogOp_test.cpp @@ -1,9 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include -#include +#include #include "GPUUnitTest.h" From 747ade078503d1251d47b653f2e169ce015e6456 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 17:40:59 +0000 Subject: [PATCH 18/48] Fix Imath include for case sensitive OS's Signed-off-by: Kevin Wheatley --- src/OpenColorIO/ImagePacking.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenColorIO/ImagePacking.cpp b/src/OpenColorIO/ImagePacking.cpp index b52ac1893..27eade0c1 100644 --- a/src/OpenColorIO/ImagePacking.cpp +++ b/src/OpenColorIO/ImagePacking.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include "ImagePacking.h" From e43df6aa9808e1a58ab0e8e81c949a12c189b524 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 15 Jan 2026 18:29:06 +0000 Subject: [PATCH 19/48] Switch some std::endl -> "\n" (reduces need for ) In a couple of cases I found we needed to include iostream simply because we used std::endl Switching to "\n" reduces the scope of that reoccurring. I did not replace all of them in this pass - care needs to be taken with the lack of flush() when using std::cout, etc. Signed-off-by: Kevin Wheatley --- include/OpenColorIO/OpenColorIO.h | 2 +- src/OpenColorIO/ColorSpace.cpp | 9 ++---- src/OpenColorIO/GpuShaderUtils.cpp | 2 +- src/OpenColorIO/Logging.cpp | 6 ++-- src/OpenColorIO/fileformats/FileFormatCTF.cpp | 2 +- src/OpenColorIO/transforms/FileTransform.cpp | 19 ++++++------- .../imageioapphelpers/imageio_exr.cpp | 5 ++-- .../imageioapphelpers/imageio_oiio.cpp | 5 ++-- src/libutils/oglapphelpers/glsl.cpp | 7 +++-- src/libutils/oglapphelpers/metalapp.mm | 27 ++++++++---------- src/libutils/oglapphelpers/oglapp.cpp | 28 +++++++++---------- tests/cpu/UnitTestMain.cpp | 10 +++---- tests/gpu/GPUUnitTest.cpp | 16 +++++------ tests/osl/UnitTestMain.cpp | 12 ++++---- tests/testutils/UnitTest.cpp | 10 +++---- 15 files changed, 76 insertions(+), 84 deletions(-) diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h index 3c28b0869..a5e796d0a 100644 --- a/include/OpenColorIO/OpenColorIO.h +++ b/include/OpenColorIO/OpenColorIO.h @@ -52,7 +52,7 @@ C++ API } catch(OCIO::Exception & exception) { - std::cerr << "OpenColorIO Error: " << exception.what() << std::endl; + std::cerr << "OpenColorIO Error: " << exception.what() << "\n"; } */ diff --git a/src/OpenColorIO/ColorSpace.cpp b/src/OpenColorIO/ColorSpace.cpp index abdfda035..87a148645 100644 --- a/src/OpenColorIO/ColorSpace.cpp +++ b/src/OpenColorIO/ColorSpace.cpp @@ -257,8 +257,7 @@ void ColorSpace::setInteropID(const char * interopID) { std::ostringstream oss; oss << "InteropID '" << id << "' contains invalid characters. " - "Only lowercase a-z, 0-9 and . - _ ~ / * # % ^ + ( ) [ ] | are allowed." << - std::endl; + "Only lowercase a-z, 0-9 and . - _ ~ / * # % ^ + ( ) [ ] | are allowed.\n"; throw Exception(oss.str().c_str()); } @@ -275,8 +274,7 @@ void ColorSpace::setInteropID(const char * interopID) { std::ostringstream oss; oss << "InteropID '" << id << "' is not valid. " - "If ':' is used, both the namespace and the color space parts must be non-empty." << - std::endl; + "If ':' is used, both the namespace and the color space parts must be non-empty.\n"; throw Exception(oss.str().c_str()); } @@ -285,8 +283,7 @@ void ColorSpace::setInteropID(const char * interopID) { std::ostringstream oss; oss << "ERROR: InteropID '" << id << "' is not valid. " - "Only one ':' is allowed to separate the namespace and the color space." << - std::endl; + "Only one ':' is allowed to separate the namespace and the color space.\n"; throw Exception(oss.str().c_str()); } } diff --git a/src/OpenColorIO/GpuShaderUtils.cpp b/src/OpenColorIO/GpuShaderUtils.cpp index 0c65545b3..e7fc87d4d 100644 --- a/src/OpenColorIO/GpuShaderUtils.cpp +++ b/src/OpenColorIO/GpuShaderUtils.cpp @@ -338,7 +338,7 @@ void GpuShaderText::flushLine() m_ossText << std::string(tabSize * m_indent, ' ') << m_ossLine.str() - << std::endl; + << "\n"; m_ossLine.str(""); m_ossLine.clear(); diff --git a/src/OpenColorIO/Logging.cpp b/src/OpenColorIO/Logging.cpp index dd5ad9e30..dde2b452a 100644 --- a/src/OpenColorIO/Logging.cpp +++ b/src/OpenColorIO/Logging.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include +#include #include #include @@ -42,8 +42,8 @@ void InitLogging() if(g_logginglevel == LOGGING_LEVEL_UNKNOWN) { - std::cerr << "[OpenColorIO Warning]: Invalid $OCIO_LOGGING_LEVEL specified. "; - std::cerr << "Options: none (0), warning (1), info (2), debug (3)" << std::endl; + std::cerr << "[OpenColorIO Warning]: Invalid $OCIO_LOGGING_LEVEL specified. " + "Options: none (0), warning (1), info (2), debug (3)\n"; g_logginglevel = LOGGING_LEVEL_DEFAULT; } } diff --git a/src/OpenColorIO/fileformats/FileFormatCTF.cpp b/src/OpenColorIO/fileformats/FileFormatCTF.cpp index 4e48c139f..0a1fb9a4c 100644 --- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp +++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp @@ -1584,7 +1584,7 @@ void LocalFileFormat::write(const ConstConfigRcPtr & config, CTFReaderTransformPtr transform = std::make_shared(ops, metadata); // Write XML Header. - ostream << "" << std::endl; + ostream << "\n"; XmlFormatter fmt(ostream); TransformWriter writer(fmt, transform, isCLF); diff --git a/src/OpenColorIO/transforms/FileTransform.cpp b/src/OpenColorIO/transforms/FileTransform.cpp index 75d067b2f..3381512ea 100755 --- a/src/OpenColorIO/transforms/FileTransform.cpp +++ b/src/OpenColorIO/transforms/FileTransform.cpp @@ -601,8 +601,7 @@ void LoadFileUncached(FileFormat * & returnFormat, { std::ostringstream oss; - oss << "**" << std::endl - << "Opening " << filepath; + oss << "**\nOpening " << filepath; LogDebug(oss.str()); } @@ -637,9 +636,9 @@ void LoadFileUncached(FileFormat * & returnFormat, { std::ostringstream os; os << "The specified FileTransform srcfile, '"; - os << filepath << "', could not be opened. "; - os << "Please confirm the file exists with "; - os << "appropriate read permissions."; + os << filepath << "', could not be opened. " + "Please confirm the file exists with " + "appropriate read permissions."; throw Exception(os.str().c_str()); } @@ -649,7 +648,7 @@ void LoadFileUncached(FileFormat * & returnFormat, { std::ostringstream os; os << " Loaded primary format "; - os << tryFormat->getName() << std::endl; + os << tryFormat->getName() << "\n"; LogDebug(os.str()); } @@ -706,10 +705,10 @@ void LoadFileUncached(FileFormat * & returnFormat, { std::ostringstream os; os << "The specified FileTransform srcfile, '"; - os << filepath << "', could not be opened. "; - os << "Please confirm the file exists with "; - os << "appropriate read"; - os << " permissions."; + os << filepath << "', could not be opened. " + "Please confirm the file exists with " + "appropriate read" + " permissions."; throw Exception(os.str().c_str()); } diff --git a/src/libutils/imageioapphelpers/imageio_exr.cpp b/src/libutils/imageioapphelpers/imageio_exr.cpp index a53f9c745..ad0b06431 100644 --- a/src/libutils/imageioapphelpers/imageio_exr.cpp +++ b/src/libutils/imageioapphelpers/imageio_exr.cpp @@ -90,8 +90,7 @@ class ImageIO::Impl { std::ostringstream ss; - ss << std::endl; - ss << "Image: [" << getWidth() << "x" << getHeight() << "] " + ss << "\nImage: [" << getWidth() << "x" << getHeight() << "] " << BitDepthToString(getBitDepth()) << " "; const std::vector chanNames = getChannelNames(); @@ -111,7 +110,7 @@ class ImageIO::Impl ss << ", "; } } - ss << std::endl; + ss << "\n"; return ss.str(); } diff --git a/src/libutils/imageioapphelpers/imageio_oiio.cpp b/src/libutils/imageioapphelpers/imageio_oiio.cpp index 9505af6ee..6cee1c8ca 100644 --- a/src/libutils/imageioapphelpers/imageio_oiio.cpp +++ b/src/libutils/imageioapphelpers/imageio_oiio.cpp @@ -92,8 +92,7 @@ class ImageIO::Impl { std::ostringstream ss; - ss << std::endl; - ss << "Image: [" << getWidth() << "x" << getHeight() << "] " + ss << "\nImage: [" << getWidth() << "x" << getHeight() << "] " << BitDepthToString(getBitDepth()) << " "; const std::vector chanNames = getChannelNames(); @@ -113,7 +112,7 @@ class ImageIO::Impl ss << ", "; } } - ss << std::endl; + ss << "\n"; return ss.str(); } diff --git a/src/libutils/oglapphelpers/glsl.cpp b/src/libutils/oglapphelpers/glsl.cpp index 791648e66..bacbd487c 100644 --- a/src/libutils/oglapphelpers/glsl.cpp +++ b/src/libutils/oglapphelpers/glsl.cpp @@ -18,6 +18,7 @@ #endif +#include #include #include @@ -491,9 +492,9 @@ unsigned OpenGLBuilder::buildProgram(const std::string & clientShaderProgram, bo } std::ostringstream oss; - oss << getGLSLVersionString() << std::endl - << (!standaloneShader ? m_shaderDesc->getShaderText() : "") << std::endl - << clientShaderProgram << std::endl; + oss << getGLSLVersionString() << "\n" + << (!standaloneShader ? m_shaderDesc->getShaderText() : "") << "\n" + << clientShaderProgram << "\n"; if(m_verbose) { diff --git a/src/libutils/oglapphelpers/metalapp.mm b/src/libutils/oglapphelpers/metalapp.mm index be46d4e1b..44c8d5adf 100644 --- a/src/libutils/oglapphelpers/metalapp.mm +++ b/src/libutils/oglapphelpers/metalapp.mm @@ -96,15 +96,15 @@ std::ostringstream main; - main << std::endl - << "uniform sampler2DRect img;" << std::endl - << std::endl - << "void main()" << std::endl - << "{" << std::endl - << " gl_FragColor = texture2DRect(img, gl_TexCoord[0].st * " - << "vec2(" << m_outputImage->getWidth() << ", " << m_outputImage->getHeight() << "));" - << std::endl - << "}" << std::endl; + main << "\n" + "uniform sampler2DRect img;\n" + "\n" + "void main()\n" + "{\n" + " gl_FragColor = texture2DRect(img, gl_TexCoord[0].st * " + "vec2(" << m_outputImage->getWidth() << ", " << m_outputImage->getHeight() << "));" + "\n" + "}\n"; glActiveTexture(GL_TEXTURE0); @@ -339,7 +339,7 @@ vertex VertexOut ColorCorrectionVS(unsigned int vId [[ vertex_id ]]) << shaderDesc->getFunctionName() << "(" << params.str() << uniformParams.str() << separator << "inPixel);\n" << "}\n"; - main << std::endl; + main << "\n"; } else { @@ -348,11 +348,8 @@ vertex VertexOut ColorCorrectionVS(unsigned int vId [[ vertex_id ]]) if(printShader()) { - std::cout << std::endl; - std::cout << "GPU Shader Program:" << std::endl; - std::cout << std::endl; - std::cout << main.str() << std::endl; - std::cout << std::endl; + std::cout << "\nGPU Shader Program:\n\n"; + std::cout << main.str() << "\n\n"; } // Build the fragment shader program. diff --git a/src/libutils/oglapphelpers/oglapp.cpp b/src/libutils/oglapphelpers/oglapp.cpp index 32528a55c..1e0b2b0a7 100644 --- a/src/libutils/oglapphelpers/oglapp.cpp +++ b/src/libutils/oglapphelpers/oglapp.cpp @@ -205,14 +205,14 @@ void OglApp::setShader(GpuShaderDescRcPtr & shaderDesc) m_oglBuilder->allocateAllTextures(1); std::ostringstream main; - main << std::endl - << "uniform sampler2D img;" << std::endl - << std::endl - << "void main()" << std::endl - << "{" << std::endl - << " vec4 col = texture2D(img, gl_TexCoord[0].st);" << std::endl - << " gl_FragColor = " << shaderDesc->getFunctionName() << "(col);" << std::endl - << "}" << std::endl; + main << "\n" + "uniform sampler2D img;\n" + "\n" + "void main()\n" + "{\n" + " vec4 col = texture2D(img, gl_TexCoord[0].st);\n" + " gl_FragColor = " << shaderDesc->getFunctionName() << "(col);\n" + "}\n"; // Build the fragment shader program. m_oglBuilder->buildProgram(main.str().c_str(), false); @@ -229,10 +229,10 @@ void OglApp::setShader(GpuShaderDescRcPtr & shaderDesc) void OglApp::printGLInfo() const noexcept { - std::cout << std::endl - << "GL Vendor: " << glGetString(GL_VENDOR) << std::endl - << "GL Renderer: " << glGetString(GL_RENDERER) << std::endl - << "GL Version: " << glGetString(GL_VERSION) << std::endl + std::cout << "\n" + << "GL Vendor: " << glGetString(GL_VENDOR) << "\n" + << "GL Renderer: " << glGetString(GL_RENDERER) << "\n" + << "GL Version: " << glGetString(GL_VERSION) << "\n" << "GLSL Version: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl; } @@ -374,8 +374,8 @@ void HeadlessApp::printGLInfo() const noexcept void HeadlessApp::printEGLInfo() const noexcept { - std::cout << std::endl - << "EGL Vendor: " << eglQueryString(m_eglDisplay, EGL_VENDOR) << std::endl + std::cout << "\n" + << "EGL Vendor: " << eglQueryString(m_eglDisplay, EGL_VENDOR) << "\n" << "EGL Version: " << eglQueryString(m_eglDisplay, EGL_VERSION) << std::endl; } diff --git a/tests/cpu/UnitTestMain.cpp b/tests/cpu/UnitTestMain.cpp index 3b6530516..f18d8d45b 100644 --- a/tests/cpu/UnitTestMain.cpp +++ b/tests/cpu/UnitTestMain.cpp @@ -95,7 +95,7 @@ int main(int argc, const char ** argv) if (ap.parse(argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage(); return 1; } @@ -192,7 +192,7 @@ int main(int argc, const char ** argv) if (results.size() >= 3) { - std::cerr << "Invalid value for the argument '--run_only'." << std::endl; + std::cerr << "Invalid value for the argument '--run_only'.\n"; ap.usage(); return 1; } @@ -241,12 +241,12 @@ int main(int argc, const char ** argv) } catch(std::exception & ex) { - std::cerr << "\nFAILED: " << ex.what() << "." << std::endl; + std::cerr << "\nFAILED: " << ex.what() << ".\n"; ++unit_test_failures; } catch(...) { - std::cerr << "\nFAILED: Unexpected error." << std::endl; + std::cerr << "\nFAILED: Unexpected error.\n"; ++unit_test_failures; } @@ -270,7 +270,7 @@ int main(int argc, const char ** argv) << std::left << std::setw(maxCharToDisplay+1) << name << "] - " << (passing ? skipped ? "SKIPPED" : "PASSED" : "FAILED") - << std::endl; + << "\n"; if (stopOnFirstError && !passing) { diff --git a/tests/gpu/GPUUnitTest.cpp b/tests/gpu/GPUUnitTest.cpp index 06d0e3fdd..9ef295567 100644 --- a/tests/gpu/GPUUnitTest.cpp +++ b/tests/gpu/GPUUnitTest.cpp @@ -560,7 +560,7 @@ int main(int argc, const char ** argv) if (ap.parse(argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage(); return 1; } @@ -583,7 +583,7 @@ int main(int argc, const char ** argv) if (results.size() >= 3) { - std::cerr << "Invalid value for the argument '--run_only'." << std::endl; + std::cerr << "Invalid value for the argument '--run_only'.\n"; ap.usage(); return 1; } @@ -601,7 +601,7 @@ int main(int argc, const char ** argv) #if __APPLE__ app = OCIO::MetalApp::CreateMetalGlApp("GPU tests - Metal", 10, 10); #else - std::cerr << std::endl << "'GPU tests - Metal' is not supported" << std::endl; + std::cerr << "\n'GPU tests - Metal' is not supported\n"; return 1; #endif } @@ -612,7 +612,7 @@ int main(int argc, const char ** argv) } catch (const OCIO::Exception & e) { - std::cerr << std::endl << e.what() << std::endl; + std::cerr << "\n" << e.what() << "\n"; return 1; } @@ -725,12 +725,12 @@ int main(int argc, const char ** argv) catch(OCIO::Exception & ex) { ++failures; - std::cerr << "FAILED - " << ex.what() << std::endl; + std::cerr << "FAILED - " << ex.what() << "\n"; } catch(...) { ++failures; - std::cerr << "FAILED - Unexpected error" << std::endl; + std::cerr << "FAILED - Unexpected error\n"; } if (!enabledTest) @@ -750,13 +750,13 @@ int main(int argc, const char ** argv) else if(!test->isValid()) { ++failures; - std::cerr << "FAILED - Invalid test" << std::endl; + std::cerr << "FAILED - Invalid test\n"; } // Get rid of the test. tests[idx] = nullptr; } - std::cout << std::endl << failures << " tests failed" << std::endl << std::endl; + std::cout << "\n" << failures << " tests failed\n" << std::endl; return failures; } diff --git a/tests/osl/UnitTestMain.cpp b/tests/osl/UnitTestMain.cpp index 7fc87addb..af0c5468e 100644 --- a/tests/osl/UnitTestMain.cpp +++ b/tests/osl/UnitTestMain.cpp @@ -279,14 +279,14 @@ int main(int, const char **) test->m_expectedMinimalValue, test->m_relativeComparison); - std::cerr << "PASSED" << std::endl; + std::cerr << "PASSED\n"; } catch(std::exception & ex) { failures++; - std::cerr << "FAILED" << std::endl; - std::cerr << ex.what() << std::endl; + std::cerr << "FAILED\n"; + std::cerr << ex.what() << "\n"; std::cerr << "\n***********\n"; std::cerr << oslShaderString; @@ -296,8 +296,8 @@ int main(int, const char **) { failures++; - std::cerr << "FAILED" << std::endl; - std::cerr << "Unexpected exception!" << std::endl; + std::cerr << "FAILED\n"; + std::cerr << "Unexpected exception!\n"; std::cerr << "\n***********\n"; std::cerr << oslShaderString; @@ -307,6 +307,6 @@ int main(int, const char **) noTest++; } - std::cerr << std::endl << failures << " tests failed" << std::endl << std::endl; + std::cerr << "\n" << failures << " tests failed\n\n"; return failures; } diff --git a/tests/testutils/UnitTest.cpp b/tests/testutils/UnitTest.cpp index 2c19183c3..43a5e8e9c 100644 --- a/tests/testutils/UnitTest.cpp +++ b/tests/testutils/UnitTest.cpp @@ -100,7 +100,7 @@ int UnitTestMain(int argc, const char ** argv) if (ap.parse(argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage(); return 1; } @@ -123,7 +123,7 @@ int UnitTestMain(int argc, const char ** argv) if (results.size() >= 3) { - std::cerr << "Invalid value for the argument '--run_only'." << std::endl; + std::cerr << "Invalid value for the argument '--run_only'.\n"; ap.usage(); return 1; } @@ -165,12 +165,12 @@ int UnitTestMain(int argc, const char ** argv) } catch(std::exception & ex) { - std::cerr << "\nFAILED: " << ex.what() << "." << std::endl; + std::cerr << "\nFAILED: " << ex.what() << ".\n"; ++unit_test_failures; } catch(...) { - std::cerr << "\nFAILED: Unexpected error." << std::endl; + std::cerr << "\nFAILED: Unexpected error.\n"; ++unit_test_failures; } @@ -194,7 +194,7 @@ int UnitTestMain(int argc, const char ** argv) << std::left << std::setw(maxCharToDisplay+1) << name << "] - " << (passing ? "PASSED" : "FAILED") - << std::endl; + << "\n"; if (stopOnFirstError && !passing) { From 1e7fa00f54eee154bc5ea526b718683837c9e1f8 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 16 Jan 2026 17:55:02 +0000 Subject: [PATCH 20/48] Further removal or std::endl Signed-off-by: Kevin Wheatley --- .../overview/internal_architecture.rst | 2 +- docs/guides/developing/usage_examples.rst | 4 +- .../apphelpers/mergeconfigs/OCIOMYaml.cpp | 2 +- src/apps/ocioarchive/main.cpp | 46 +++--- src/apps/ociobakelut/main.cpp | 60 ++++---- src/apps/ociobakelut/ocioicc.cpp | 2 +- src/apps/ociocheck/main.cpp | 143 ++++++++---------- src/apps/ociochecklut/main.cpp | 59 ++++---- src/apps/ocioconvert/main.cpp | 96 ++++++------ src/apps/ociocpuinfo/main.cpp | 32 ++-- src/apps/ociodisplay/main.cpp | 97 ++++++------ src/apps/ocioperf/main.cpp | 44 +++--- src/apps/ociowrite/main.cpp | 58 +++---- src/apputils/argparse.h | 2 +- src/apputils/measure.h | 2 +- src/libutils/oglapphelpers/oglapp.cpp | 4 +- tests/cpu/fileformats/FileFormatHDL_tests.cpp | 16 +- tests/cpu/ops/noop/NoOps_tests.cpp | 12 +- tests/gpu/GPUUnitTest.cpp | 6 +- vendor/nuke/OCIOColorSpace/OCIOColorSpace.cpp | 7 +- vendor/nuke/OCIODisplay/OCIODisplay.cpp | 6 +- .../OCIOLookTransform/OCIOLookTransform.cpp | 6 +- 22 files changed, 324 insertions(+), 382 deletions(-) diff --git a/docs/concepts/overview/internal_architecture.rst b/docs/concepts/overview/internal_architecture.rst index 387aa724a..ae5fd8626 100644 --- a/docs/concepts/overview/internal_architecture.rst +++ b/docs/concepts/overview/internal_architecture.rst @@ -135,7 +135,7 @@ Example: } catch(OCIO::Exception & exception) { - std::cerr << "OpenColorIO Error: " << exception.what() << std::endl; + std::cerr << "OpenColorIO Error: " << exception.what() << "\n"; } diff --git a/docs/guides/developing/usage_examples.rst b/docs/guides/developing/usage_examples.rst index e62b80f86..53a4c646f 100644 --- a/docs/guides/developing/usage_examples.rst +++ b/docs/guides/developing/usage_examples.rst @@ -80,7 +80,7 @@ C++ } catch(OCIO::Exception & exception) { - std::cerr << "OpenColorIO Error: " << exception.what() << std::endl; + std::cerr << "OpenColorIO Error: " << exception.what() << "\n"; } .. _usage_applybasic_python: @@ -149,7 +149,7 @@ C++ } catch(OCIO::Exception & exception) { - std::cerr << "OpenColorIO Error: " << exception.what() << std::endl; + std::cerr << "OpenColorIO Error: " << exception.what() << "\n"; } Python diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp index cdba15f4b..916697ffa 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/OCIOMYaml.cpp @@ -303,7 +303,7 @@ void OCIOMYaml::loadParams(const YAML::Node & node, ConfigMergingParametersRcPtr else { // Handle unsupported property or use default handler. - std::cout << "Unsupported property : " << key << std::endl; + std::cout << "Unsupported property : " << key << "\n"; } } } diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp index 22efa9370..db04c8081 100644 --- a/src/apps/ocioarchive/main.cpp +++ b/src/apps/ocioarchive/main.cpp @@ -82,7 +82,7 @@ int main(int argc, const char **argv) if (ap.parse (argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; exit(1); } @@ -98,7 +98,7 @@ int main(int argc, const char **argv) { if (args.size() != 1) { - std::cerr << "ERROR: Missing the name of the archive to create." << std::endl; + std::cerr << "ERROR: Missing the name of the archive to create.\n"; exit(1); } @@ -117,7 +117,7 @@ int main(int argc, const char **argv) catch (...) { // Capture any errors and display a custom message. - std::cerr << "ERROR: Could not load config: " << configFilename << std::endl; + std::cerr << "ERROR: Could not load config: " << configFilename << "\n"; exit(1); } @@ -125,7 +125,7 @@ int main(int argc, const char **argv) else if (ocioEnv && *ocioEnv) { // Archive a config from the environment variable. - std::cout << "Archiving $OCIO=" << ocioEnv << std::endl; + std::cout << "Archiving $OCIO=" << ocioEnv << "\n"; try { config = OCIO::Config::CreateFromEnv(); @@ -134,13 +134,13 @@ int main(int argc, const char **argv) { // Capture any errors and display a custom message. std::cerr << "ERROR: Could not load config from $OCIO variable: " - << ocioEnv << std::endl; + << ocioEnv << "\n"; exit(1); } } else { - std::cerr << "ERROR: You must specify an input OCIO configuration." << std::endl; + std::cerr << "ERROR: You must specify an input OCIO configuration.\n"; exit(1); } @@ -165,29 +165,29 @@ int main(int argc, const char **argv) { std::cerr << "Could not open output stream for: " << archiveName + std::string(OCIO::OCIO_CONFIG_ARCHIVE_FILE_EXT) - << std::endl; + << "\n"; exit(1); } } catch (OCIO::Exception & e) { - std::cerr << e.what() << std::endl; + std::cerr << e.what() << "\n"; exit(1); } } catch (OCIO::Exception & exception) { - std::cerr << "ERROR: " << exception.what() << std::endl; + std::cerr << "ERROR: " << exception.what() << "\n"; exit(1); } catch (std::exception& exception) { - std::cerr << "ERROR: " << exception.what() << std::endl; + std::cerr << "ERROR: " << exception.what() << "\n"; exit(1); } catch (...) { - std::cerr << "ERROR: Unknown problem encountered." << std::endl; + std::cerr << "ERROR: Unknown problem encountered.\n"; exit(1); } } @@ -198,7 +198,7 @@ int main(int argc, const char **argv) { if (args.size() != 1) { - std::cerr << "ERROR: Missing the name of the archive to extract." << std::endl; + std::cerr << "ERROR: Missing the name of the archive to extract.\n"; exit(1); } @@ -217,11 +217,11 @@ int main(int argc, const char **argv) } OCIO::ExtractOCIOZArchive(archiveName.c_str(), extractDestination.c_str()); - std::cout << archiveName << " has been extracted." << std::endl; + std::cout << archiveName << " has been extracted.\n"; } catch (OCIO::Exception & e) { - std::cerr << e.what() << std::endl; + std::cerr << e.what() << "\n"; exit(1); } } @@ -232,7 +232,7 @@ int main(int argc, const char **argv) { if (args.size() < 1) { - std::cerr << "ERROR: Missing the name of the archive to list." << std::endl; + std::cerr << "ERROR: Missing the name of the archive to list.\n"; exit(1); } @@ -247,34 +247,34 @@ int main(int argc, const char **argv) err = mz_zip_reader_open_file(reader, path.c_str()); if (err != MZ_OK) { - std::cerr << "ERROR: File not found: " << path << std::endl; + std::cerr << "ERROR: File not found: " << path << "\n"; exit(1); } err = mz_zip_reader_goto_first_entry(reader); if (err != MZ_OK) { - std::cerr << "ERROR: Could not find the first entry in the archive." << std::endl; + std::cerr << "ERROR: Could not find the first entry in the archive.\n"; exit(1); } - std::cout << "\nThe archive contains the following files:\n" << std::endl; - std::cout << " Date Time CRC-32 Name" << std::endl; - std::cout << " ---- ---- ------ ----" << std::endl; + std::cout << "\nThe archive contains the following files:\n\n"; + std::cout << " Date Time CRC-32 Name\n"; + std::cout << " ---- ---- ------ ----\n" << std::flush; do { err = mz_zip_reader_entry_get_info(reader, &file_info); if (err != MZ_OK) { std::cerr << "ERROR: Could not get information from entry: " << file_info->filename - << std::endl; + << "\n"; exit(1); } mz_zip_time_t_to_tm(file_info->modified_date, &tmu_date); // Print entry information. - printf(" %2.2" PRIu32 "-%2.2" PRIu32 "-%2.2" PRIu32 " %2.2" PRIu32 \ + printf(" %2.2" PRIu32 "-%2.2" PRIu32 "-%2.2" PRIu32 " %2.2" PRIu32 ":%2.2" PRIu32 " %8.8" PRIx32 " %s\n", (uint32_t)tmu_date.tm_mon + 1, (uint32_t)tmu_date.tm_mday, (uint32_t)tmu_date.tm_year % 100, @@ -290,7 +290,7 @@ int main(int argc, const char **argv) else { std::cerr << "Archive, extract, and/or list functions " - "may not be used at the same time." << std::endl; + "may not be used at the same time.\n"; exit(1); } } diff --git a/src/apps/ociobakelut/main.cpp b/src/apps/ociobakelut/main.cpp index dbc8dd452..52060f448 100644 --- a/src/apps/ociobakelut/main.cpp +++ b/src/apps/ociobakelut/main.cpp @@ -116,7 +116,7 @@ int main (int argc, const char* argv[]) if (ap.parse(argc, argv) < 0) { - std::cout << ap.geterror() << std::endl; + std::cout << ap.geterror() << "\n"; ap.usage(); std::cout << "\n"; return 1; @@ -146,21 +146,21 @@ int main (int argc, const char* argv[]) } catch(const OCIO::Exception & e) { - std::cerr << "\nERROR: " << e.what() << std::endl; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "\nERROR: " << e.what() << "\n"; + std::cerr << "See --help for more info.\n"; return 1; } catch(...) { - std::cerr << "\nERROR: An unknown error occurred in parse_luts" << std::endl; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "\nERROR: An unknown error occurred in parse_luts\n"; + std::cerr << "See --help for more info.\n"; return 1; } if(!groupTransform) { - std::cerr << "\nERROR: parse_luts returned null transform" << std::endl; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "\nERROR: parse_luts returned null transform\n"; + std::cerr << "See --help for more info.\n"; return 1; } @@ -171,31 +171,31 @@ int main (int argc, const char* argv[]) if(!inputspace.empty()) { std::cerr << "\nERROR: --inputspace is not allowed when using --lut\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(!outputspace.empty()) { std::cerr << "\nERROR: --outputspace is not allowed when using --lut\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(!looks.empty()) { std::cerr << "\nERROR: --looks is not allowed when using --lut\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(!shaperspace.empty()) { std::cerr << "\nERROR: --shaperspace is not allowed when using --lut\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(!display.empty() || !view.empty()) { std::cerr << "\nERROR: --displayview is not allowed when using --lut\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } @@ -229,35 +229,35 @@ int main (int argc, const char* argv[]) if(inputspace.empty()) { std::cerr << "\nERROR: You must specify the --inputspace.\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(outputspace.empty() && (display.empty() && view.empty())) { std::cerr << "\nERROR: You must specify either --outputspace or --displayview.\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(display.empty() ^ view.empty()) { std::cerr << "\nERROR: You must specify both display and view with --displayview.\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(format.empty()) { std::cerr << "\nERROR: You must specify the LUT format using --format.\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(!inputconfig.empty()) { if(!usestdout && verbose) - std::cout << "[OpenColorIO INFO]: Loading " << inputconfig << std::endl; + std::cout << "[OpenColorIO INFO]: Loading " << inputconfig << "\n"; config = OCIO::Config::CreateFromFile(inputconfig.c_str()); } else if(OCIO::GetEnvVariable("OCIO")) @@ -265,7 +265,7 @@ int main (int argc, const char* argv[]) if(!usestdout && verbose) { std::cout << "[OpenColorIO INFO]: Loading $OCIO " - << OCIO::GetEnvVariable("OCIO") << std::endl; + << OCIO::GetEnvVariable("OCIO") << "\n"; } config = OCIO::Config::CreateFromEnv(); } @@ -281,7 +281,7 @@ int main (int argc, const char* argv[]) if(outputfile.empty() && !usestdout) { std::cerr << "\nERROR: You must specify the outputfile or --stdout.\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } @@ -295,20 +295,20 @@ int main (int argc, const char* argv[]) { description = outputfile; if(verbose) - std::cout << "[OpenColorIO INFO]: \"--description\" set to default value of filename.icc: " << outputfile << "" << std::endl; + std::cout << "[OpenColorIO INFO]: \"--description\" set to default value of filename.icc: " << outputfile << "\n"; } if(usestdout) { std::cerr << "\nERROR: --stdout not supported when writing ICC profiles.\n\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } if(outputfile.empty()) { std::cerr << "ERROR: you need to specify a output ICC path\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } @@ -374,7 +374,7 @@ int main (int argc, const char* argv[]) std::ostringstream output; if(!usestdout && verbose) - std::cout << "[OpenColorIO INFO]: Baking '" << format << "' LUT" << std::endl; + std::cout << "[OpenColorIO INFO]: Baking '" << format << "' LUT\n"; if(usestdout) { @@ -385,31 +385,31 @@ int main (int argc, const char* argv[]) std::ofstream f(outputfile.c_str()); if(f.fail()) { - std::cerr << "ERROR: Non-writable file path " << outputfile << " specified." << std::endl; + std::cerr << "ERROR: Non-writable file path " << outputfile << " specified.\n"; return 1; } baker->bake(f); if(verbose) - std::cout << "[OpenColorIO INFO]: Wrote '" << outputfile << "'" << std::endl; + std::cout << "[OpenColorIO INFO]: Wrote '" << outputfile << "'\n"; } } } catch(OCIO::Exception & exception) { - std::cerr << "OCIO Error: " << exception.what() << std::endl; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "OCIO Error: " << exception.what() << "\n"; + std::cerr << "See --help for more info.\n"; return 1; } catch (std::exception& exception) { std::cerr << "Error: " << exception.what() << "\n"; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "See --help for more info.\n"; return 1; } catch(...) { - std::cerr << "Unknown OCIO error encountered." << std::endl; - std::cerr << "See --help for more info." << std::endl; + std::cerr << "Unknown OCIO error encountered.\n"; + std::cerr << "See --help for more info.\n"; return 1; } diff --git a/src/apps/ociobakelut/ocioicc.cpp b/src/apps/ociobakelut/ocioicc.cpp index 3bedb3b88..23a1d7254 100644 --- a/src/apps/ociobakelut/ocioicc.cpp +++ b/src/apps/ociobakelut/ocioicc.cpp @@ -211,7 +211,7 @@ void SaveICCProfileToFile(const std::string & outputfile, // Write // if(verbose) - std::cout << "[OpenColorIO INFO]: Writing " << outputfile << std::endl; + std::cout << "[OpenColorIO INFO]: Writing " << outputfile << "\n"; cmsSaveProfileToFile(hProfile, outputfile.c_str()); cmsCloseProfile(hProfile); diff --git a/src/apps/ociocheck/main.cpp b/src/apps/ociocheck/main.cpp index ff163a788..b0daf31e7 100644 --- a/src/apps/ociocheck/main.cpp +++ b/src/apps/ociocheck/main.cpp @@ -79,8 +79,7 @@ bool isValidInteropID(const std::string& id) { std::cout << "WARNING: InteropID '" << id << "' is not valid. " "It should either be one of the Color Interop Forum standard IDs or " - "it must contain a namespace followed by ':', e.g. 'mycompany:mycolorspace'." << - std::endl; + "it must contain a namespace followed by ':', e.g. 'mycompany:mycolorspace'.\n"; return false; } } @@ -95,7 +94,7 @@ bool isValidInteropID(const std::string& id) { std::cout << "WARNING: InteropID '" << id << "' is not valid. " "The ID part must not be one of the Color Interop Forum standard IDs " - "when a namespace is used." << std::endl; + "when a namespace is used.\n"; return false; } } @@ -122,7 +121,7 @@ int main(int argc, const char **argv) if (ap.parse(argc, argv) < 0) { - std::cout << ap.geterror() << std::endl; + std::cout << ap.geterror() << "\n"; ap.usage(); std::cout << DESC_STRING; return 1; @@ -142,27 +141,23 @@ int main(int argc, const char **argv) { OCIO::ConstConfigRcPtr srcConfig; - std::cout << std::endl; - std::cout << "OpenColorIO Library Version: " << OCIO::GetVersion() << std::endl; - std::cout << "OpenColorIO Library VersionHex: " << OCIO::GetVersionHex() << std::endl; + std::cout << "\nOpenColorIO Library Version: " << OCIO::GetVersion() << "\n" + "OpenColorIO Library VersionHex: " << OCIO::GetVersionHex() << "\n"; if(!inputconfig.empty()) { - std::cout << std::endl; - std::cout << "Loading " << inputconfig << std::endl; + std::cout << "\nLoading " << inputconfig << "\n"; srcConfig = OCIO::Config::CreateFromFile(inputconfig.c_str()); } else if(OCIO::GetEnvVariable("OCIO")) { - std::cout << std::endl; - std::cout << "Loading $OCIO " << OCIO::GetEnvVariable("OCIO") << std::endl; + std::cout << "\nLoading $OCIO " << OCIO::GetEnvVariable("OCIO") << "\n"; srcConfig = OCIO::Config::CreateFromEnv(); } else { - std::cout << std::endl; - std::cout << "ERROR: You must specify an input OCIO configuration "; - std::cout << "(either with --iconfig or $OCIO).\n"; + std::cout << "\nERROR: You must specify an input OCIO configuration " + "(either with --iconfig or $OCIO).\n"; ap.usage (); std::cout << DESC_STRING; return 1; @@ -173,46 +168,43 @@ int main(int argc, const char **argv) OCIO::ConfigRcPtr config = srcConfig->createEditableCopy(); config->setProcessorCacheFlags(OCIO::PROCESSOR_CACHE_OFF); - std::cout << std::endl; - std::cout << "** General **" << std::endl; + std::cout << "\n** General **\n"; if (config->getNumEnvironmentVars() > 0) { - std::cout << "Environment:" << std::endl; + std::cout << "Environment:\n"; for (int idx = 0; idx < config->getNumEnvironmentVars(); ++idx) { const char * name = config->getEnvironmentVarNameByIndex(idx); std::cout << " " << name << ": " << config->getEnvironmentVarDefault(name) - << std::endl; + << "\n"; } } else { if (config->getEnvironmentMode() == OCIO::ENV_ENVIRONMENT_LOAD_PREDEFINED) { - std::cout << "Environment: {}" << std::endl; + std::cout << "Environment: {}\n"; } else { - std::cout << "Environment: " << std::endl; + std::cout << "Environment: \n"; } } - std::cout << "Search Path: " << config->getSearchPath() << std::endl; - std::cout << "Working Dir: " << config->getWorkingDir() << std::endl; + std::cout << "Search Path: " << config->getSearchPath() << "\n"; + std::cout << "Working Dir: " << config->getWorkingDir() << "\n"; if (config->getNumDisplays() == 0) { - std::cout << std::endl; - std::cout << "ERROR: At least one (display, view) pair must be defined." << std::endl; + std::cout << "\nERROR: At least one (display, view) pair must be defined.\n"; errorcount += 1; } else { - std::cout << std::endl; - std::cout << "Default Display: " << config->getDefaultDisplay() << std::endl; - std::cout << "Default View: " << config->getDefaultView(config->getDefaultDisplay()) << std::endl; + std::cout << "\nDefault Display: " << config->getDefaultDisplay() << "\n"; + std::cout << "Default View: " << config->getDefaultView(config->getDefaultDisplay()) << "\n"; // It's important that the getProcessor call below always loads the transforms // involved in each display/view pair. However, if the src color space is a @@ -231,8 +223,7 @@ int main(int argc, const char **argv) if (config->getNumColorSpaces() > 0) { - std::cout << std::endl; - std::cout << "** (Display, View) pairs **" << std::endl; + std::cout << "\n** (Display, View) pairs **\n"; // Iterate over all displays & views (active & inactive). @@ -255,12 +246,11 @@ int main(int argc, const char **argv) viewName, OCIO::TRANSFORM_DIR_FORWARD); - std::cout << "(" << displayName << ", " << viewName << ")" - << std::endl; + std::cout << "(" << displayName << ", " << viewName << ")\n"; } catch(OCIO::Exception & exception) { - std::cout << "ERROR: " << exception.what() << std::endl; + std::cout << "ERROR: " << exception.what() << "\n"; errorcount += 1; } } @@ -279,12 +269,11 @@ int main(int argc, const char **argv) viewName, OCIO::TRANSFORM_DIR_FORWARD); - std::cout << "(" << displayName << ", " << viewName << ")" - << std::endl; + std::cout << "(" << displayName << ", " << viewName << ")\n"; } catch(OCIO::Exception & exception) { - std::cout << "ERROR: " << exception.what() << std::endl; + std::cout << "ERROR: " << exception.what() << "\n"; errorcount += 1; } } @@ -293,8 +282,7 @@ int main(int argc, const char **argv) } { - std::cout << std::endl; - std::cout << "** Roles **" << std::endl; + std::cout << "\n** Roles **\n"; // All roles defined in OpenColorTypes.h. std::set allRolesSet = { @@ -322,17 +310,17 @@ int main(int argc, const char **argv) { if(allRolesSet.find(role) != allRolesSet.end()) { - std::cout << cs->getName() << " (" << role << ")" << std::endl; + std::cout << cs->getName() << " (" << role << ")\n"; } else { - std::cout << cs->getName() << " (" << role << ": user)" << std::endl; + std::cout << cs->getName() << " (" << role << ": user)\n"; } } else { // Note: The config->validate check below will also fail due to this. - std::cout << "ERROR: SPACE MISSING (" << role << ")" << std::endl; + std::cout << "ERROR: SPACE MISSING (" << role << ")\n"; errorcount += 1; } } @@ -357,15 +345,14 @@ int main(int argc, const char **argv) OCIO::ConstColorSpaceRcPtr cs = config->getColorSpace(role.c_str()); if(!cs) { - std::cout << "WARNING: NOT DEFINED (" << role << ")" << std::endl; + std::cout << "WARNING: NOT DEFINED (" << role << ")\n"; warningcount += 1; } } } { - std::cout << std::endl; - std::cout << "** ColorSpaces **" << std::endl; + std::cout << "\n** ColorSpaces **\n"; const int numCS = config->getNumColorSpaces( OCIO::SEARCH_REFERENCE_SPACE_ALL, // Iterate over scene & display color spaces. @@ -434,21 +421,21 @@ int main(int argc, const char **argv) { // There was a problem with one of the color space's transforms. std::cout << cs->getName(); - std::cout << " -- error" << std::endl; + std::cout << " -- error\n"; if(!toRefOK) { - std::cout << "\t" << toRefErrorText << std::endl; + std::cout << "\t" << toRefErrorText << "\n"; } if(!fromRefOK) { - std::cout << "\t" << fromRefErrorText << std::endl; + std::cout << "\t" << fromRefErrorText << "\n"; } errorcount += 1; } else { // The color space's transforms load ok. - std::cout << cs->getName() << std::endl; + std::cout << cs->getName() << "\n"; } } @@ -462,14 +449,13 @@ int main(int argc, const char **argv) } { - std::cout << std::endl; - std::cout << "** Named Transforms **" << std::endl; + std::cout << "\n** Named Transforms **\n"; // Iterate over active & inactive named transforms. const int numNT = config->getNumNamedTransforms(OCIO::NAMEDTRANSFORM_ALL); if(numNT==0) { - std::cout << "no named transforms defined" << std::endl; + std::cout << "no named transforms defined\n"; } bool foundCategory = false; @@ -524,21 +510,21 @@ int main(int argc, const char **argv) { // There was a problem with one of the named transform's transforms. std::cout << nt->getName(); - std::cout << " -- error" << std::endl; + std::cout << " -- error\n"; if(!fwdOK) { - std::cout << "\t" << fwdErrorText << std::endl; + std::cout << "\t" << fwdErrorText << "\n"; } if(!invOK) { - std::cout << "\t" << invErrorText << std::endl; + std::cout << "\t" << invErrorText << "\n"; } errorcount += 1; } else { // The named transform's transforms load ok. - std::cout << nt->getName() << std::endl; + std::cout << nt->getName() << "\n"; } } @@ -552,13 +538,12 @@ int main(int argc, const char **argv) } { - std::cout << std::endl; - std::cout << "** Looks **" << std::endl; + std::cout << "\n** Looks **\n"; const int numL = config->getNumLooks(); if(numL==0) { - std::cout << "no looks defined" << std::endl; + std::cout << "no looks defined\n"; } for(int i=0; igetName(); - std::cout << " -- error" << std::endl; + std::cout << " -- error\n"; if(!fwdOK) { - std::cout << "\t" << fwdErrorText << std::endl; + std::cout << "\t" << fwdErrorText << "\n"; } if(!invOK) { - std::cout << "\t" << invErrorText << std::endl; + std::cout << "\t" << invErrorText << "\n"; } errorcount += 1; } else { // The look transform's transforms load ok. - std::cout << look->getName() << std::endl; + std::cout << look->getName() << "\n"; } } } - std::cout << std::endl; - std::cout << "** Validation **" << std::endl; + std::cout << "\n** Validation **\n"; std::string cacheID; bool isArchivable = false; @@ -641,26 +625,25 @@ int main(int argc, const char **argv) StringUtils::StringVec svec = StringUtils::SplitByLines(logGuard.output()); if (!StringUtils::Contain(svec, "[OpenColorIO Error]")) { - std::cout << "Validation: passed" << std::endl; + std::cout << "Validation: passed\n"; } else { - std::cout << "Validation: failed" << std::endl; + std::cout << "Validation: failed\n"; errorcount += 1; } } catch(OCIO::Exception & exception) { - std::cout << "ERROR:" << std::endl; + std::cout << "ERROR:\n"; errorcount += 1; - std::cout << exception.what() << std::endl; - std::cout << "Validation: failed" << std::endl; + std::cout << exception.what() << "\n"; + std::cout << "Validation: failed\n"; } - std::cout << std::endl; - std::cout << "** Miscellaneous **" << std::endl; - std::cout << "CacheID: " << cacheID << std::endl; - std::cout << "Archivable: " << (isArchivable ? "yes" : "no") << std::endl; + std::cout << "\n** Miscellaneous **\n"; + std::cout << "CacheID: " << cacheID << "\n"; + std::cout << "Archivable: " << (isArchivable ? "yes" : "no") << "\n"; if(!outputconfig.empty()) { @@ -669,19 +652,19 @@ int main(int argc, const char **argv) if(!output.is_open()) { - std::cout << "Error opening " << outputconfig << " for writing." << std::endl; + std::cout << "Error opening " << outputconfig << " for writing.\n"; } else { config->serialize(output); output.close(); - std::cout << "Wrote " << outputconfig << std::endl; + std::cout << "Wrote " << outputconfig << "\n"; } } } catch(OCIO::Exception & exception) { - std::cout << "ERROR: " << exception.what() << std::endl; + std::cout << "ERROR: " << exception.what() << "\n"; return 1; } catch (std::exception& exception) { std::cout << "ERROR: " << exception.what() << "\n"; @@ -689,24 +672,24 @@ int main(int argc, const char **argv) } catch(...) { - std::cout << "Unknown error encountered." << std::endl; + std::cout << "Unknown error encountered.\n"; return 1; } if(warningcount > 0) { - std::cout << "\nWarnings encountered: " << warningcount << std::endl; + std::cout << "\nWarnings encountered: " << warningcount << "\n"; } - std::cout << std::endl; + std::cout << "\n"; if(errorcount == 0) { - std::cout << "Tests complete." << std::endl << std::endl; + std::cout << "Tests complete.\n\n"; return 0; } else { - std::cout << errorcount << " tests failed." << std::endl << std::endl; + std::cout << errorcount << " tests failed.\n\n"; return 1; } } \ No newline at end of file diff --git a/src/apps/ociochecklut/main.cpp b/src/apps/ociochecklut/main.cpp index 9469090a1..fa3cb4308 100644 --- a/src/apps/ociochecklut/main.cpp +++ b/src/apps/ociochecklut/main.cpp @@ -215,19 +215,18 @@ int main (int argc, const char* argv[]) if (ap.parse(argc, argv) < 0 || help || inputfile.empty()) { - std::cout << ap.geterror() << std::endl; + std::cout << ap.geterror() << "\n"; ap.usage(); - std::cout << DESC_STRING << std::endl; + std::cout << DESC_STRING << "\n"; if (help) { // What are the allowed formats? - std::cout << "Formats supported:" << std::endl; + std::cout << "Formats supported:\n"; const auto nbFormats = OCIO::FileTransform::GetNumFormats(); for (int i = 0; i < nbFormats; ++i) { std::cout << OCIO::FileTransform::GetFormatNameByIndex(i); - std::cout << " (." << OCIO::FileTransform::GetFormatExtensionByIndex(i) << ")"; - std::cout << std::endl; + std::cout << " (." << OCIO::FileTransform::GetFormatExtensionByIndex(i) << ")\n"; } return 0; } @@ -237,15 +236,13 @@ int main (int argc, const char* argv[]) if (verbose) { - std::cout << std::endl; - std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl; + std::cout << "\nOCIO Version: " << OCIO::GetVersion() << "\n"; } #ifndef OCIO_GPU_ENABLED if (usegpu || outputgpuInfo || usegpuLegacy) { - std::cerr << "Compiled without OpenGL support, GPU options are not available."; - std::cerr << std::endl; + std::cerr << "Compiled without OpenGL support, GPU options are not available.\n"; return 1; } #endif // OCIO_GPU_ENABLED @@ -275,15 +272,15 @@ int main (int argc, const char* argv[]) if (printops) { auto transform = processor->createGroupTransform(); - std::cout << "Transform operators: " << std::endl; + std::cout << "Transform operators:\n"; const auto numTransforms = transform->getNumTransforms(); for (int i = 0; i < numTransforms; ++i) { - std::cout << "\t" << *(transform->getTransform(i)) << std::endl; + std::cout << "\t" << *(transform->getTransform(i)) << "\n"; } if (numTransforms == 0) { - std::cout << "No transform." << std::endl; + std::cout << "No transform.\n"; } } if (usegpu || usegpuLegacy) @@ -298,12 +295,12 @@ int main (int argc, const char* argv[]) } catch (const OCIO::Exception & exception) { - std::cerr << "ERROR: " << exception.what() << std::endl; + std::cerr << "ERROR: " << exception.what() << "\n"; return 1; } catch (...) { - std::cerr << "ERROR: Unknown error encountered while creating processor." << std::endl; + std::cerr << "ERROR: Unknown error encountered while creating processor.\n"; return 1; } @@ -319,8 +316,7 @@ int main (int argc, const char* argv[]) if (test && numInput > 0) { - std::cerr << "ERROR: Expecting either RGB (or RGBA) pixel or predefined RGB values (i.e. -t)." - << std::endl; + std::cerr << "ERROR: Expecting either RGB (or RGBA) pixel or predefined RGB values (i.e. -t).\n"; return 1; } @@ -331,8 +327,7 @@ int main (int argc, const char* argv[]) } else if (numInput != 3 && !test) { - std::cerr << "ERROR: Expecting either RGB or RGBA pixel." - << std::endl; + std::cerr << "ERROR: Expecting either RGB or RGBA pixel.\n"; return 1; } @@ -354,7 +349,7 @@ int main (int argc, const char* argv[]) if (verbose || stepInfo) { - std::cout << std::endl; + std::cout << "\n"; } while (validInput) @@ -376,7 +371,7 @@ int main (int argc, const char* argv[]) std::vector outputPixel = pixel; const auto numTransforms = transform->getNumTransforms(); - std::cout << std::endl; + std::cout << "\n"; for (int i = 0; i < numTransforms; ++i) { @@ -403,7 +398,7 @@ int main (int argc, const char* argv[]) std::vector out; ToString(out, outputPixel, 0, comp); - std::cout << "\n" << *(transform->getTransform(i)) << std::endl; + std::cout << "\n" << *(transform->getTransform(i)) << "\n"; std::cout << "Input [R G B"; if (comp == 4) { @@ -411,7 +406,7 @@ int main (int argc, const char* argv[]) } std::cout << "]: ["; PrintAlignedVec(in, out, comp); - std::cout << "]" << std::endl; + std::cout << "]\n"; std::cout << "Output [R G B"; if (comp == 4) @@ -420,19 +415,19 @@ int main (int argc, const char* argv[]) } std::cout << "]: ["; PrintAlignedVec(out, in, comp); - std::cout << "]" << std::endl; + std::cout << "]\n"; inputPixel = outputPixel; } } catch (const OCIO::Exception& exception) { - std::cerr << "ERROR: " << exception.what() << std::endl; + std::cerr << "ERROR: " << exception.what() << "\n"; return 1; } catch (...) { - std::cerr << "ERROR: Unknown error encountered while processing single step operator." << std::endl; + std::cerr << "ERROR: Unknown error encountered while processing single step operator.\n"; return 1; } @@ -447,12 +442,12 @@ int main (int argc, const char* argv[]) } catch (const OCIO::Exception& e) { - std::cerr << "ERROR: Processing pixel: " << e.what() << std::endl; + std::cerr << "ERROR: Processing pixel: " << e.what() << "\n"; return 1; } catch (...) { - std::cerr << "ERROR: Unknown error encountered while processing pixel." << std::endl; + std::cerr << "ERROR: Unknown error encountered while processing pixel.\n"; return 1; } @@ -461,7 +456,7 @@ int main (int argc, const char* argv[]) std::vector out; ToString(out, pixel, 0, comp); - std::cout << std::endl; + std::cout << "\n"; if (verbose) { @@ -475,7 +470,7 @@ int main (int argc, const char* argv[]) } std::cout << "]: ["; PrintAlignedVec(in, out, comp); - std::cout << "]" << std::endl; + std::cout << "]\n"; std::cout << "Output [R G B"; if (comp == 4) @@ -484,7 +479,7 @@ int main (int argc, const char* argv[]) } std::cout << "]: ["; PrintAlignedVec(out, in, comp); - std::cout << "]" << std::endl; + std::cout << "]\n"; } else { @@ -493,7 +488,7 @@ int main (int argc, const char* argv[]) { std::cout << " " << out[3]; } - std::cout << std::endl; + std::cout << "\n"; } curPix += comp; } @@ -502,7 +497,7 @@ int main (int argc, const char* argv[]) { if (verbose) { - std::cout << "Testing with predefined set of RGB pixels." << std::endl; + std::cout << "Testing with predefined set of RGB pixels.\n"; } input = input4test; comp = 3; diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp index 1ddbbb26c..fd1f26daa 100644 --- a/src/apps/ocioconvert/main.cpp +++ b/src/apps/ocioconvert/main.cpp @@ -100,7 +100,7 @@ int main(int argc, const char **argv) if (ap.parse (argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage (); exit(1); } @@ -114,8 +114,7 @@ int main(int argc, const char **argv) #ifndef OCIO_GPU_ENABLED if (usegpu || outputgpuInfo || usegpuLegacy) { - std::cerr << "Compiled without OpenGL support, GPU options are not available."; - std::cerr << std::endl; + std::cerr << "Compiled without OpenGL support, GPU options are not available.\n"; exit(1); } #endif // OCIO_GPU_ENABLED @@ -159,7 +158,7 @@ int main(int argc, const char **argv) if (args.size() != 4) { std::cerr << "ERROR: Expecting 4 arguments, found " - << args.size() << "." << std::endl; + << args.size() << ".\n"; ap.usage(); exit(1); } @@ -170,7 +169,7 @@ int main(int argc, const char **argv) } else if (useLut && useDisplayView) { - std::cerr << "ERROR: Options lut & view can't be used at the same time." << std::endl; + std::cerr << "ERROR: Options lut & view can't be used at the same time.\n"; ap.usage(); exit(1); } @@ -179,7 +178,7 @@ int main(int argc, const char **argv) if (args.size() != 3) { std::cerr << "ERROR: Expecting 3 arguments for --lut option, found " - << args.size() << "." << std::endl; + << args.size() << ".\n"; ap.usage(); exit(1); } @@ -192,7 +191,7 @@ int main(int argc, const char **argv) if (args.size() != 5) { std::cerr << "ERROR: Expecting 5 arguments for --view option, found " - << args.size() << "." << std::endl; + << args.size() << ".\n"; ap.usage(); exit(1); } @@ -204,7 +203,7 @@ int main(int argc, const char **argv) } else if (useDisplayView && useInvertView) { - std::cerr << "ERROR: Options view & invertview can't be used at the same time." << std::endl; + std::cerr << "ERROR: Options view & invertview can't be used at the same time.\n"; ap.usage(); exit(1); } @@ -213,7 +212,7 @@ int main(int argc, const char **argv) if (args.size() != 5) { std::cerr << "ERROR: Expecting 5 arguments for --invertview option, found " - << args.size() << "." << std::endl; + << args.size() << ".\n"; ap.usage(); exit(1); } @@ -227,8 +226,8 @@ int main(int argc, const char **argv) { if (useLut || useDisplayView || useInvertView || useInvNamedTransform) { - std::cerr << "ERROR: Option namedtransform can't be used with lut, view, invertview, \ - or invnamedtransform at the same time." << std::endl; + std::cerr << "ERROR: Option namedtransform can't be used with lut, view, invertview, " + "or invnamedtransform at the same time.\n"; ap.usage(); exit(1); } @@ -236,7 +235,7 @@ int main(int argc, const char **argv) if (args.size() != 3) { std::cerr << "ERROR: Expecting 3 arguments for --namedtransform option, found " - << args.size() << "." << std::endl; + << args.size() << ".\n"; ap.usage(); exit(1); } @@ -249,8 +248,8 @@ int main(int argc, const char **argv) { if (useLut || useDisplayView || useInvertView || useNamedTransform) { - std::cerr << "ERROR: Option invnamedtransform can't be used with lut, view, invertview, \ - or namedtransform at the same time." << std::endl; + std::cerr << "ERROR: Option invnamedtransform can't be used with lut, view, invertview, " + "or namedtransform at the same time.\n"; ap.usage(); exit(1); } @@ -258,7 +257,7 @@ int main(int argc, const char **argv) if (args.size() != 3) { std::cerr << "ERROR: Expecting 3 arguments for --invnamedtransform option, found " - << args.size() << "." << std::endl; + << args.size() << ".\n"; ap.usage(); exit(1); } @@ -291,40 +290,37 @@ int main(int argc, const char **argv) } catch (const OCIO::Exception & e) { - std::cout << "ERROR loading config file: " << e.what() << std::endl; + std::cout << "ERROR loading config file: " << e.what() << "\n"; exit(1); } catch (...) { - std::cerr << "ERROR loading config file: '" << inputconfig << "'" << std::endl; + std::cerr << "ERROR loading config file: '" << inputconfig << "'\n"; exit(1); } if (verbose) { - std::cout << std::endl; - std::cout << OCIO::ImageIO::GetVersion() << std::endl; - std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl; + std::cout << "\n" + << OCIO::ImageIO::GetVersion() << "\n" + << "OCIO Version: " << OCIO::GetVersion() << "\n"; if (!useLut) { - std::cout << std::endl; - std::cout << "OCIO Config. file: '" << inputconfig << "'" << std::endl; - std::cout << "OCIO Config. version: " << config->getMajorVersion() << "." - << config->getMinorVersion() << std::endl; - std::cout << "OCIO search_path: " << config->getSearchPath() << std::endl; + std::cout << "\nOCIO Config. file: '" << inputconfig << "'\n" + "OCIO Config. version: " << config->getMajorVersion() << "." + << config->getMinorVersion() << "\n" + "OCIO search_path: " << config->getSearchPath() << "\n"; } } if (usegpuLegacy) { - std::cout << std::endl; - std::cout << "Using legacy OCIO v1 GPU color processing." << std::endl; + std::cout << "\nUsing legacy OCIO v1 GPU color processing.\n"; } else if (usegpu) { - std::cout << std::endl; - std::cout << "Using GPU color processing." << std::endl; + std::cout << "\nUsing GPU color processing.\n"; } OCIO::ImageIO imgInput; @@ -333,8 +329,7 @@ int main(int argc, const char **argv) OCIO::ImageIO *imgOutput = &imgInput; // Load the image. - std::cout << std::endl; - std::cout << "Loading " << inputimage << std::endl; + std::cout << "\nLoading " << inputimage << "\n"; try { if (usegpu || usegpuLegacy) @@ -346,16 +341,16 @@ int main(int argc, const char **argv) imgInput.read(inputimage); } - std::cout << imgInput.getImageDescStr() << std::endl; + std::cout << imgInput.getImageDescStr() << "\n"; } catch (const std::exception & e) { - std::cerr << "ERROR: Loading file failed: " << e.what() << std::endl; + std::cerr << "ERROR: Loading file failed: " << e.what() << "\n"; exit(1); } catch (...) { - std::cerr << "ERROR: Loading file failed." << std::endl; + std::cerr << "ERROR: Loading file failed.\n"; exit(1); } @@ -377,7 +372,7 @@ int main(int argc, const char **argv) else { std::cerr << "Cannot convert image with " << imgInput.getNumChannels() - << " components." << std::endl; + << " components.\n"; exit(1); } @@ -387,7 +382,7 @@ int main(int argc, const char **argv) } catch (const OCIO::Exception & e) { - std::cerr << std::endl << e.what() << std::endl; + std::cerr << "\n" << e.what() << "\n"; exit(1); } @@ -447,7 +442,7 @@ int main(int argc, const char **argv) } else { - std::cout << "ERROR: Could not get NamedTransform " << namedtransform << std::endl; + std::cout << "ERROR: Could not get NamedTransform " << namedtransform << "\n"; exit(1); } } @@ -461,7 +456,7 @@ int main(int argc, const char **argv) } else { - std::cout << "ERROR: Could not get NamedTransform " << namedtransform << std::endl; + std::cout << "ERROR: Could not get NamedTransform " << namedtransform << "\n"; exit(1); } } @@ -472,12 +467,12 @@ int main(int argc, const char **argv) } catch (const OCIO::Exception & e) { - std::cout << "ERROR: OCIO failed with: " << e.what() << std::endl; + std::cout << "ERROR: OCIO failed with: " << e.what() << "\n"; exit(1); } catch (...) { - std::cout << "ERROR: Creating processor unknown failure." << std::endl; + std::cout << "ERROR: Creating processor unknown failure.\n"; exit(1); } @@ -575,21 +570,18 @@ int main(int argc, const char **argv) std::chrono::duration duration = end - start; - std::cout << std::endl; - std::cout << "CPU processing took: " - << duration.count() - << " ms" << std::endl; + std::cout << "\nCPU processing took: " << duration.count() << " ms\n"; } } } catch (const OCIO::Exception & exception) { - std::cerr << "ERROR: OCIO failed with: " << exception.what() << std::endl; + std::cerr << "ERROR: OCIO failed with: " << exception.what() << "\n"; exit(1); } catch (...) { - std::cerr << "ERROR: Unknown error processing the image." << std::endl; + std::cerr << "ERROR: Unknown error processing the image.\n"; exit(1); } @@ -604,7 +596,7 @@ int main(int argc, const char **argv) !StringToFloat(&fval,value.c_str())) { std::cerr << "ERROR: Attribute string '" << floatAttrs[i] - << "' should be in the form name=floatvalue." << std::endl; + << "' should be in the form name=floatvalue.\n"; parseError = true; continue; } @@ -620,7 +612,7 @@ int main(int argc, const char **argv) !StringToInt(&ival,value.c_str())) { std::cerr << "ERROR: Attribute string '" << intAttrs[i] - << "' should be in the form name=intvalue." << std::endl; + << "' should be in the form name=intvalue.\n"; parseError = true; continue; } @@ -634,7 +626,7 @@ int main(int argc, const char **argv) if (!ParseNameValuePair(name, value, stringAttrs[i])) { std::cerr << "ERROR: Attribute string '" << stringAttrs[i] - << "' should be in the form name=value." << std::endl; + << "' should be in the form name=value.\n"; parseError = true; continue; } @@ -672,12 +664,12 @@ int main(int argc, const char **argv) } catch (...) { - std::cerr << "ERROR: Writing file \"" << outputimage << "\"." << std::endl; + std::cerr << "ERROR: Writing file \"" << outputimage << "\".\n"; exit(1); } - std::cout << "Wrote " << outputimage << std::endl; - std::cout << imgOutput->getImageDescStr() << std::endl; + std::cout << "Wrote " << outputimage << "\n"; + std::cout << imgOutput->getImageDescStr() << "\n"; return 0; } diff --git a/src/apps/ociocpuinfo/main.cpp b/src/apps/ociocpuinfo/main.cpp index ef5104e23..7ca16817d 100644 --- a/src/apps/ociocpuinfo/main.cpp +++ b/src/apps/ociocpuinfo/main.cpp @@ -11,22 +11,22 @@ int main() { const OCIO::CPUInfo& cpu = OCIO::CPUInfo::instance(); - std::cout << "name : " << cpu.getName() << std::endl; - std::cout << "vendor : " << cpu.getVendor() << std::endl; - std::cout << "hasSSE2 : " << cpu.hasSSE2() << std::endl; - std::cout << "SSE2Slow : " << cpu.SSE2Slow() << std::endl; - std::cout << "hasSSE3 : " << cpu.hasSSE3() << std::endl; - std::cout << "SSE3Slow : " << cpu.SSE3Slow() << std::endl; - std::cout << "hasSSSE3 : " << cpu.hasSSSE3() << std::endl; - std::cout << "SSSE3Slow : " << cpu.SSSE3Slow() << std::endl; - std::cout << "hasSSE4 : " << cpu.hasSSE4() << std::endl; - std::cout << "hasSSE42 : " << cpu.hasSSE42() << std::endl; - std::cout << "hasAVX : " << cpu.hasAVX() << std::endl; - std::cout << "AVXSlow : " << cpu.AVXSlow() << std::endl; - std::cout << "hasAVX2 : " << cpu.hasAVX2() << std::endl; - std::cout << "AVX2SlowGather : " << cpu.AVX2SlowGather() << std::endl; - std::cout << "hasAVX512 : " << cpu.hasAVX512() << std::endl; - std::cout << "hasF16C : " << cpu.hasF16C() << std::endl; + std::cout << "name : " << cpu.getName() << "\n"; + std::cout << "vendor : " << cpu.getVendor() << "\n"; + std::cout << "hasSSE2 : " << cpu.hasSSE2() << "\n"; + std::cout << "SSE2Slow : " << cpu.SSE2Slow() << "\n"; + std::cout << "hasSSE3 : " << cpu.hasSSE3() << "\n"; + std::cout << "SSE3Slow : " << cpu.SSE3Slow() << "\n"; + std::cout << "hasSSSE3 : " << cpu.hasSSSE3() << "\n"; + std::cout << "SSSE3Slow : " << cpu.SSSE3Slow() << "\n"; + std::cout << "hasSSE4 : " << cpu.hasSSE4() << "\n"; + std::cout << "hasSSE42 : " << cpu.hasSSE42() << "\n"; + std::cout << "hasAVX : " << cpu.hasAVX() << "\n"; + std::cout << "AVXSlow : " << cpu.AVXSlow() << "\n"; + std::cout << "hasAVX2 : " << cpu.hasAVX2() << "\n"; + std::cout << "AVX2SlowGather : " << cpu.AVX2SlowGather() << "\n"; + std::cout << "hasAVX512 : " << cpu.hasAVX512() << "\n"; + std::cout << "hasF16C : " << cpu.hasF16C() << "\n"; return 0; } \ No newline at end of file diff --git a/src/apps/ociodisplay/main.cpp b/src/apps/ociodisplay/main.cpp index b7d51264f..3d6bc7e8e 100644 --- a/src/apps/ociodisplay/main.cpp +++ b/src/apps/ociodisplay/main.cpp @@ -73,7 +73,7 @@ static void InitImageTexture(const char * filename) if (filename && *filename) { - std::cout << "Loading: " << filename << std::endl; + std::cout << "Loading: " << filename << "\n" << std::flush; try { @@ -81,19 +81,19 @@ static void InitImageTexture(const char * filename) } catch (const std::exception &e) { - std::cerr << "ERROR: Loading file failed: " << e.what() << std::endl; + std::cerr << "ERROR: Loading file failed: " << e.what() << "\n"; exit(1); } catch (...) { - std::cerr << "ERROR: Loading file failed." << std::endl; + std::cerr << "ERROR: Loading file failed.\n"; exit(1); } } // If no file is provided, use a default gradient texture else { - std::cout << "No image specified, loading gradient." << std::endl; + std::cout << "No image specified, loading gradient.\n"; img.init(512, 512, OCIO::CHANNEL_ORDERING_RGBA, OCIO::BIT_DEPTH_F32); @@ -126,7 +126,7 @@ static void InitImageTexture(const char * filename) else { std::cerr << "Cannot load image with " << img.getNumChannels() - << " components." << std::endl; + << " components.\n"; exit(1); } @@ -159,13 +159,12 @@ void InitOCIO(const char * filename) if (!cs.empty()) { g_inputColorSpace = cs; - std::cout << "colorspace: " << cs << std::endl; + std::cout << "colorspace: " << cs << "\n"; } else { std::cout << "colorspace: " << g_inputColorSpace - << " \t(could not determine from filename, using default)" - << std::endl; + << " \t(could not determine from filename, using default)\n"; } } } @@ -323,27 +322,26 @@ void UpdateOCIOGLState() if (g_verbose) { - std::cout << std::endl; - std::cout << "Color transformation composed of:" << std::endl; - std::cout << " Image ColorSpace is:\t" << g_inputColorSpace << std::endl; - std::cout << " Views is:\t\t" << g_transformName << std::endl; - std::cout << " Display is:\t\t" << g_display << std::endl; - std::cout << " Looks Override is:\t'" << g_look << "'" << std::endl; - std::cout << " with:" << std::endl; - std::cout << " exposure_fstop = " << g_exposure_fstop << std::endl; - std::cout << " display_gamma = " << g_display_gamma << std::endl; - std::cout << " channels = " - << (g_channelHot[0] ? "R" : "") - << (g_channelHot[1] ? "G" : "") - << (g_channelHot[2] ? "B" : "") - << (g_channelHot[3] ? "A" : "") << std::endl; + std::cout << "\n" + "Color transformation composed of:\n" + " Image ColorSpace is:\t" << g_inputColorSpace << "\n" + " Views is:\t\t\t" << g_transformName << "\n" + " Display is:\t\t" << g_display << "\n" + " Looks Override is:\t'" << g_look << "'\n" + " with:\n" + " exposure_fstop = " << g_exposure_fstop << "\n" + " display_gamma = " << g_display_gamma << "\n" + " channels = " + << (g_channelHot[0] ? "R" : "") + << (g_channelHot[1] ? "G" : "") + << (g_channelHot[2] ? "B" : "") + << (g_channelHot[3] ? "A" : "") << "\n"; for (const auto &opt : OptmizationMenu) { if (opt.second == g_optimization) { - std::cout << std::endl - << "Optimization: " << opt.first << std::endl; + std::cout << "\nOptimization: " << opt.first << "\n"; } } } @@ -391,7 +389,7 @@ void UpdateOCIOGLState() } catch (const OCIO::Exception &e) { - std::cerr << e.what() << std::endl; + std::cerr << e.what() << "\n"; return; } catch (...) @@ -621,19 +619,19 @@ void parseArguments(int argc, char **argv) #endif else if (0 == strcmp(argv[i], "-h")) { - std::cout << std::endl; - std::cout << "help:" << std::endl; - std::cout << " ociodisplay [OPTIONS] [image] where" << std::endl; - std::cout << std::endl; - std::cout << " OPTIONS:" << std::endl; - std::cout << " -h : displays the help and exit" << std::endl; - std::cout << " -v : displays the color space information" << std::endl; - std::cout << " -gpulegacy : use the legacy (i.e. baked) GPU color processing" << std::endl; - std::cout << " -gpuinfo : output the OCIO shader program" << std::endl; + std::cout << "\n" + "help:\n" + " ociodisplay [OPTIONS] [image] where\n" + "\n" + " OPTIONS:\n" + " -h : displays the help and exit\n" + " -v : displays the color space information\n" + " -gpulegacy : use the legacy (i.e. baked) GPU color processing\n" + " -gpuinfo : output the OCIO shader program\n" #if __APPLE__ - std::cout << " -metal : use metal OCIO shader backend " << std::endl; + " -metal : use metal OCIO shader backend \n" #endif - std::cout << std::endl; + "\n"; exit(0); } else @@ -662,7 +660,7 @@ int main(int argc, char **argv) } catch (const OCIO::Exception &e) { - std::cerr << e.what() << std::endl; + std::cerr << e.what() << "\n"; return 1; } @@ -683,12 +681,11 @@ int main(int argc, char **argv) { if (!g_filename.empty()) { - std::cout << std::endl; - std::cout << "Image: " << g_filename << std::endl; + std::cout << "\nImage: " << g_filename << "\n"; } - std::cout << std::endl; - std::cout << OCIO::ImageIO::GetVersion() << std::endl; - std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl; + std::cout << "\n"; + std::cout << OCIO::ImageIO::GetVersion() << "\n"; + std::cout << "OCIO Version: " << OCIO::GetVersion() << "\n"; } OCIO::ConstConfigRcPtr config; @@ -709,16 +706,16 @@ int main(int argc, char **argv) if (env && *env) { - std::cout << std::endl; - std::cout << "OCIO Config. file : '" << env << "'" << std::endl; + std::cout << "\n"; + std::cout << "OCIO Config. file : '" << env << "'\n"; std::cout << "OCIO Config. version: " << config->getMajorVersion() << "." - << config->getMinorVersion() << std::endl; - std::cout << "OCIO search_path : " << config->getSearchPath() << std::endl; + << config->getMinorVersion() << "\n"; + std::cout << "OCIO search_path : " << config->getSearchPath() << "\n"; } } - std::cout << std::endl; - std::cout << USAGE_TEXT << std::endl; + std::cout << "\n"; + std::cout << USAGE_TEXT << "\n"; InitImageTexture(g_filename.c_str()); try @@ -727,7 +724,7 @@ int main(int argc, char **argv) } catch (OCIO::Exception &e) { - std::cerr << e.what() << std::endl; + std::cerr << e.what() << "\n"; exit(1); } @@ -739,7 +736,7 @@ int main(int argc, char **argv) } catch (const OCIO::Exception &e) { - std::cerr << e.what() << std::endl; + std::cerr << e.what() << "\n"; exit(1); } diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp index 0fbbb096b..b836e40cb 100644 --- a/src/apps/ocioperf/main.cpp +++ b/src/apps/ocioperf/main.cpp @@ -63,7 +63,7 @@ class CustomMeasure oss << "] ms"; - std::cout << oss.str() << std::endl; + std::cout << oss.str() << "\n"; } } @@ -197,8 +197,8 @@ int main(int argc, const char **argv) "--verbose", &verbose, "Display some general information", "--test %d", &testType, - "Define the type of processing to measure: "\ - "0 means on the complete image (the default), 1 is line-by-line, "\ + "Define the type of processing to measure: " + "0 means on the complete image (the default), 1 is line-by-line, " "2 is pixel-per-pixel and -1 performs all the test types", "--transform %s", &transformFile, "Provide the transform file to apply on the image", @@ -223,7 +223,7 @@ int main(int argc, const char **argv) if (ap.parse (argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage(); return 1; } @@ -236,18 +236,15 @@ int main(int argc, const char **argv) if (verbose) { - std::cout << std::endl; - std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl; + std::cout << "\nOCIO Version: " << OCIO::GetVersion() << "\n"; } if (!transformFile.empty()) { - std::cout << std::endl; - std::cout << "Processing using '" << transformFile << "'" << std::endl << std::endl; + std::cout << "\nProcessing using '" << transformFile << "'\n\n"; } - std::cout << std::endl << std::endl; - std::cout << "Processing statistics:" << std::endl << std::endl; + std::cout << "\n\nProcessing statistics:\n\n" << std::flush; // Process the image. try @@ -285,14 +282,12 @@ int main(int argc, const char **argv) { if(!inputconfig.empty()) { - std::cout << std::endl; - std::cout << "Loading " << inputconfig << std::endl; + std::cout << "\nLoading " << inputconfig << "\n" << std::flush; srcConfig = OCIO::Config::CreateFromFile(inputconfig.c_str()); } else if(OCIO::GetEnvVariable("OCIO")) { - std::cout << std::endl; - std::cout << "Loading $OCIO " << OCIO::GetEnvVariable("OCIO") << std::endl; + std::cout << "\nLoading $OCIO " << OCIO::GetEnvVariable("OCIO") << "\n" << std::flush; srcConfig = OCIO::Config::CreateFromEnv(); } else @@ -302,16 +297,14 @@ int main(int argc, const char **argv) if (verbose) { - std::cout << std::endl; - std::cout << "OCIO Config. version: " << srcConfig->getMajorVersion() << "." - << srcConfig->getMinorVersion() << std::endl; - std::cout << "OCIO search_path: " << srcConfig->getSearchPath() << std::endl; - std::cout << std::endl; + std::cout << "\nOCIO Config. version: " << srcConfig->getMajorVersion() << "." + << srcConfig->getMinorVersion() << "\n"; + std::cout << "OCIO search_path: " << srcConfig->getSearchPath() << "\n\n"; const std::string inputStr = !inColorSpace.empty() ? inColorSpace : "(" + display + ", " + view + ")"; const std::string outputStr = !outColorSpace.empty() ? outColorSpace : "(" + display + ", " + view + ")"; std::cout << "Processing from '" << inputStr << "' to '" - << outputStr << "'" << std::endl; + << outputStr << "'\n" << std::flush; } OCIO::ConfigRcPtr config = srcConfig->createEditableCopy(); @@ -512,8 +505,7 @@ int main(int argc, const char **argv) } } - std::cout << std::endl << std::endl; - std::cout << "Image processing statistics:" << std::endl << std::endl; + std::cout << "\n\nImage processing statistics:\n\n" << std::flush; // Create an arbitrary 4K RGBA image. @@ -701,22 +693,22 @@ int main(int argc, const char **argv) } } - std::cout << std::endl << std::endl; + std::cout << "\n\n"; } catch (OCIO::Exception & ex) { - std::cerr << "OCIO ERROR: " << ex.what() << std::endl; + std::cerr << "OCIO ERROR: " << ex.what() << "\n"; return 1; } catch (std::exception & ex) { - std::cerr << "ERROR: " << ex.what() << std::endl; + std::cerr << "ERROR: " << ex.what() << "\n"; return 1; } catch (...) { - std::cerr << "ERROR: Unknown error encountered." << std::endl; + std::cerr << "ERROR: Unknown error encountered.\n"; return 1; } diff --git a/src/apps/ociowrite/main.cpp b/src/apps/ociowrite/main.cpp index df5383594..b5bb5f8ef 100644 --- a/src/apps/ociowrite/main.cpp +++ b/src/apps/ociowrite/main.cpp @@ -63,7 +63,7 @@ int main(int argc, const char **argv) if (argc <= 1 || ap.parse(argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage(); exit(1); } @@ -76,17 +76,15 @@ int main(int argc, const char **argv) if (verbose) { - std::cout << std::endl; - std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl; + std::cout << "\nOCIO Version: " << OCIO::GetVersion() << "\n"; const char * env = OCIO::GetEnvVariable("OCIO"); if (env && *env) { try { - std::cout << std::endl; - std::cout << "OCIO Configuration: '" << env << "'" << std::endl; + std::cout << "\nOCIO Configuration: '" << env << "'\n"; OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig(); - std::cout << "OCIO search_path: " << config->getSearchPath() << std::endl; + std::cout << "OCIO search_path: " << config->getSearchPath() << "\n"; } catch(...) { @@ -98,8 +96,7 @@ int main(int argc, const char **argv) if (filepath.empty()) { - std::cerr << std::endl; - std::cerr << "The output transform filepath is missing." << std::endl; + std::cerr << "\nThe output transform filepath is missing.\n"; exit(1); } @@ -122,18 +119,16 @@ int main(int argc, const char **argv) if (transformFileFormat.empty()) { - std::cerr << std::endl; - std::cerr << "Could not find a valid format from the extension of: '"; - std::cerr << filepath << "'. " << formats.str() << std::endl; + std::cerr << "\nCould not find a valid format from the extension of: '"; + std::cerr << filepath << "'. " << formats.str() << "\n"; exit(1); } else if (verbose) { - std::cout << std::endl; - std::cout << "File format being used: " << transformFileFormat << std::endl; + std::cout << "\nFile format being used: " << transformFileFormat << "\n"; } - std::cout << std::endl; + std::cout << "\n"; // Process transform. try @@ -150,18 +145,14 @@ int main(int argc, const char **argv) { if (verbose) { - std::cout << std::endl; std::string inputStr = !inputColorSpace.empty() ? inputColorSpace : "(" + display + ", " + view + ")"; std::string outputStr = !outputColorSpace.empty() ? outputColorSpace : "(" + display + ", " + view + ")"; - std::cout << "Processing from '" - << inputStr << "' to '" - << outputStr << "'" << std::endl; + std::cout << "\nProcessing from '" << inputStr << "' to '" << outputStr << "'\n"; } } else { - std::cerr << std::endl; - std::cerr << "Missing the ${OCIO} env. variable." << std::endl; + std::cerr << "\nMissing the ${OCIO} env. variable.\n"; exit(1); } @@ -169,15 +160,14 @@ int main(int argc, const char **argv) if (verbose) { - std::cout << std::endl; - std::cout << "Config: " << config->getDescription() + std::cout << "\nConfig: " << config->getDescription() << " - version: " << config->getMajorVersion(); const auto minor = config->getMinorVersion(); if (minor) { std::cout << "." << minor; } - std::cout << std::endl; + std::cout << "\n"; } // --colorspaces @@ -193,8 +183,7 @@ int main(int argc, const char **argv) (useDisplayview && !useColorspaces && !useInvertview) || (useInvertview && !useColorspaces && !useDisplayview))) { - std::cerr << std::endl; - std::cerr << "Any combinations of --colorspaces, --view or --invertview is invalid." << std::endl; + std::cerr << "\nAny combinations of --colorspaces, --view or --invertview is invalid.\n"; exit(1); } @@ -210,8 +199,7 @@ int main(int argc, const char **argv) } else { - std::cerr << std::endl; - std::cerr << "Missing output color spaces for --colorspaces." << std::endl; + std::cerr << "\nMissing output color spaces for --colorspaces.\n"; exit(1); } } @@ -230,8 +218,7 @@ int main(int argc, const char **argv) } else { - std::cerr << std::endl; - std::cerr << "Missing output (display,view) pair for --view." << std::endl; + std::cerr << "\nMissing output (display,view) pair for --view.\n"; exit(1); } } @@ -250,8 +237,7 @@ int main(int argc, const char **argv) } else { - std::cerr << std::endl; - std::cerr << "Missing output colorspaces for --invertview." << std::endl; + std::cerr << "\nMissing output colorspaces for --invertview.\n"; exit(1); } } @@ -265,26 +251,24 @@ int main(int argc, const char **argv) } else { - std::cerr << std::endl; - std::cerr << "Could not open file: " << filepath << std::endl; + std::cerr << "\nCould not open file: " << filepath << "\n"; exit(1); } } else { - std::cerr << std::endl; - std::cerr << "Colorspaces or (display,view) pair must be specified as source." << std::endl; + std::cerr << "\nColorspaces or (display,view) pair must be specified as source.\n"; exit(1); } } catch(OCIO::Exception & exception) { - std::cerr << "OCIO Error: " << exception.what() << std::endl; + std::cerr << "OCIO Error: " << exception.what() << "\n"; exit(1); } catch(...) { - std::cerr << "Unknown OCIO error encountered." << std::endl; + std::cerr << "Unknown OCIO error encountered.\n"; exit(1); } diff --git a/src/apputils/argparse.h b/src/apputils/argparse.h index 2bf03a43c..864ec6af1 100644 --- a/src/apputils/argparse.h +++ b/src/apputils/argparse.h @@ -90,7 +90,7 @@ class ArgOption; // Forward declaration /// NULL); /// /// if (ap.parse (argc, argv) < 0) { -/// std::cerr << ap.geterror() << std::endl; +/// std::cerr << ap.geterror() << "\n"; /// ap.usage (); /// return EXIT_FAILURE; /// } diff --git a/src/apputils/measure.h b/src/apputils/measure.h index 3273a4935..a200b4f80 100644 --- a/src/apputils/measure.h +++ b/src/apputils/measure.h @@ -74,7 +74,7 @@ class Measure << m_explanations << "\n" << " Processing took: " << (m_duration.count() / float(m_iterations)) - << " ms" << std::endl; + << " ms\n" << std::flush; } private: diff --git a/src/libutils/oglapphelpers/oglapp.cpp b/src/libutils/oglapphelpers/oglapp.cpp index 1e0b2b0a7..d868e4c46 100644 --- a/src/libutils/oglapphelpers/oglapp.cpp +++ b/src/libutils/oglapphelpers/oglapp.cpp @@ -233,7 +233,7 @@ void OglApp::printGLInfo() const noexcept << "GL Vendor: " << glGetString(GL_VENDOR) << "\n" << "GL Renderer: " << glGetString(GL_RENDERER) << "\n" << "GL Version: " << glGetString(GL_VERSION) << "\n" - << "GLSL Version: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl; + << "GLSL Version: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << "\n"; } void OglApp::setupCommon() @@ -376,7 +376,7 @@ void HeadlessApp::printEGLInfo() const noexcept { std::cout << "\n" << "EGL Vendor: " << eglQueryString(m_eglDisplay, EGL_VENDOR) << "\n" - << "EGL Version: " << eglQueryString(m_eglDisplay, EGL_VERSION) << std::endl; + << "EGL Version: " << eglQueryString(m_eglDisplay, EGL_VERSION) << "\n"; } void HeadlessApp::redisplay() diff --git a/tests/cpu/fileformats/FileFormatHDL_tests.cpp b/tests/cpu/fileformats/FileFormatHDL_tests.cpp index 9fbc8698f..0e89a091f 100644 --- a/tests/cpu/fileformats/FileFormatHDL_tests.cpp +++ b/tests/cpu/fileformats/FileFormatHDL_tests.cpp @@ -165,8 +165,8 @@ OCIO_ADD_TEST(FileFormatHDL, bake_1d) std::ostringstream output; baker->bake(output); - //std::cerr << "The LUT: " << std::endl << output.str() << std::endl; - //std::cerr << "Expected:" << std::endl << bout << std::endl; + //std::cerr << "The LUT: " << "\n" << output.str() << "\n"; + //std::cerr << "Expected:" << "\n" << bout << "\n"; // const StringUtils::StringVec osvec = StringUtils::SplitByLines(output.str()); @@ -492,8 +492,8 @@ OCIO_ADD_TEST(FileFormatHDL, bake_3d) std::ostringstream output; baker->bake(output); - //std::cerr << "The LUT: " << std::endl << output.str() << std::endl; - //std::cerr << "Expected:" << std::endl << bout << std::endl; + //std::cerr << "The LUT: " << "\n" << output.str() << "\n"; + //std::cerr << "Expected:" << "\n" << bout << "\n"; // const StringUtils::StringVec osvec = StringUtils::SplitByLines(output.str()); @@ -708,8 +708,8 @@ OCIO_ADD_TEST(FileFormatHDL, bake_3d_1d) std::ostringstream output; baker->bake(output); - //std::cerr << "The LUT: " << std::endl << output.str() << std::endl; - //std::cerr << "Expected:" << std::endl << bout << std::endl; + //std::cerr << "The LUT: " << "\n" << output.str() << "\n"; + //std::cerr << "Expected:" << "\n" << bout << "\n"; // const StringUtils::StringVec osvec = StringUtils::SplitByLines(output.str()); @@ -847,8 +847,8 @@ OCIO_ADD_TEST(FileFormatHDL, look_test) std::ostringstream output; baker->bake(output); - //std::cerr << "The LUT: " << std::endl << output.str() << std::endl; - //std::cerr << "Expected:" << std::endl << bout << std::endl; + //std::cerr << "The LUT: " << "\n" << output.str() << "\n"; + //std::cerr << "Expected:" << "\n" << bout << "\n"; // const StringUtils::StringVec osvec = StringUtils::SplitByLines(output.str()); diff --git a/tests/cpu/ops/noop/NoOps_tests.cpp b/tests/cpu/ops/noop/NoOps_tests.cpp index 7e5cc6b5f..192f38db7 100644 --- a/tests/cpu/ops/noop/NoOps_tests.cpp +++ b/tests/cpu/ops/noop/NoOps_tests.cpp @@ -245,12 +245,12 @@ OCIO_ADD_TEST(NoOps, partition_gpu_ops) gpuLatticeOps, gpuPostOps) ); /* - std::cerr << "gpuPreOps" << std::endl; - std::cerr << SerializeOpVec(gpuPreOps, 4) << std::endl; - std::cerr << "gpuLatticeOps" << std::endl; - std::cerr << SerializeOpVec(gpuLatticeOps, 4) << std::endl; - std::cerr << "gpuPostOps" << std::endl; - std::cerr << SerializeOpVec(gpuPostOps, 4) << std::endl; + std::cerr << "gpuPreOps" << "\n"; + std::cerr << SerializeOpVec(gpuPreOps, 4) << "\n"; + std::cerr << "gpuLatticeOps" << "\n"; + std::cerr << SerializeOpVec(gpuLatticeOps, 4) << "\n"; + std::cerr << "gpuPostOps" << "\n"; + std::cerr << SerializeOpVec(gpuPostOps, 4) << "\n"; */ } } // PartitionGPUOps diff --git a/tests/gpu/GPUUnitTest.cpp b/tests/gpu/GPUUnitTest.cpp index 9ef295567..5a4e58ac7 100644 --- a/tests/gpu/GPUUnitTest.cpp +++ b/tests/gpu/GPUUnitTest.cpp @@ -735,7 +735,7 @@ int main(int argc, const char ** argv) if (!enabledTest) { - std::cout << "DISABLED" << std::endl; + std::cout << "DISABLED\n" << std::flush; } else if(curr_failures==failures && test->isValid()) { @@ -745,7 +745,7 @@ int main(int argc, const char ** argv) std::cout << "PASSED - (MaxDiff: " << test->getMaxDiff() << " at pix[" << pixelIdx - << "][" << componentIdx << "])" << std::endl; + << "][" << componentIdx << "])\n" << std::flush; } else if(!test->isValid()) { @@ -757,6 +757,6 @@ int main(int argc, const char ** argv) tests[idx] = nullptr; } - std::cout << "\n" << failures << " tests failed\n" << std::endl; + std::cout << "\n" << failures << " tests failed\n\n" << std::flush; return failures; } diff --git a/vendor/nuke/OCIOColorSpace/OCIOColorSpace.cpp b/vendor/nuke/OCIOColorSpace/OCIOColorSpace.cpp index 091c1efdb..8852435c1 100644 --- a/vendor/nuke/OCIOColorSpace/OCIOColorSpace.cpp +++ b/vendor/nuke/OCIOColorSpace/OCIOColorSpace.cpp @@ -63,11 +63,11 @@ OCIOColorSpace::OCIOColorSpace(Node *n) : DD::Image::PixelIop(n) } catch (OCIO::Exception& e) { - std::cerr << "OCIOColorSpace: " << e.what() << std::endl; + std::cerr << "OCIOColorSpace: " << e.what() << "\n"; } catch (...) { - std::cerr << "OCIOColorSpace: Unknown exception during OCIO setup." << std::endl; + std::cerr << "OCIOColorSpace: Unknown exception during OCIO setup.\n"; } // Then, create a cstr array for passing to Nuke @@ -86,8 +86,7 @@ OCIOColorSpace::OCIOColorSpace(Node *n) : DD::Image::PixelIop(n) if(!m_hasColorSpaces) { - std::cerr << "OCIOColorSpace: No color spaces available for input and/or output." << std::endl; - } + std::cerr << "OCIOColorSpace: No color spaces available for input and/or output.\n" } OCIOColorSpace::~OCIOColorSpace() diff --git a/vendor/nuke/OCIODisplay/OCIODisplay.cpp b/vendor/nuke/OCIODisplay/OCIODisplay.cpp index bf82ab850..4af1d02a7 100644 --- a/vendor/nuke/OCIODisplay/OCIODisplay.cpp +++ b/vendor/nuke/OCIODisplay/OCIODisplay.cpp @@ -78,11 +78,11 @@ OCIODisplay::OCIODisplay(Node *n) : DD::Image::PixelIop(n) } catch(OCIO::Exception& e) { - std::cerr << "OCIODisplay: " << e.what() << std::endl; + std::cerr << "OCIODisplay: " << e.what() << "\n"; } catch(...) { - std::cerr << "OCIODisplay: Unknown exception during OCIO setup." << std::endl; + std::cerr << "OCIODisplay: Unknown exception during OCIO setup.\n"; } // Build the cstr vectors on our second pass @@ -104,7 +104,7 @@ OCIODisplay::OCIODisplay(Node *n) : DD::Image::PixelIop(n) if(!m_hasLists) { - std::cerr << "OCIODisplay: Missing one or more of colorspaces, display devices, or display transforms." << std::endl; + std::cerr << "OCIODisplay: Missing one or more of colorspaces, display devices, or display transforms.\n"; } } diff --git a/vendor/nuke/OCIOLookTransform/OCIOLookTransform.cpp b/vendor/nuke/OCIOLookTransform/OCIOLookTransform.cpp index 9dfac5653..f92b620b1 100644 --- a/vendor/nuke/OCIOLookTransform/OCIOLookTransform.cpp +++ b/vendor/nuke/OCIOLookTransform/OCIOLookTransform.cpp @@ -89,11 +89,11 @@ OCIOLookTransform::OCIOLookTransform(Node *n) : DD::Image::PixelIop(n) } catch (const OCIO::Exception& e) { - std::cerr << "OCIOLookTransform: " << e.what() << std::endl; + std::cerr << "OCIOLookTransform: " << e.what() << "\n"; } catch (...) { - std::cerr << "OCIOLookTransform: Unknown exception during OCIO setup." << std::endl; + std::cerr << "OCIOLookTransform: Unknown exception during OCIO setup.\n"; } if(!config) @@ -139,7 +139,7 @@ OCIOLookTransform::OCIOLookTransform(Node *n) : DD::Image::PixelIop(n) if(!m_hasColorSpaces) { - std::cerr << "OCIOLookTransform: No ColorSpaces available for input and/or output." << std::endl; + std::cerr << "OCIOLookTransform: No ColorSpaces available for input and/or output.\n"; } } From 0362a9d1e73ca07a548dc89e8aa995afd7fd32a0 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 16 Jan 2026 17:56:55 +0000 Subject: [PATCH 21/48] remove unneccessary continuation characters Signed-off-by: Kevin Wheatley --- src/OpenColorIO/Config.cpp | 12 +-- src/OpenColorIO/FileRules.cpp | 2 +- src/OpenColorIO/OCIOYaml.cpp | 42 ++++----- src/OpenColorIO/Transform.cpp | 92 +++++++++---------- .../apphelpers/mergeconfigs/SectionMerger.cpp | 4 +- .../ExposureContrastOpGPU.cpp | 2 +- .../gradinghuecurve/GradingHueCurveOpGPU.cpp | 2 +- .../gradingprimary/GradingPrimaryOpGPU.cpp | 2 +- .../gradingrgbcurve/GradingRGBCurveOpGPU.cpp | 2 +- .../ops/gradingtone/GradingToneOpGPU.cpp | 2 +- tests/cpu/Config_tests.cpp | 30 +++--- tests/cpu/FileRules_tests.cpp | 8 +- tests/cpu/Logging_tests.cpp | 4 +- tests/cpu/UnitTestLogUtils.cpp | 10 +- 14 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp index 17e765fd5..351b3a2a8 100644 --- a/src/OpenColorIO/Config.cpp +++ b/src/OpenColorIO/Config.cpp @@ -153,7 +153,7 @@ void GetFileReferences(std::set & files, const ConstTransformRcPtr { if(!transform) return; - if(ConstGroupTransformRcPtr groupTransform = \ + if(ConstGroupTransformRcPtr groupTransform = DynamicPtrCast(transform)) { for(int i=0; igetNumTransforms(); ++i) @@ -161,7 +161,7 @@ void GetFileReferences(std::set & files, const ConstTransformRcPtr GetFileReferences(files, groupTransform->getTransform(i)); } } - else if(ConstFileTransformRcPtr fileTransform = \ + else if(ConstFileTransformRcPtr fileTransform = DynamicPtrCast(transform)) { files.insert(fileTransform->getSrc()); @@ -177,7 +177,7 @@ void GetColorSpaceReferences(std::set & colorSpaceNames, { if(!transform) return; - if(ConstGroupTransformRcPtr groupTransform = \ + if(ConstGroupTransformRcPtr groupTransform = DynamicPtrCast(transform)) { for(int i=0; igetNumTransforms(); ++i) @@ -185,18 +185,18 @@ void GetColorSpaceReferences(std::set & colorSpaceNames, GetColorSpaceReferences(colorSpaceNames, groupTransform->getTransform(i), context); } } - else if(ConstColorSpaceTransformRcPtr colorSpaceTransform = \ + else if(ConstColorSpaceTransformRcPtr colorSpaceTransform = DynamicPtrCast(transform)) { colorSpaceNames.insert(context->resolveStringVar(colorSpaceTransform->getSrc())); colorSpaceNames.insert(context->resolveStringVar(colorSpaceTransform->getDst())); } - else if(ConstDisplayViewTransformRcPtr displayViewTransform = \ + else if(ConstDisplayViewTransformRcPtr displayViewTransform = DynamicPtrCast(transform)) { colorSpaceNames.insert(displayViewTransform->getSrc()); } - else if(ConstLookTransformRcPtr lookTransform = \ + else if(ConstLookTransformRcPtr lookTransform = DynamicPtrCast(transform)) { colorSpaceNames.insert(lookTransform->getSrc()); diff --git a/src/OpenColorIO/FileRules.cpp b/src/OpenColorIO/FileRules.cpp index 19cbd47bf..6e3844f83 100644 --- a/src/OpenColorIO/FileRules.cpp +++ b/src/OpenColorIO/FileRules.cpp @@ -1028,7 +1028,7 @@ void UpdateFileRulesFromV1ToV2(const Config & config, FileRulesRcPtr & fileRules else { static constexpr char msg[] - = "The default rule creation falls back to the first color space because "\ + = "The default rule creation falls back to the first color space because " "no suitable color space exists."; LogWarning(msg); diff --git a/src/OpenColorIO/OCIOYaml.cpp b/src/OpenColorIO/OCIOYaml.cpp index 9d5ce135a..a9986220c 100644 --- a/src/OpenColorIO/OCIOYaml.cpp +++ b/src/OpenColorIO/OCIOYaml.cpp @@ -3357,67 +3357,67 @@ void load(const YAML::Node& node, TransformRcPtr& t) void save(YAML::Emitter& out, ConstTransformRcPtr t, unsigned int majorVersion) { - if(ConstAllocationTransformRcPtr Allocation_tran = \ + if(ConstAllocationTransformRcPtr Allocation_tran = DynamicPtrCast(t)) save(out, Allocation_tran); - else if (ConstBuiltinTransformRcPtr builtin_tran = \ + else if (ConstBuiltinTransformRcPtr builtin_tran = DynamicPtrCast(t)) save(out, builtin_tran); - else if(ConstCDLTransformRcPtr CDL_tran = \ + else if(ConstCDLTransformRcPtr CDL_tran = DynamicPtrCast(t)) save(out, CDL_tran, majorVersion); - else if(ConstColorSpaceTransformRcPtr ColorSpace_tran = \ + else if(ConstColorSpaceTransformRcPtr ColorSpace_tran = DynamicPtrCast(t)) save(out, ColorSpace_tran); - else if (ConstDisplayViewTransformRcPtr Display_tran = \ + else if (ConstDisplayViewTransformRcPtr Display_tran = DynamicPtrCast(t)) save(out, Display_tran); - else if(ConstExponentTransformRcPtr Exponent_tran = \ + else if(ConstExponentTransformRcPtr Exponent_tran = DynamicPtrCast(t)) save(out, Exponent_tran, majorVersion); - else if (ConstExponentWithLinearTransformRcPtr ExpLinear_tran = \ + else if (ConstExponentWithLinearTransformRcPtr ExpLinear_tran = DynamicPtrCast(t)) save(out, ExpLinear_tran); - else if(ConstFileTransformRcPtr File_tran = \ + else if(ConstFileTransformRcPtr File_tran = DynamicPtrCast(t)) save(out, File_tran, majorVersion); - else if (ConstExposureContrastTransformRcPtr File_tran = \ + else if (ConstExposureContrastTransformRcPtr File_tran = DynamicPtrCast(t)) save(out, File_tran); - else if(ConstFixedFunctionTransformRcPtr Func_tran = \ + else if(ConstFixedFunctionTransformRcPtr Func_tran = DynamicPtrCast(t)) save(out, Func_tran); - else if (ConstGradingPrimaryTransformRcPtr GP_tran = \ + else if (ConstGradingPrimaryTransformRcPtr GP_tran = DynamicPtrCast(t)) save(out, GP_tran); - else if (ConstGradingRGBCurveTransformRcPtr GC_tran = \ + else if (ConstGradingRGBCurveTransformRcPtr GC_tran = DynamicPtrCast(t)) save(out, GC_tran); - else if (ConstGradingHueCurveTransformRcPtr GC_tran = \ + else if (ConstGradingHueCurveTransformRcPtr GC_tran = DynamicPtrCast(t)) save(out, GC_tran); - else if (ConstGradingToneTransformRcPtr GT_tran = \ + else if (ConstGradingToneTransformRcPtr GT_tran = DynamicPtrCast(t)) save(out, GT_tran); - else if(ConstGroupTransformRcPtr Group_tran = \ + else if(ConstGroupTransformRcPtr Group_tran = DynamicPtrCast(t)) save(out, Group_tran, majorVersion); - else if(ConstLogAffineTransformRcPtr Log_tran = \ + else if(ConstLogAffineTransformRcPtr Log_tran = DynamicPtrCast(t)) save(out, Log_tran); - else if (ConstLogCameraTransformRcPtr Log_tran = \ + else if (ConstLogCameraTransformRcPtr Log_tran = DynamicPtrCast(t)) save(out, Log_tran); - else if(ConstLogTransformRcPtr Log_tran = \ + else if(ConstLogTransformRcPtr Log_tran = DynamicPtrCast(t)) save(out, Log_tran, majorVersion); - else if(ConstLookTransformRcPtr Look_tran = \ + else if(ConstLookTransformRcPtr Look_tran = DynamicPtrCast(t)) save(out, Look_tran); - else if(ConstMatrixTransformRcPtr Matrix_tran = \ + else if(ConstMatrixTransformRcPtr Matrix_tran = DynamicPtrCast(t)) save(out, Matrix_tran, majorVersion); - else if(ConstRangeTransformRcPtr Range_tran = \ + else if(ConstRangeTransformRcPtr Range_tran = DynamicPtrCast(t)) save(out, Range_tran); else diff --git a/src/OpenColorIO/Transform.cpp b/src/OpenColorIO/Transform.cpp index 74223096f..8266626d4 100755 --- a/src/OpenColorIO/Transform.cpp +++ b/src/OpenColorIO/Transform.cpp @@ -49,117 +49,117 @@ void BuildOps(OpRcPtrVec & ops, if(!transform) return; - if(ConstAllocationTransformRcPtr allocationTransform = \ + if(ConstAllocationTransformRcPtr allocationTransform = DynamicPtrCast(transform)) { BuildAllocationOp(ops, *allocationTransform, dir); } - else if(ConstBuiltinTransformRcPtr builtInTransform = \ + else if(ConstBuiltinTransformRcPtr builtInTransform = DynamicPtrCast(transform)) { BuildBuiltinOps(ops, *builtInTransform, dir); } - else if(ConstCDLTransformRcPtr cdlTransform = \ + else if(ConstCDLTransformRcPtr cdlTransform = DynamicPtrCast(transform)) { BuildCDLOp(ops, config, *cdlTransform, dir); } - else if(ConstColorSpaceTransformRcPtr colorSpaceTransform = \ + else if(ConstColorSpaceTransformRcPtr colorSpaceTransform = DynamicPtrCast(transform)) { BuildColorSpaceOps(ops, config, context, *colorSpaceTransform, dir); } - else if(ConstDisplayViewTransformRcPtr displayViewTransform = \ + else if(ConstDisplayViewTransformRcPtr displayViewTransform = DynamicPtrCast(transform)) { BuildDisplayOps(ops, config, context, *displayViewTransform, dir); } - else if(ConstExponentTransformRcPtr exponentTransform = \ + else if(ConstExponentTransformRcPtr exponentTransform = DynamicPtrCast(transform)) { BuildExponentOp(ops, config, *exponentTransform, dir); } - else if(ConstExponentWithLinearTransformRcPtr expWithLinearTransform = \ + else if(ConstExponentWithLinearTransformRcPtr expWithLinearTransform = DynamicPtrCast(transform)) { BuildExponentWithLinearOp(ops, *expWithLinearTransform, dir); } - else if (ConstExposureContrastTransformRcPtr ecTransform = \ + else if (ConstExposureContrastTransformRcPtr ecTransform = DynamicPtrCast(transform)) { BuildExposureContrastOp(ops, *ecTransform, dir); } - else if(ConstFileTransformRcPtr fileTransform = \ + else if(ConstFileTransformRcPtr fileTransform = DynamicPtrCast(transform)) { BuildFileTransformOps(ops, config, context, *fileTransform, dir); } - else if (ConstFixedFunctionTransformRcPtr fixedFunctionTransform = \ + else if (ConstFixedFunctionTransformRcPtr fixedFunctionTransform = DynamicPtrCast(transform)) { BuildFixedFunctionOp(ops, *fixedFunctionTransform, dir); } - else if (ConstGradingPrimaryTransformRcPtr gradingPrimaryTransform = \ + else if (ConstGradingPrimaryTransformRcPtr gradingPrimaryTransform = DynamicPtrCast(transform)) { BuildGradingPrimaryOp(ops, config, context, *gradingPrimaryTransform, dir); } - else if (ConstGradingRGBCurveTransformRcPtr gradingCurveTransform = \ + else if (ConstGradingRGBCurveTransformRcPtr gradingCurveTransform = DynamicPtrCast(transform)) { BuildGradingRGBCurveOp(ops, config, context, *gradingCurveTransform, dir); } - else if (ConstGradingHueCurveTransformRcPtr hueCurveTransform = \ + else if (ConstGradingHueCurveTransformRcPtr hueCurveTransform = DynamicPtrCast(transform)) { BuildGradingHueCurveOp(ops, config, context, *hueCurveTransform, dir); } - else if (ConstGradingToneTransformRcPtr gradingToneTransform = \ + else if (ConstGradingToneTransformRcPtr gradingToneTransform = DynamicPtrCast(transform)) { BuildGradingToneOp(ops, config, context, *gradingToneTransform, dir); } - else if(ConstGroupTransformRcPtr groupTransform = \ + else if(ConstGroupTransformRcPtr groupTransform = DynamicPtrCast(transform)) { BuildGroupOps(ops, config, context, *groupTransform, dir); } - else if(ConstLogAffineTransformRcPtr logAffineTransform = \ + else if(ConstLogAffineTransformRcPtr logAffineTransform = DynamicPtrCast(transform)) { BuildLogOp(ops, *logAffineTransform, dir); } - else if(ConstLogCameraTransformRcPtr logCameraTransform = \ + else if(ConstLogCameraTransformRcPtr logCameraTransform = DynamicPtrCast(transform)) { BuildLogOp(ops, *logCameraTransform, dir); } - else if(ConstLogTransformRcPtr logTransform = \ + else if(ConstLogTransformRcPtr logTransform = DynamicPtrCast(transform)) { BuildLogOp(ops, *logTransform, dir); } - else if(ConstLookTransformRcPtr lookTransform = \ + else if(ConstLookTransformRcPtr lookTransform = DynamicPtrCast(transform)) { BuildLookOps(ops, config, context, *lookTransform, dir); } - else if (ConstLut1DTransformRcPtr lut1dTransform = \ + else if (ConstLut1DTransformRcPtr lut1dTransform = DynamicPtrCast(transform)) { BuildLut1DOp(ops, *lut1dTransform, dir); } - else if (ConstLut3DTransformRcPtr lut3dTransform = \ + else if (ConstLut3DTransformRcPtr lut3dTransform = DynamicPtrCast(transform)) { BuildLut3DOp(ops, *lut3dTransform, dir); } - else if(ConstMatrixTransformRcPtr matrixTransform = \ + else if(ConstMatrixTransformRcPtr matrixTransform = DynamicPtrCast(transform)) { BuildMatrixOp(ops, *matrixTransform, dir); } - else if(ConstRangeTransformRcPtr rangeTransform = \ + else if(ConstRangeTransformRcPtr rangeTransform = DynamicPtrCast(transform)) { BuildRangeOp(ops, *rangeTransform, dir); @@ -178,117 +178,117 @@ std::ostream& operator<< (std::ostream & os, const Transform & transform) { const Transform* t = &transform; - if(const AllocationTransform * allocationTransform = \ + if(const AllocationTransform * allocationTransform = dynamic_cast(t)) { os << *allocationTransform; } - else if(const BuiltinTransform * builtInTransform = \ + else if(const BuiltinTransform * builtInTransform = dynamic_cast(t)) { os << *builtInTransform; } - else if(const CDLTransform * cdlTransform = \ + else if(const CDLTransform * cdlTransform = dynamic_cast(t)) { os << *cdlTransform; } - else if(const ColorSpaceTransform * colorSpaceTransform = \ + else if(const ColorSpaceTransform * colorSpaceTransform = dynamic_cast(t)) { os << *colorSpaceTransform; } - else if(const DisplayViewTransform * displayViewTransform = \ + else if(const DisplayViewTransform * displayViewTransform = dynamic_cast(t)) { os << *displayViewTransform; } - else if(const ExponentTransform * exponentTransform = \ + else if(const ExponentTransform * exponentTransform = dynamic_cast(t)) { os << *exponentTransform; } - else if (const ExponentWithLinearTransform * exponentLinearTransform = \ + else if (const ExponentWithLinearTransform * exponentLinearTransform = dynamic_cast(t)) { os << *exponentLinearTransform; } - else if (const ExposureContrastTransform * ecTransform = \ + else if (const ExposureContrastTransform * ecTransform = dynamic_cast(t)) { os << *ecTransform; } - else if(const FileTransform * fileTransform = \ + else if(const FileTransform * fileTransform = dynamic_cast(t)) { os << *fileTransform; } - else if(const FixedFunctionTransform * fixedFunctionTransform = \ + else if(const FixedFunctionTransform * fixedFunctionTransform = dynamic_cast(t)) { os << *fixedFunctionTransform; } - else if (const GradingPrimaryTransform * gradingPrimaryTransform = \ + else if (const GradingPrimaryTransform * gradingPrimaryTransform = dynamic_cast(t)) { os << *gradingPrimaryTransform; } - else if (const GradingRGBCurveTransform * gradingRGBCurveTransform = \ + else if (const GradingRGBCurveTransform * gradingRGBCurveTransform = dynamic_cast(t)) { os << *gradingRGBCurveTransform; } - else if (const GradingHueCurveTransform * hueCurveTransform = \ + else if (const GradingHueCurveTransform * hueCurveTransform = dynamic_cast(t)) { os << *hueCurveTransform; } - else if (const GradingToneTransform * gradingToneTransform = \ + else if (const GradingToneTransform * gradingToneTransform = dynamic_cast(t)) { os << *gradingToneTransform; } - else if(const GroupTransform * groupTransform = \ + else if(const GroupTransform * groupTransform = dynamic_cast(t)) { os << *groupTransform; } - else if (const LogAffineTransform * logAffineTransform = \ + else if (const LogAffineTransform * logAffineTransform = dynamic_cast(t)) { os << *logAffineTransform; } - else if (const LogCameraTransform * logCamTransform = \ + else if (const LogCameraTransform * logCamTransform = dynamic_cast(t)) { os << *logCamTransform; } - else if (const LogTransform * logTransform = \ + else if (const LogTransform * logTransform = dynamic_cast(t)) { os << *logTransform; } - else if(const LookTransform * lookTransform = \ + else if(const LookTransform * lookTransform = dynamic_cast(t)) { os << *lookTransform; } - else if (const Lut1DTransform * lut1dTransform = \ + else if (const Lut1DTransform * lut1dTransform = dynamic_cast(t)) { os << *lut1dTransform; } - else if (const Lut3DTransform * lut3dTransform = \ + else if (const Lut3DTransform * lut3dTransform = dynamic_cast(t)) { os << *lut3dTransform; } - else if(const MatrixTransform * matrixTransform = \ + else if(const MatrixTransform * matrixTransform = dynamic_cast(t)) { os << *matrixTransform; } - else if(const RangeTransform * rangeTransform = \ + else if(const RangeTransform * rangeTransform = dynamic_cast(t)) { os << *rangeTransform; diff --git a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp index 8c67f3790..88c4dc951 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.cpp @@ -1830,7 +1830,7 @@ void ViewTransformsMerger::handlePreferInput() const char * inputName = m_inputConfig->getDefaultViewTransformName(); if (!(Platform::Strcasecmp(baseName, inputName) == 0)) { - notify("The Input config contains a value that would override the Base config: "\ + notify("The Input config contains a value that would override the Base config: " "default_view_transform: " + std::string(inputName), m_params->isErrorOnConflict()); } // If the input config does not specify a default, keep the one from the base. @@ -1858,7 +1858,7 @@ void ViewTransformsMerger::handlePreferBase() const char * inputName = m_inputConfig->getDefaultViewTransformName(); if (!(Platform::Strcasecmp(baseName, inputName) == 0)) { - notify("The Input config contains a value that would override the Base config: "\ + notify("The Input config contains a value that would override the Base config: " "default_view_transform: " + std::string(inputName), m_params->isErrorOnConflict()); } // Only use the input if the base is missing. diff --git a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpGPU.cpp b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpGPU.cpp index 97dd56faf..21d03e58d 100644 --- a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpGPU.cpp +++ b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpGPU.cpp @@ -66,7 +66,7 @@ std::string AddProperty(GpuShaderCreatorRcPtr & shaderCreator, if (shaderCreator->getLanguage() == LANGUAGE_OSL_1 && prop->isDynamic()) { - std::string msg("The dynamic properties are not yet supported by the 'Open Shading language"\ + std::string msg("The dynamic properties are not yet supported by the 'Open Shading language" " (OSL)' translation: The '"); msg += name; msg += "' dynamic property is replaced by a local variable."; diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpGPU.cpp b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpGPU.cpp index 4050c11fc..9f60a8825 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpGPU.cpp +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpGPU.cpp @@ -613,7 +613,7 @@ void GetGradingHueCurveGPUShaderProgram(GpuShaderCreatorRcPtr & shaderCreator, if (gcData->isDynamic() && shaderCreator->getLanguage() == LANGUAGE_OSL_1) { - std::string msg("The dynamic properties are not yet supported by the 'Open Shading language"\ + std::string msg("The dynamic properties are not yet supported by the 'Open Shading language" " (OSL)' translation: The '"); msg += opPrefix; msg += "' dynamic property is replaced by a local variable."; diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpGPU.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpGPU.cpp index a0d2298f0..06e95ea37 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpGPU.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpGPU.cpp @@ -520,7 +520,7 @@ void GetGradingPrimaryGPUShaderProgram(GpuShaderCreatorRcPtr & shaderCreator, if (gpData->isDynamic() && shaderCreator->getLanguage() == LANGUAGE_OSL_1) { - std::string msg("The dynamic properties are not yet supported by the 'Open Shading language"\ + std::string msg("The dynamic properties are not yet supported by the 'Open Shading language" " (OSL)' translation: The '"); msg += opPrefix; msg += "' dynamic property is replaced by a local variable."; diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpGPU.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpGPU.cpp index e2ae5d7b8..6cfd34299 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpGPU.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpGPU.cpp @@ -370,7 +370,7 @@ void GetGradingRGBCurveGPUShaderProgram(GpuShaderCreatorRcPtr & shaderCreator, if (gcData->isDynamic() && shaderCreator->getLanguage() == LANGUAGE_OSL_1) { - std::string msg("The dynamic properties are not yet supported by the 'Open Shading language"\ + std::string msg("The dynamic properties are not yet supported by the 'Open Shading language" " (OSL)' translation: The '"); msg += opPrefix; msg += "' dynamic property is replaced by a local variable."; diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp index 9dfa1543e..1566f2290 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp @@ -1540,7 +1540,7 @@ void GetGradingToneGPUShaderProgram(GpuShaderCreatorRcPtr & shaderCreator, if (gtData->isDynamic() && shaderCreator->getLanguage() == LANGUAGE_OSL_1) { - std::string msg("The dynamic properties are not yet supported by the 'Open Shading language"\ + std::string msg("The dynamic properties are not yet supported by the 'Open Shading language" " (OSL)' translation: The '"); msg += opPrefix; msg += "' dynamic property is replaced by a local variable."; diff --git a/tests/cpu/Config_tests.cpp b/tests/cpu/Config_tests.cpp index d472b3ef6..0fe0c48d5 100644 --- a/tests/cpu/Config_tests.cpp +++ b/tests/cpu/Config_tests.cpp @@ -415,7 +415,7 @@ OCIO_ADD_TEST(Config, required_roles_for_version_2_2) OCIO_CHECK_ASSERT( StringUtils::Contain( svec, - "[OpenColorIO Error]: The scene_linear role is required for a config version 2.2 or"\ + "[OpenColorIO Error]: The scene_linear role is required for a config version 2.2 or" " higher.") ); @@ -3430,7 +3430,7 @@ OCIO_ADD_TEST(Config, display) OCIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is)); OCIO_CHECK_THROW_WHAT(config->validate(), OCIO::Exception, - "The content of the env. variable for the list of active displays"\ + "The content of the env. variable for the list of active displays" " [sRGB_2, sRGB_1, ABCDEF] contains invalid display name(s)."); } @@ -3478,7 +3478,7 @@ OCIO_ADD_TEST(Config, display) OCIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is)); OCIO_CHECK_THROW_WHAT(config->validate(), OCIO::Exception, - "The list of active displays [sRGB_2, sRGB_1, ABCDEF] "\ + "The list of active displays [sRGB_2, sRGB_1, ABCDEF] " "from the config file contains invalid display name(s)"); } } @@ -5638,12 +5638,12 @@ OCIO_ADD_TEST(Config, matrix_serialization) " from_reference: !\n" " children:\n" // Check the value serialization. - " - ! {matrix: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15],"\ + " - ! {matrix: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]," " offset: [-1, -2, -3, -4]}\n" // Check the value precision. " - ! {offset: [0.123456789876, 1.23456789876, 12.3456789876, 123.456789876]}\n" - " - ! {matrix: [0.123456789876, 1.23456789876, 12.3456789876, 123.456789876, "\ - "1234.56789876, 12345.6789876, 123456.789876, 1234567.89876, "\ + " - ! {matrix: [0.123456789876, 1.23456789876, 12.3456789876, 123.456789876, " + "1234.56789876, 12345.6789876, 123456.789876, 1234567.89876, " "0, 0, 1, 0, 0, 0, 0, 1]}\n"; const std::string str = PROFILE_V1 + SIMPLE_PROFILE_A + SIMPLE_PROFILE_B_V1 + strEnd; @@ -5900,7 +5900,7 @@ OCIO_ADD_TEST(Config, remove_color_space) // As discussed only validation traps the issue. OCIO_CHECK_THROW_WHAT(config->validate(), OCIO::Exception, - "Config failed role validation. The role 'default' refers to"\ + "Config failed role validation. The role 'default' refers to" " a color space, 'raw', which is not defined."); } @@ -9959,8 +9959,8 @@ OCIO_ADD_TEST(Config, create_from_archive) OCIO_CHECK_THROW_WHAT( OCIO::Config::CreateFromFile(archivePath.c_str()), OCIO::Exception, - "Loading the OCIO profile failed. At line 0, '' parsing failed: The specified OCIO "\ - "configuration file from Archive/ConfigIOProxy does not appear to have a valid version"\ + "Loading the OCIO profile failed. At line 0, '' parsing failed: The specified OCIO " + "configuration file from Archive/ConfigIOProxy does not appear to have a valid version" " " ); } @@ -9981,8 +9981,8 @@ OCIO_ADD_TEST(Config, create_from_archive) OCIO_CHECK_THROW_WHAT( OCIO::Config::CreateFromFile(archivePath.c_str()), OCIO::Exception, - "Loading the OCIO profile failed. At line 0, '' parsing failed: The specified OCIO "\ - "configuration file from Archive/ConfigIOProxy does not appear to have a valid version"\ + "Loading the OCIO profile failed. At line 0, '' parsing failed: The specified OCIO " + "configuration file from Archive/ConfigIOProxy does not appear to have a valid version" " " ); } @@ -10016,16 +10016,16 @@ OCIO_ADD_TEST(Config, create_from_archive) OCIO_CHECK_THROW_WHAT( config->getProcessor("plain_lut11_cs", "shot1_lut11_cs"), OCIO::Exception, - "The specified file reference 'lut11.clf' could not be located. The following "\ - "attempts were made: 'shot4\\lut11.clf' : 'shot1\\lut11.clf' : 'shot2\\lut11.clf' : "\ + "The specified file reference 'lut11.clf' could not be located. The following " + "attempts were made: 'shot4\\lut11.clf' : 'shot1\\lut11.clf' : 'shot2\\lut11.clf' : " "'shot3\\lut11.clf' : 'shot3\\subdir\\lut11.clf' : '.\\lut11.clf'." ); #else OCIO_CHECK_THROW_WHAT( config->getProcessor("plain_lut11_cs", "shot1_lut11_cs"), OCIO::Exception, - "The specified file reference 'lut11.clf' could not be located. The following "\ - "attempts were made: 'shot4/lut11.clf' : 'shot1/lut11.clf' : 'shot2/lut11.clf' : "\ + "The specified file reference 'lut11.clf' could not be located. The following " + "attempts were made: 'shot4/lut11.clf' : 'shot1/lut11.clf' : 'shot2/lut11.clf' : " "'shot3/lut11.clf' : 'shot3/subdir/lut11.clf' : './lut11.clf'." ); #endif diff --git a/tests/cpu/FileRules_tests.cpp b/tests/cpu/FileRules_tests.cpp index 37d2519dc..89af5b0ef 100644 --- a/tests/cpu/FileRules_tests.cpp +++ b/tests/cpu/FileRules_tests.cpp @@ -1587,7 +1587,7 @@ strictparsing: true cfg->upgradeToLatestVersion(); OCIO_CHECK_EQUAL( - std::string("[OpenColorIO Warning]: The default rule creation falls back to the"\ + std::string("[OpenColorIO Warning]: The default rule creation falls back to the" " first color space because no suitable color space exists.\n"), l.output()); } @@ -1800,7 +1800,7 @@ OCIO_ADD_TEST(FileRules, config_v1_to_v2_from_memory) OCIO_CHECK_ASSERT( StringUtils::Contain( svec, - "[OpenColorIO Warning]: The default rule creation falls back to the"\ + "[OpenColorIO Warning]: The default rule creation falls back to the" " first color space because no suitable color space exists." ) ); @@ -1864,7 +1864,7 @@ constexpr char CONFIG[] = { R"(ocio_profile_version: 2 OCIO_CHECK_THROW_WHAT( cfg->validate(), OCIO::Exception, - "Config failed role validation. The role 'default' refers to a color space, 'cs2', "\ + "Config failed role validation. The role 'default' refers to a color space, 'cs2', " "which is not defined." ); } @@ -1899,7 +1899,7 @@ constexpr char CONFIG[] = { R"(ocio_profile_version: 2 OCIO_CHECK_THROW_WHAT( cfg->validate(), OCIO::Exception, - "File rules: rule named 'Default' is referencing 'cs2' that is neither "\ + "File rules: rule named 'Default' is referencing 'cs2' that is neither " "a color space nor a named transform." ); } diff --git a/tests/cpu/Logging_tests.cpp b/tests/cpu/Logging_tests.cpp index eed87f44e..cfbbf69b8 100644 --- a/tests/cpu/Logging_tests.cpp +++ b/tests/cpu/Logging_tests.cpp @@ -113,8 +113,8 @@ OCIO_ADD_TEST(Logging, message_function) OCIO::SetLoggingLevel(OCIO::LOGGING_LEVEL_DEBUG); OCIO::LogDebug(std::string("My first msg\nMy second msg\nMy third msg")); - OCIO_CHECK_EQUAL(guard.output(), "[OpenColorIO Debug]: My first msg\n"\ - "[OpenColorIO Debug]: My second msg\n"\ + OCIO_CHECK_EQUAL(guard.output(), "[OpenColorIO Debug]: My first msg\n" + "[OpenColorIO Debug]: My second msg\n" "[OpenColorIO Debug]: My third msg\n"); } } diff --git a/tests/cpu/UnitTestLogUtils.cpp b/tests/cpu/UnitTestLogUtils.cpp index 40b8ea7a6..cc79b49f7 100644 --- a/tests/cpu/UnitTestLogUtils.cpp +++ b/tests/cpu/UnitTestLogUtils.cpp @@ -115,29 +115,29 @@ MuteLogging::~MuteLogging() bool checkAndMuteSceneLinearRoleError(LogGuard & logGuard) { - const std::string interchange_scene = "[OpenColorIO Error]: The scene_linear role is "\ + const std::string interchange_scene = "[OpenColorIO Error]: The scene_linear role is " "required for a config version 2.2 or higher."; return logGuard.findAndRemove(interchange_scene); } bool checkAndMuteCompositingLogRoleError(LogGuard & logGuard) { - const std::string compositing_log = "[OpenColorIO Error]: The compositing_log role is "\ + const std::string compositing_log = "[OpenColorIO Error]: The compositing_log role is " "required for a config version 2.2 or higher."; return logGuard.findAndRemove(compositing_log); } bool checkAndMuteColorTimingRoleError(LogGuard & logGuard) { - const std::string color_timing = "[OpenColorIO Error]: The color_timing role is required "\ + const std::string color_timing = "[OpenColorIO Error]: The color_timing role is required " "for a config version 2.2 or higher."; return logGuard.findAndRemove(color_timing); } bool checkAndMuteAcesInterchangeRoleError(LogGuard & logGuard) { - const std::string aces_interchange = "[OpenColorIO Error]: The aces_interchange role is "\ - "required when there are scene-referred color spaces and "\ + const std::string aces_interchange = "[OpenColorIO Error]: The aces_interchange role is " + "required when there are scene-referred color spaces and " "the config version is 2.2 or higher."; return logGuard.findAndRemove(aces_interchange); } From 040eed5d1360ad42b100a3c23bf9e0ef8156db03 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 16 Jan 2026 18:06:31 +0000 Subject: [PATCH 22/48] More std::endl removal Signed-off-by: Kevin Wheatley --- src/apps/ociolutimage/main.cpp | 6 +++--- src/apps/ociomakeclf/main.cpp | 31 +++++++++++++--------------- src/apps/ociomergeconfigs/main.cpp | 33 +++++++++++++++--------------- 3 files changed, 33 insertions(+), 37 deletions(-) diff --git a/src/apps/ociolutimage/main.cpp b/src/apps/ociolutimage/main.cpp index 1096c8ab2..c6b6acd33 100644 --- a/src/apps/ociolutimage/main.cpp +++ b/src/apps/ociolutimage/main.cpp @@ -166,7 +166,7 @@ int main(int argc, const char* argv[]) if (ap.parse(argc, argv) < 0) { - std::cout << ap.geterror() << std::endl; + std::cout << ap.geterror() << "\n"; ap.usage(); std::cout << "\n"; return 1; @@ -192,7 +192,7 @@ int main(int argc, const char* argv[]) } catch (const std::exception & e) { - std::cerr << "Error generating image: " << e.what() << std::endl; + std::cerr << "Error generating image: " << e.what() << "\n"; exit(1); } catch (...) @@ -212,7 +212,7 @@ int main(int argc, const char* argv[]) } catch (const std::exception & e) { - std::cerr << "Error extracting LUT: " << e.what() << std::endl; + std::cerr << "Error extracting LUT: " << e.what() << "\n"; exit(1); } catch (...) diff --git a/src/apps/ociomakeclf/main.cpp b/src/apps/ociomakeclf/main.cpp index ba946796c..30a50242d 100644 --- a/src/apps/ociomakeclf/main.cpp +++ b/src/apps/ociomakeclf/main.cpp @@ -75,8 +75,7 @@ void CreateOutputLutFile(const std::string & outLutFilepath, OCIO::ConstGroupTra std::ostringstream oss; oss << "Could not open the file '" << outLutFilepath - << "'." - << std::endl; + << "'.\n"; throw OCIO::Exception(oss.str().c_str()); } } @@ -104,7 +103,7 @@ int main(int argc, const char ** argv) if (ap.parse(argc, argv) < 0) { - std::cerr << std::endl << ap.geterror() << std::endl << std::endl; + std::cerr << "\n" << ap.geterror() << "\n\n"; ap.usage(); return 1; } @@ -130,17 +129,17 @@ int main(int argc, const char ** argv) if (StringUtils::EndsWith(cscName, BuiltinSuffix)) { cscName.resize(cscName.size() - strlen(BuiltinSuffix)); - std::cout << std::endl << "\t" << cscName; + std::cout << "\n\t" << cscName; } } - std::cout << std::endl << std::endl; + std::cout << "\n\n"; return 0; } if (args.size() != 2) { - std::cerr << "ERROR: Expecting 2 arguments, found " << args.size() << "." << std::endl; + std::cerr << "ERROR: Expecting 2 arguments, found " << args.size() << ".\n"; ap.usage(); return 1; } @@ -172,15 +171,14 @@ int main(int argc, const char ** argv) { std::cerr << "ERROR: The LUT color space name '" << originalCSC - << "' is not supported." - << std::endl; + << "' is not supported.\n"; return 1; } } if (outLutFilepath.empty()) { - std::cerr << "ERROR: The output file path is missing." << std::endl; + std::cerr << "ERROR: The output file path is missing.\n"; return 1; } else @@ -190,22 +188,21 @@ int main(int argc, const char ** argv) { std::cerr << "ERROR: The output LUT file path '" << outLutFilepath - << "' must have a .clf extension." - << std::endl; + << "' must have a .clf extension.\n"; return 1; } } if (verbose) { - std::cout << "OCIO Version: " << OCIO::GetVersion() << std::endl; + std::cout << "OCIO Version: " << OCIO::GetVersion() << "\n"; } try { if (verbose) { - std::cout << "Building the transformation." << std::endl; + std::cout << "Building the transformation.\n"; } OCIO::GroupTransformRcPtr grp = OCIO::GroupTransform::Create(); @@ -261,7 +258,7 @@ int main(int argc, const char ** argv) if (verbose && !measure) { - std::cout << Msg << "." << std::endl; + std::cout << Msg << ".\n"; } if (measure) @@ -280,17 +277,17 @@ int main(int argc, const char ** argv) } catch (OCIO::Exception & ex) { - std::cerr << "OCIO ERROR: " << ex.what() << std::endl; + std::cerr << "OCIO ERROR: " << ex.what() << "\n"; return 1; } catch (std::exception & ex) { - std::cerr << "ERROR: " << ex.what() << std::endl; + std::cerr << "ERROR: " << ex.what() << "\n"; return 1; } catch (...) { - std::cerr << "ERROR: Unknown error encountered." << std::endl; + std::cerr << "ERROR: Unknown error encountered.\n"; return 1; } diff --git a/src/apps/ociomergeconfigs/main.cpp b/src/apps/ociomergeconfigs/main.cpp index e1a456d85..123718eed 100644 --- a/src/apps/ociomergeconfigs/main.cpp +++ b/src/apps/ociomergeconfigs/main.cpp @@ -107,13 +107,13 @@ int main(int argc, const char **argv) if (ap.parse(argc, argv) < 0) { - std::cerr << ap.geterror() << std::endl; + std::cerr << ap.geterror() << "\n"; ap.usage(); exit(1); } else if (args.size() != 1) { - std::cerr << "ERROR: Expecting 1 arguments, found " << args.size() << "." << std::endl; + std::cerr << "ERROR: Expecting 1 arguments, found " << args.size() << ".\n"; ap.usage(); exit(1); } @@ -134,7 +134,7 @@ int main(int argc, const char **argv) } catch (OCIO::Exception & e) { - std::cout << e.what() << std::endl; + std::cout << e.what() << "\n"; exit(1); } @@ -150,20 +150,19 @@ int main(int argc, const char **argv) } catch (OCIO::Exception & exception) { - std::cout << exception.what() << std::endl; + std::cout << exception.what() << "\n"; exit(1); } } if (displayParams) { - std::cout << "********************" << std::endl; - std::cout << "Merger options" << std::endl; - std::cout << "********************" << std::endl; + std::cout << "********************\n" + "Merger options\n" + "********************\n"; std::ostringstream os; newMerger->serialize(os); - std::cout << os.str() << std::endl; - std::cout << std::endl; + std::cout << os.str() << "\n\n"; } // "Show-all" option take priority over the "show" option. @@ -171,23 +170,23 @@ int main(int argc, const char **argv) { for (int i = 0; i < merger->getNumConfigMergingParameters(); i++) { - std::cout << "*********************" << std::endl; - std::cout << "Merged Config " << i << std::endl; - std::cout << "*********************" << std::endl; + std::cout << "*********************\n" + "Merged Config " << i << "\n" + "*********************\n"; std::ostringstream os; newMerger->getMergedConfig(i)->serialize(os); - std::cout << os.str() << std::endl; + std::cout << os.str() << "\n"; } } if (displayConfig && !displayAllConfig) { - std::cout << "********************" << std::endl; - std::cout << "Last Merged Config" << std::endl; - std::cout << "********************" << std::endl; + std::cout << "********************\n" + "Last Merged Config\n" + "********************\n"; std::ostringstream os; newMerger->getMergedConfig()->serialize(os); - std::cout << os.str() << std::endl; + std::cout << os.str() << "\n"; } if (!outputFile.empty()) From 4261c805dcc348fbe91fa97740b18e37e5d35440 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 16 Jan 2026 18:07:25 +0000 Subject: [PATCH 23/48] More continuation character removal Signed-off-by: Kevin Wheatley --- tests/cpu/builtinconfigs/BuiltinConfig_tests.cpp | 16 ++++++++-------- .../transforms/GradingPrimaryTransform_tests.cpp | 8 ++++---- .../GradingRGBCurveTransform_tests.cpp | 8 ++++---- .../transforms/GradingToneTransform_tests.cpp | 10 +++++----- .../builtins/BuiltinTransformRegistry_tests.cpp | 4 ++-- tests/gpu/Config_test.cpp | 12 ++++++------ .../nuke/OCIOCDLTransform/OCIOCDLTransform.cpp | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/cpu/builtinconfigs/BuiltinConfig_tests.cpp b/tests/cpu/builtinconfigs/BuiltinConfig_tests.cpp index c58c3edd2..1c5649b2c 100644 --- a/tests/cpu/builtinconfigs/BuiltinConfig_tests.cpp +++ b/tests/cpu/builtinconfigs/BuiltinConfig_tests.cpp @@ -31,7 +31,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - CG Config [COLORSPACES v1.0.0] "\ + std::string("Academy Color Encoding System - CG Config [COLORSPACES v1.0.0] " "[ACES v1.3] [OCIO v2.1]") ); @@ -60,7 +60,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.0.0] "\ + std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.0.0] " "[ACES v1.3] [OCIO v2.3]") ); @@ -89,7 +89,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.2.0] "\ + std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.2.0] " "[ACES v1.3] [OCIO v2.4]") ); @@ -118,7 +118,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - CG Config [COLORSPACES v4.0.0] "\ + std::string("Academy Color Encoding System - CG Config [COLORSPACES v4.0.0] " "[ACES v2.0] [OCIO v2.5]") ); @@ -147,7 +147,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - Studio Config [COLORSPACES v1.0.0] "\ + std::string("Academy Color Encoding System - Studio Config [COLORSPACES v1.0.0] " "[ACES v1.3] [OCIO v2.1]") ); @@ -176,7 +176,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.0.0] "\ + std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.0.0] " "[ACES v1.3] [OCIO v2.3]") ); @@ -205,7 +205,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.2.0] "\ + std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.2.0] " "[ACES v1.3] [OCIO v2.4]") ); @@ -234,7 +234,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic) OCIO_CHECK_EQUAL( std::string(registry.getBuiltinConfigUIName(cfgidx)), - std::string("Academy Color Encoding System - Studio Config [COLORSPACES v4.0.0] "\ + std::string("Academy Color Encoding System - Studio Config [COLORSPACES v4.0.0] " "[ACES v2.0] [OCIO v2.5]") ); diff --git a/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp b/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp index edc007b65..fcf801ed0 100644 --- a/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp +++ b/tests/cpu/transforms/GradingPrimaryTransform_tests.cpp @@ -347,10 +347,10 @@ OCIO_ADD_TEST(GradingPrimaryTransform, serialization) primary->setValue(data); static constexpr char PRIMARY_STR[] - = ", contrast=, "\ - "gamma=, offset=, "\ - "exposure=, lift=, "\ + = ", contrast=, " + "gamma=, offset=, " + "exposure=, lift=, " "gain=, saturation=1, pivot=>>"; { diff --git a/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp b/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp index 27e2c7bf9..f27c80ce7 100644 --- a/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp +++ b/tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp @@ -244,10 +244,10 @@ OCIO_ADD_TEST(GradingRGBCurveTransform, serialization) curve->setValue(data); static constexpr char CURVE_STR[] - = "]>, "\ - "green=]>, "\ - "blue=]>, "\ + = "]>, " + "green=]>, " + "blue=]>, " "master=]>>>"; { diff --git a/tests/cpu/transforms/GradingToneTransform_tests.cpp b/tests/cpu/transforms/GradingToneTransform_tests.cpp index 84483bbff..5dd850f68 100644 --- a/tests/cpu/transforms/GradingToneTransform_tests.cpp +++ b/tests/cpu/transforms/GradingToneTransform_tests.cpp @@ -66,11 +66,11 @@ OCIO_ADD_TEST(GradingToneTransform, serialization) tone->setValue(data); static constexpr char TONE_STR[] - = " "\ - "shadows= "\ - "midtones= "\ - "highlights= "\ + = " " + "shadows= " + "midtones= " + "highlights= " "whites= s_contrast=1.123>>"; { diff --git a/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp b/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp index bc11b6143..ac4ba0dc6 100644 --- a/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp +++ b/tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp @@ -264,7 +264,7 @@ active_views: [] OCIO_CHECK_THROW_WHAT(OCIO::Config::CreateFromStream(iss), OCIO::Exception, - "Only config version 2.1 (or higher) can have BuiltinTransform style "\ + "Only config version 2.1 (or higher) can have BuiltinTransform style " "'ACES-LMT - ACES 1.3 Reference Gamut Compression'."); } @@ -308,7 +308,7 @@ active_views: [] OCIO_CHECK_THROW_WHAT(OCIO::Config::CreateFromStream(iss), OCIO::Exception, - "Only config version 2.2 (or higher) can have BuiltinTransform style "\ + "Only config version 2.2 (or higher) can have BuiltinTransform style " "'ARRI_LOGC4_to_ACES2065-1'."); } diff --git a/tests/gpu/Config_test.cpp b/tests/gpu/Config_test.cpp index 8c807b7b4..001e0cae8 100644 --- a/tests/gpu/Config_test.cpp +++ b/tests/gpu/Config_test.cpp @@ -123,9 +123,9 @@ OCIO_ADD_GPU_TEST(Config, arbitrary_generic_shader) " - ! {src: lut1d_1.spi1d, interpolation: linear}\n" " - ! {src: lut1d_2.spi1d, interpolation: linear}\n" " - ! {base: 10}\n" - " - ! {matrix: [0.075573, 0.022197, 0.00223, 0, "\ - "0.005901, 0.096928, -0.002829, 0, "\ - "0.016134, 0.007406, 0.07646, 0, "\ + " - ! {matrix: [0.075573, 0.022197, 0.00223, 0, " + "0.005901, 0.096928, -0.002829, 0, " + "0.016134, 0.007406, 0.07646, 0, " "0, 0, 0, 1]}\n"; std::istringstream is; @@ -194,9 +194,9 @@ OCIO_ADD_GPU_TEST(Config, with_underscores) " allocationvars: [0, 1]\n" " from_reference: !\n" " children:\n" - " - ! {matrix: [0.075573, 0.022197, 0.00223, 0, "\ - "0.005901, 0.096928, -0.002829, 0, "\ - "0.016134, 0.007406, 0.07646, 0, "\ + " - ! {matrix: [0.075573, 0.022197, 0.00223, 0, " + "0.005901, 0.096928, -0.002829, 0, " + "0.016134, 0.007406, 0.07646, 0, " "0, 0, 0, 1]}\n" " - ! {src: lut1d_3.spi1d, interpolation: linear}\n"; diff --git a/vendor/nuke/OCIOCDLTransform/OCIOCDLTransform.cpp b/vendor/nuke/OCIOCDLTransform/OCIOCDLTransform.cpp index df7ee0f6b..a0e667443 100644 --- a/vendor/nuke/OCIOCDLTransform/OCIOCDLTransform.cpp +++ b/vendor/nuke/OCIOCDLTransform/OCIOCDLTransform.cpp @@ -365,8 +365,8 @@ const char* OCIOCDLTransform::displayName() const const char* OCIOCDLTransform::node_help() const { // TODO more detailed help text - return "Use OpenColorIO to apply an ASC CDL grade. Applied using:\n\n"\ - "out = (i * s + o)^p\n\nWhere i is the input value, s is slope, "\ + return "Use OpenColorIO to apply an ASC CDL grade. Applied using:\n\n" + "out = (i * s + o)^p\n\nWhere i is the input value, s is slope, " "o is offset and p is power"; } From f8885a0499717380f6bb12a5538d7aff65a4c61a Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 16 Jan 2026 18:07:49 +0000 Subject: [PATCH 24/48] std::endl removal Signed-off-by: Kevin Wheatley --- vendor/openfx/Support/Library/ofxsCore.cpp | 8 ++++---- .../openfx/Support/Library/ofxsImageEffect.cpp | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vendor/openfx/Support/Library/ofxsCore.cpp b/vendor/openfx/Support/Library/ofxsCore.cpp index 50c4f0326..6120ed151 100644 --- a/vendor/openfx/Support/Library/ofxsCore.cpp +++ b/vendor/openfx/Support/Library/ofxsCore.cpp @@ -61,13 +61,13 @@ namespace OFX { default : # ifdef DEBUG - std::cout << "Threw suite exception!" << std::endl; + std::cout << "Threw suite exception!" << "\n"; # if defined(__APPLE__) || defined(linux) void* callstack[128]; int i, frames = backtrace(callstack, 128); char** strs = backtrace_symbols(callstack, frames); for (i = 0; i < frames; ++i) { - std::cout << strs[i] << std::endl; + std::cout << strs[i] << "\n"; } free(strs); # endif @@ -79,13 +79,13 @@ namespace OFX { void throwHostMissingSuiteException(std::string name) { # ifdef DEBUG - std::cout << "Threw suite exception! Host missing '" << name << "' suite." << std::endl; + std::cout << "Threw suite exception! Host missing '" << name << "' suite." << "\n"; # if defined(__APPLE__) || defined(linux) void* callstack[128]; int i, frames = backtrace(callstack, 128); char** strs = backtrace_symbols(callstack, frames); for (i = 0; i < frames; ++i) { - std::cout << strs[i] << std::endl; + std::cout << strs[i] << "\n"; } free(strs); # endif diff --git a/vendor/openfx/Support/Library/ofxsImageEffect.cpp b/vendor/openfx/Support/Library/ofxsImageEffect.cpp index 2c0bc23c6..db4e91027 100644 --- a/vendor/openfx/Support/Library/ofxsImageEffect.cpp +++ b/vendor/openfx/Support/Library/ofxsImageEffect.cpp @@ -2788,7 +2788,7 @@ namespace OFX { catch (const OFX::Exception::Suite &ex) { # ifdef DEBUG - std::cout << "Caught OFX::Exception::Suite: " << ex.what() << std::endl; + std::cout << "Caught OFX::Exception::Suite: " << ex.what() << "\n"; # endif stat = ex.status(); } @@ -2797,7 +2797,7 @@ namespace OFX { catch (const OFX::Exception::HostInadequate &e) { # ifdef DEBUG - std::cout << "Caught OFX::Exception::HostInadequate: " << e.what() << std::endl; + std::cout << "Caught OFX::Exception::HostInadequate: " << e.what() << "\n"; # endif stat = kOfxStatErrMissingHostFeature; } @@ -2806,7 +2806,7 @@ namespace OFX { catch (const OFX::Exception::PropertyUnknownToHost &e) { # ifdef DEBUG - std::cout << "Caught OFX::Exception::PropertyUnknownToHost: " << e.what() << std::endl; + std::cout << "Caught OFX::Exception::PropertyUnknownToHost: " << e.what() << "\n"; # endif stat = kOfxStatErrMissingHostFeature; } @@ -2828,14 +2828,14 @@ namespace OFX { catch (const std::exception &e) { # ifdef DEBUG - std::cout << "Caught exception: " << e.what() << std::endl; + std::cout << "Caught exception: " << e.what() << "\n"; # endif stat = kOfxStatFailed; } catch (...) { # ifdef DEBUG - std::cout << "Caught Unknown exception" << std::endl; + std::cout << "Caught Unknown exception\n"; # endif stat = kOfxStatFailed; } @@ -2886,7 +2886,7 @@ namespace OFX { catch (OFX::Exception::Suite &ex) { # ifdef DEBUG - std::cout << "Caught OFX::Exception::Suite" << std::endl; + std::cout << "Caught OFX::Exception::Suite\n"; # endif stat = ex.status(); } @@ -2895,7 +2895,7 @@ namespace OFX { catch (OFX::Exception::HostInadequate &) { # ifdef DEBUG - std::cout << "Caught OFX::Exception::HostInadequate" << std::endl; + std::cout << "Caught OFX::Exception::HostInadequate\n"; # endif stat = kOfxStatErrMissingHostFeature; } @@ -2904,7 +2904,7 @@ namespace OFX { catch (OFX::Exception::PropertyUnknownToHost &) { # ifdef DEBUG - std::cout << "Caught OFX::Exception::PropertyUnknownToHost" << std::endl; + std::cout << "Caught OFX::Exception::PropertyUnknownToHost\n"; # endif stat = kOfxStatErrMissingHostFeature; } @@ -2926,7 +2926,7 @@ namespace OFX { catch (...) { # ifdef DEBUG - std::cout << "Caught Unknown exception" << std::endl; + std::cout << "Caught Unknown exception\n"; # endif stat = kOfxStatFailed; } From c05eccd7f949f5d4869a616d001b51aa0b5d4710 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 16 Jan 2026 19:29:51 +0000 Subject: [PATCH 25/48] Minimise StringUtils.h usage Signed-off-by: Kevin Wheatley --- include/OpenColorIO/OpenColorIO.h | 1 + src/OpenColorIO/FileRules.cpp | 1 - src/OpenColorIO/Mutex.h | 6 ++++-- src/OpenColorIO/apphelpers/CategoryHelpers.h | 1 - src/OpenColorIO/apphelpers/MixingHelpers.cpp | 1 - .../apphelpers/mergeconfigs/MergeConfigsHelpers.cpp | 1 + .../apphelpers/mergeconfigs/MergeConfigsHelpers.h | 3 --- src/OpenColorIO/apphelpers/mergeconfigs/SectionMerger.h | 4 ++-- .../ops/exposurecontrast/ExposureContrastOpGPU.cpp | 1 - src/OpenColorIO/ops/gradingtone/GradingToneOpGPU.cpp | 1 - .../transforms/builtins/BuiltinTransformRegistry.cpp | 2 -- src/bindings/python/PyBuiltinConfigRegistry.cpp | 1 + src/bindings/python/PyBuiltinTransformRegistry.cpp | 2 +- src/bindings/python/PyConfig.cpp | 1 + src/bindings/python/PyContext.cpp | 1 + src/bindings/python/PyFormatMetadata.cpp | 1 + src/bindings/python/PyOpenColorIO.h | 2 -- tests/cpu/UnitTestUtils.cpp | 1 - tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp | 1 + tests/cpu/fileformats/FileFormatVF_tests.cpp | 1 - tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp | 4 ++++ tests/utils/UnitTestMain.cpp | 1 + 22 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h index a5e796d0a..b85e0e825 100644 --- a/include/OpenColorIO/OpenColorIO.h +++ b/include/OpenColorIO/OpenColorIO.h @@ -13,6 +13,7 @@ #include #include #include +#include #include "OpenColorABI.h" #include "OpenColorTypes.h" diff --git a/src/OpenColorIO/FileRules.cpp b/src/OpenColorIO/FileRules.cpp index 6e3844f83..bb19d8c7f 100644 --- a/src/OpenColorIO/FileRules.cpp +++ b/src/OpenColorIO/FileRules.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include diff --git a/src/OpenColorIO/Mutex.h b/src/OpenColorIO/Mutex.h index e296abdb4..372e93c59 100644 --- a/src/OpenColorIO/Mutex.h +++ b/src/OpenColorIO/Mutex.h @@ -7,9 +7,11 @@ #include -#include -#include +#include +#ifndef NDEBUG +#include +#endif /** For internal use only */ diff --git a/src/OpenColorIO/apphelpers/CategoryHelpers.h b/src/OpenColorIO/apphelpers/CategoryHelpers.h index 40dcbb91d..37f7a0f57 100644 --- 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 #include #include diff --git a/src/OpenColorIO/apphelpers/MixingHelpers.cpp b/src/OpenColorIO/apphelpers/MixingHelpers.cpp index 9f6fa1e39..297953070 100644 --- 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 index 2a424a466..b6ab09b3d 100644 --- a/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp +++ b/src/OpenColorIO/apphelpers/mergeconfigs/MergeConfigsHelpers.cpp @@ -14,6 +14,7 @@ #include #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 index a7d628f17..005e7bbd5 100644 --- 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 -#include #include #include -#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 index 2fa614155..2ab96fd3f 100644 --- 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 -#include #include +#include #include #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 index 21d03e58d..4ba4e3dad 100644 --- 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 index 1566f2290..72444f886 100644 --- 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 index d828f11ac..cae08f3ed 100644 --- 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 index 615dfbb93..27435e5a6 100644 --- 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 index a00601a09..fb90b123f 100644 --- 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 index 6e7971844..f9dc9cf92 100644 --- 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 index 1456ef35a..89d33cd53 100644 --- 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 index af82122d2..ccb59f840 100644 --- 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 diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index 54848057a..9e67ceb26 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -12,8 +12,6 @@ #include -#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 index 74e53e214..db3b4a5a6 100644 --- a/tests/cpu/UnitTestUtils.cpp +++ b/tests/cpu/UnitTestUtils.cpp @@ -7,7 +7,6 @@ #include -#include "Logging.h" #include "OpBuilders.h" #include "UnitTestUtils.h" #include "utils/StringUtils.h" diff --git a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp index 0c8bd7597..d6acd4a53 100644 --- a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp +++ b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "apphelpers/mergeconfigs/MergeConfigsHelpers.cpp" diff --git a/tests/cpu/fileformats/FileFormatVF_tests.cpp b/tests/cpu/fileformats/FileFormatVF_tests.cpp index 9d482e233..606f81853 100644 --- 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 #include #include "fileformats/FileFormatVF.cpp" diff --git a/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp b/tests/cpu/ops/fixedfunction/FixedFunctionOpCPU_tests.cpp index 195a63fa8..c3604831c 100644 --- 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 +#endif + namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/utils/UnitTestMain.cpp b/tests/utils/UnitTestMain.cpp index 7f9810063..ae7a026d8 100644 --- 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 #include "testutils/UnitTest.h" From 1bacc185d6dc132abe9ba3844e379170b258016a Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 20 Jan 2026 17:35:07 +0000 Subject: [PATCH 26/48] Avoid poluting namespace with "naked" OCIO Signed-off-by: Kevin Wheatley --- src/apputils/logGuard.cpp | 4 ++++ src/apputils/logGuard.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/apputils/logGuard.cpp b/src/apputils/logGuard.cpp index 87a31c265..d84419c02 100644 --- a/src/apputils/logGuard.cpp +++ b/src/apputils/logGuard.cpp @@ -1,8 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "logGuard.h" +namespace OCIO = OCIO_NAMESPACE; + static std::string g_output; void CustomLoggingFunction(const char * message) { diff --git a/src/apputils/logGuard.h b/src/apputils/logGuard.h index 6ca968a0a..7224300f4 100644 --- a/src/apputils/logGuard.h +++ b/src/apputils/logGuard.h @@ -4,8 +4,10 @@ #ifndef INCLUDED_LOG_GUARD_H #define INCLUDED_LOG_GUARD_H +#include + #include -namespace OCIO = OCIO_NAMESPACE; + // Trap any log message while preserving the original logging settings. // Note that the mechanism is not thread-safe. @@ -24,7 +26,7 @@ class LogGuard bool empty() const; private: - OCIO::LoggingLevel m_logLevel; + OCIO_NAMESPACE::LoggingLevel m_logLevel; }; #endif \ No newline at end of file From d01880906e9d82f88d78fb013dd925b4777b276e Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 20 Jan 2026 17:35:47 +0000 Subject: [PATCH 27/48] Unneeded GpuShaderUtils include Signed-off-by: Kevin Wheatley --- src/OpenColorIO/ops/lut1d/Lut1DOpGPU.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.h b/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.h index 653bfd43c..3900e56d3 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.h @@ -6,7 +6,6 @@ #include -#include "GpuShaderUtils.h" #include "ops/lut1d/Lut1DOpData.h" namespace OCIO_NAMESPACE From 1ca6cae439eecb82ce8562890432ec9e96c58cf2 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Tue, 20 Jan 2026 18:58:40 +0000 Subject: [PATCH 28/48] Add some additional system includes Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBaker.cpp | 1 + src/bindings/python/PyBuiltinConfigRegistry.cpp | 2 ++ src/bindings/python/PyBuiltinTransformRegistry.cpp | 1 + src/bindings/python/PyColorSpace.cpp | 3 +++ src/bindings/python/PyConfig.cpp | 3 +++ src/bindings/python/PyContext.cpp | 2 ++ src/bindings/python/PyFormatMetadata.cpp | 1 + src/bindings/python/PyGradingData.cpp | 2 ++ src/bindings/python/PyLook.cpp | 2 ++ src/bindings/python/PyNamedTransform.cpp | 3 +++ src/bindings/python/PyOpenColorIO.cpp | 2 ++ src/bindings/python/PyUtils.h | 3 +++ src/bindings/python/PyViewTransform.cpp | 3 +++ src/bindings/python/PyViewingRules.cpp | 2 ++ src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp | 3 +++ src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp | 2 ++ 16 files changed, 35 insertions(+) diff --git a/src/bindings/python/PyBaker.cpp b/src/bindings/python/PyBaker.cpp index f3c243941..561205986 100644 --- a/src/bindings/python/PyBaker.cpp +++ b/src/bindings/python/PyBaker.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include #include "PyOpenColorIO.h" diff --git a/src/bindings/python/PyBuiltinConfigRegistry.cpp b/src/bindings/python/PyBuiltinConfigRegistry.cpp index 27435e5a6..4d6686b31 100644 --- a/src/bindings/python/PyBuiltinConfigRegistry.cpp +++ b/src/bindings/python/PyBuiltinConfigRegistry.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyBuiltinConfigRegistry.h" #include "PyUtils.h" #include "utils/StringUtils.h" diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp index fb90b123f..0c7ccef46 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.cpp +++ b/src/bindings/python/PyBuiltinTransformRegistry.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include #include "PyBuiltinTransformRegistry.h" diff --git a/src/bindings/python/PyColorSpace.cpp b/src/bindings/python/PyColorSpace.cpp index 7007ac8b3..e35c5249e 100644 --- a/src/bindings/python/PyColorSpace.cpp +++ b/src/bindings/python/PyColorSpace.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyConfig.cpp b/src/bindings/python/PyConfig.cpp index f9dc9cf92..993201a16 100644 --- a/src/bindings/python/PyConfig.cpp +++ b/src/bindings/python/PyConfig.cpp @@ -2,7 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyContext.cpp b/src/bindings/python/PyContext.cpp index 89d33cd53..97faa3e7b 100644 --- a/src/bindings/python/PyContext.cpp +++ b/src/bindings/python/PyContext.cpp @@ -1,7 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyFormatMetadata.cpp b/src/bindings/python/PyFormatMetadata.cpp index ccb59f840..1ab6bf87e 100644 --- a/src/bindings/python/PyFormatMetadata.cpp +++ b/src/bindings/python/PyFormatMetadata.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include #include "PyOpenColorIO.h" diff --git a/src/bindings/python/PyGradingData.cpp b/src/bindings/python/PyGradingData.cpp index eb2ecb82d..10939fba8 100644 --- a/src/bindings/python/PyGradingData.cpp +++ b/src/bindings/python/PyGradingData.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyLook.cpp b/src/bindings/python/PyLook.cpp index 7900731f2..5441d6ed5 100644 --- a/src/bindings/python/PyLook.cpp +++ b/src/bindings/python/PyLook.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyNamedTransform.cpp b/src/bindings/python/PyNamedTransform.cpp index 9d3b70967..47683d5d0 100644 --- a/src/bindings/python/PyNamedTransform.cpp +++ b/src/bindings/python/PyNamedTransform.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyOpenColorIO.cpp b/src/bindings/python/PyOpenColorIO.cpp index f66e6d540..aa9308b5d 100644 --- a/src/bindings/python/PyOpenColorIO.cpp +++ b/src/bindings/python/PyOpenColorIO.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyOpenColorIO.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyUtils.h b/src/bindings/python/PyUtils.h index 81508894a..09e03c6a2 100644 --- a/src/bindings/python/PyUtils.h +++ b/src/bindings/python/PyUtils.h @@ -11,6 +11,9 @@ #include "PyOpenColorIO.h" +#include + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyViewTransform.cpp b/src/bindings/python/PyViewTransform.cpp index d3de4730e..c6ab6711c 100644 --- a/src/bindings/python/PyViewTransform.cpp +++ b/src/bindings/python/PyViewTransform.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyViewingRules.cpp b/src/bindings/python/PyViewingRules.cpp index 7b1cfabc0..33bc3565b 100644 --- a/src/bindings/python/PyViewingRules.cpp +++ b/src/bindings/python/PyViewingRules.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp index 08a3e5271..bee62264d 100644 --- a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp +++ b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp index 104d0845e..8cef64619 100644 --- a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp +++ b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyOpenColorIO.h" namespace OCIO_NAMESPACE From fc344bd259692384448a480633788dc1c2cfe5c8 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 09:59:03 +0000 Subject: [PATCH 29/48] Add some further direct includes to python bindings Signed-off-by: Kevin Wheatley --- src/bindings/python/PyGpuShaderCreator.cpp | 3 +++ src/bindings/python/PyGpuShaderDesc.cpp | 6 ++++++ src/bindings/python/PyImageDesc.cpp | 3 +++ src/bindings/python/PyPackedImageDesc.cpp | 6 ++++++ src/bindings/python/PyPlanarImageDesc.cpp | 6 ++++++ src/bindings/python/PySystemMonitors.h | 3 ++- src/bindings/python/PyTransform.cpp | 4 ++++ src/bindings/python/transforms/PyAllocationTransform.cpp | 5 +++++ src/bindings/python/transforms/PyBuiltinTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyCDLTransform.cpp | 7 +++++++ src/bindings/python/transforms/PyColorSpaceTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyDisplayViewTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyExponentTransform.cpp | 5 +++++ .../python/transforms/PyExponentWithLinearTransform.cpp | 6 ++++++ .../python/transforms/PyExposureContrastTransform.cpp | 4 ++++ src/bindings/python/transforms/PyFileTransform.cpp | 6 ++++++ .../python/transforms/PyFixedFunctionTransform.cpp | 6 ++++++ .../python/transforms/PyGradingHueCurveTransform.cpp | 4 ++++ .../python/transforms/PyGradingPrimaryTransform.cpp | 4 ++++ .../python/transforms/PyGradingRGBCurveTransform.cpp | 4 ++++ src/bindings/python/transforms/PyGradingToneTransform.cpp | 4 ++++ src/bindings/python/transforms/PyGroupTransform.cpp | 5 +++++ src/bindings/python/transforms/PyLogAffineTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyLogCameraTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyLogTransform.cpp | 4 ++++ src/bindings/python/transforms/PyLookTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyLut1DTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyLut3DTransform.cpp | 6 ++++++ src/bindings/python/transforms/PyMatrixTransform.cpp | 5 +++++ 29 files changed, 147 insertions(+), 1 deletion(-) diff --git a/src/bindings/python/PyGpuShaderCreator.cpp b/src/bindings/python/PyGpuShaderCreator.cpp index 908ac1817..110bffab3 100644 --- a/src/bindings/python/PyGpuShaderCreator.cpp +++ b/src/bindings/python/PyGpuShaderCreator.cpp @@ -1,6 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include "PyUtils.h" #include "PyDynamicProperty.h" #include "PyGpuShaderCreator.h" diff --git a/src/bindings/python/PyGpuShaderDesc.cpp b/src/bindings/python/PyGpuShaderDesc.cpp index a43f1f3c8..7f4653316 100644 --- a/src/bindings/python/PyGpuShaderDesc.cpp +++ b/src/bindings/python/PyGpuShaderDesc.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + +#include "PyOpenColorIO.h" #include "PyGpuShaderCreator.h" +#include "PyUtils.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyImageDesc.cpp b/src/bindings/python/PyImageDesc.cpp index a30d915d5..1196c0529 100644 --- a/src/bindings/python/PyImageDesc.cpp +++ b/src/bindings/python/PyImageDesc.cpp @@ -3,7 +3,10 @@ #include +#include + #include "PyImageDesc.h" +#include "PyUtils.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp index 0b3e6a4e2..2b6124d31 100644 --- a/src/bindings/python/PyPackedImageDesc.cpp +++ b/src/bindings/python/PyPackedImageDesc.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyImageDesc.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyPlanarImageDesc.cpp b/src/bindings/python/PyPlanarImageDesc.cpp index 3b264b934..b6fdd8290 100644 --- a/src/bindings/python/PyPlanarImageDesc.cpp +++ b/src/bindings/python/PyPlanarImageDesc.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyImageDesc.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PySystemMonitors.h b/src/bindings/python/PySystemMonitors.h index 5e47a20db..9a1615312 100644 --- a/src/bindings/python/PySystemMonitors.h +++ b/src/bindings/python/PySystemMonitors.h @@ -4,7 +4,8 @@ #ifndef INCLUDED_OCIO_PYSYSTEMMONITORS_H #define INCLUDED_OCIO_PYSYSTEMMONITORS_H -#include "PyOpenColorIO.h" +#include + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyTransform.cpp b/src/bindings/python/PyTransform.cpp index 40ea4fb4b..91fa21c7d 100644 --- a/src/bindings/python/PyTransform.cpp +++ b/src/bindings/python/PyTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyAllocationTransform.cpp b/src/bindings/python/transforms/PyAllocationTransform.cpp index b6456cadd..63352f8ed 100644 --- a/src/bindings/python/transforms/PyAllocationTransform.cpp +++ b/src/bindings/python/transforms/PyAllocationTransform.cpp @@ -1,7 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyBuiltinTransform.cpp b/src/bindings/python/transforms/PyBuiltinTransform.cpp index cc740dbbe..fcf351541 100644 --- a/src/bindings/python/transforms/PyBuiltinTransform.cpp +++ b/src/bindings/python/transforms/PyBuiltinTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyCDLTransform.cpp b/src/bindings/python/transforms/PyCDLTransform.cpp index dfe2fc482..300120e37 100644 --- a/src/bindings/python/transforms/PyCDLTransform.cpp +++ b/src/bindings/python/transforms/PyCDLTransform.cpp @@ -1,7 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyColorSpaceTransform.cpp b/src/bindings/python/transforms/PyColorSpaceTransform.cpp index c9ecceba7..b3d52d70d 100644 --- a/src/bindings/python/transforms/PyColorSpaceTransform.cpp +++ b/src/bindings/python/transforms/PyColorSpaceTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyDisplayViewTransform.cpp b/src/bindings/python/transforms/PyDisplayViewTransform.cpp index adf9f03cf..b1f2a934a 100644 --- a/src/bindings/python/transforms/PyDisplayViewTransform.cpp +++ b/src/bindings/python/transforms/PyDisplayViewTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExponentTransform.cpp b/src/bindings/python/transforms/PyExponentTransform.cpp index deb22008d..85676ef83 100644 --- a/src/bindings/python/transforms/PyExponentTransform.cpp +++ b/src/bindings/python/transforms/PyExponentTransform.cpp @@ -1,7 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp index d25844bf6..00bed6754 100644 --- a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp +++ b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExposureContrastTransform.cpp b/src/bindings/python/transforms/PyExposureContrastTransform.cpp index a9802bdce..b8011b4eb 100644 --- a/src/bindings/python/transforms/PyExposureContrastTransform.cpp +++ b/src/bindings/python/transforms/PyExposureContrastTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyFileTransform.cpp b/src/bindings/python/transforms/PyFileTransform.cpp index 3d7080098..4c513aefe 100644 --- a/src/bindings/python/transforms/PyFileTransform.cpp +++ b/src/bindings/python/transforms/PyFileTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp index efd743689..129cd4124 100644 --- a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp +++ b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp index 1f6c992d9..1c47ab5fe 100644 --- a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp index 3aaeaa5e6..ab06a56e2 100644 --- a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp +++ b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp index e37eed153..3096070fa 100644 --- a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingToneTransform.cpp b/src/bindings/python/transforms/PyGradingToneTransform.cpp index a3124c42e..3975f37f2 100644 --- a/src/bindings/python/transforms/PyGradingToneTransform.cpp +++ b/src/bindings/python/transforms/PyGradingToneTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGroupTransform.cpp b/src/bindings/python/transforms/PyGroupTransform.cpp index 2b5757427..48e525a99 100644 --- a/src/bindings/python/transforms/PyGroupTransform.cpp +++ b/src/bindings/python/transforms/PyGroupTransform.cpp @@ -2,9 +2,14 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include + +#include #include "PyTransform.h" +#include "PyUtils.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLogAffineTransform.cpp b/src/bindings/python/transforms/PyLogAffineTransform.cpp index 30a4f01a1..dc67c10c9 100644 --- a/src/bindings/python/transforms/PyLogAffineTransform.cpp +++ b/src/bindings/python/transforms/PyLogAffineTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLogCameraTransform.cpp b/src/bindings/python/transforms/PyLogCameraTransform.cpp index 55ff63a82..51721abf7 100644 --- a/src/bindings/python/transforms/PyLogCameraTransform.cpp +++ b/src/bindings/python/transforms/PyLogCameraTransform.cpp @@ -2,8 +2,14 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include +#include + +#include #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLogTransform.cpp b/src/bindings/python/transforms/PyLogTransform.cpp index 2169c448f..ffbfde98c 100644 --- a/src/bindings/python/transforms/PyLogTransform.cpp +++ b/src/bindings/python/transforms/PyLogTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLookTransform.cpp b/src/bindings/python/transforms/PyLookTransform.cpp index 6f045ce71..8f7cf2007 100644 --- a/src/bindings/python/transforms/PyLookTransform.cpp +++ b/src/bindings/python/transforms/PyLookTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLut1DTransform.cpp b/src/bindings/python/transforms/PyLut1DTransform.cpp index 47ea9f41b..a2c931e37 100644 --- a/src/bindings/python/transforms/PyLut1DTransform.cpp +++ b/src/bindings/python/transforms/PyLut1DTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLut3DTransform.cpp b/src/bindings/python/transforms/PyLut3DTransform.cpp index 2d91f7f05..d7c7396b9 100644 --- a/src/bindings/python/transforms/PyLut3DTransform.cpp +++ b/src/bindings/python/transforms/PyLut3DTransform.cpp @@ -1,7 +1,13 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyMatrixTransform.cpp b/src/bindings/python/transforms/PyMatrixTransform.cpp index 8ce2ab6bd..e239a4369 100644 --- a/src/bindings/python/transforms/PyMatrixTransform.cpp +++ b/src/bindings/python/transforms/PyMatrixTransform.cpp @@ -1,7 +1,12 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyTransform.h" +#include "PyUtils.h" namespace OCIO_NAMESPACE { From 55f7b10926efb949fc492aff5d40afeaa2fe329b Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 10:26:55 +0000 Subject: [PATCH 30/48] Avoid including Python binding headers when not needed Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBuiltinConfigRegistry.h | 3 ++- .../python/PyBuiltinTransformRegistry.h | 3 ++- src/bindings/python/PyDynamicProperty.h | 24 +++++++++---------- .../python/transforms/PyRangeTransform.cpp | 4 ++++ 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/bindings/python/PyBuiltinConfigRegistry.h b/src/bindings/python/PyBuiltinConfigRegistry.h index e0dd960a8..cf3db3675 100644 --- a/src/bindings/python/PyBuiltinConfigRegistry.h +++ b/src/bindings/python/PyBuiltinConfigRegistry.h @@ -4,7 +4,8 @@ #ifndef INCLUDED_OCIO_PYBUILTINCONFIGREGISTRY_H #define INCLUDED_OCIO_PYBUILTINCONFIGREGISTRY_H -#include "PyOpenColorIO.h" +#include + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinTransformRegistry.h b/src/bindings/python/PyBuiltinTransformRegistry.h index 55be013bf..b5d0f6039 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.h +++ b/src/bindings/python/PyBuiltinTransformRegistry.h @@ -4,7 +4,8 @@ #ifndef INCLUDED_OCIO_PYBUILTINTRANSFORMREGISTRY_H #define INCLUDED_OCIO_PYBUILTINTRANSFORMREGISTRY_H -#include "PyOpenColorIO.h" +#include + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyDynamicProperty.h b/src/bindings/python/PyDynamicProperty.h index 2115cfaf4..de460cd8c 100644 --- a/src/bindings/python/PyDynamicProperty.h +++ b/src/bindings/python/PyDynamicProperty.h @@ -4,8 +4,8 @@ #ifndef INCLUDED_OCIO_PYDYNAMICPROPERTY_H #define INCLUDED_OCIO_PYDYNAMICPROPERTY_H -#include "PyOpenColorIO.h" -#include "PyUtils.h" +#include + namespace OCIO_NAMESPACE { @@ -31,7 +31,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propDouble->getValue(); } - throw OCIO::Exception("Invalid dynamic property type (doesn't hold a double)."); + throw Exception("Invalid dynamic property type (doesn't hold a double)."); } void setDouble(double v) @@ -41,7 +41,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propDouble->setValue(v); } - throw OCIO::Exception("Invalid dynamic property type (doesn't accept a double)."); + throw Exception("Invalid dynamic property type (doesn't accept a double)."); } const GradingPrimary & getGradingPrimary() @@ -51,7 +51,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGP->getValue(); } - throw OCIO::Exception("Invalid dynamic property type (doesn't hold a GradingPrimary)."); + throw Exception("Invalid dynamic property type (doesn't hold a GradingPrimary)."); } void setGradingPrimary(const GradingPrimary & v) @@ -61,7 +61,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGP->setValue(v); } - throw OCIO::Exception("Invalid dynamic property type (doesn't accept a GradingPrimary)."); + throw Exception("Invalid dynamic property type (doesn't accept a GradingPrimary)."); } const ConstGradingRGBCurveRcPtr & getGradingRGBCurve() @@ -71,7 +71,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGC->getValue(); } - throw OCIO::Exception("Invalid dynamic property type (doesn't hold a GradingRGBCurve)."); + throw Exception("Invalid dynamic property type (doesn't hold a GradingRGBCurve)."); } void setGradingRGBCurve(const ConstGradingRGBCurveRcPtr & v) @@ -81,7 +81,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGC->setValue(v); } - throw OCIO::Exception("Invalid dynamic property type (doesn't accept a GradingRGBCurve)."); + throw Exception("Invalid dynamic property type (doesn't accept a GradingRGBCurve)."); } const ConstGradingHueCurveRcPtr & getGradingHueCurve() @@ -91,7 +91,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGC->getValue(); } - throw OCIO::Exception("Invalid dynamic property type (doesn't hold a GradingHueCurve)."); + throw Exception("Invalid dynamic property type (doesn't hold a GradingHueCurve)."); } void setGradingHueCurve(const ConstGradingHueCurveRcPtr & v) @@ -101,7 +101,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGC->setValue(v); } - throw OCIO::Exception("Invalid dynamic property type (doesn't accept a GradingHueCurve)."); + throw Exception("Invalid dynamic property type (doesn't accept a GradingHueCurve)."); } const GradingTone & getGradingTone() @@ -111,7 +111,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGT->getValue(); } - throw OCIO::Exception("Invalid dynamic property type (doesn't hold a GradingTone)."); + throw Exception("Invalid dynamic property type (doesn't hold a GradingTone)."); } void setGradingTone(const GradingTone & v) @@ -121,7 +121,7 @@ struct OCIOHIDDEN PyDynamicProperty { return propGT->setValue(v); } - throw OCIO::Exception("Invalid dynamic property type (doesn't accept a GradingTone)."); + throw Exception("Invalid dynamic property type (doesn't accept a GradingTone)."); } private: diff --git a/src/bindings/python/transforms/PyRangeTransform.cpp b/src/bindings/python/transforms/PyRangeTransform.cpp index 680d9c2dc..bbb831261 100644 --- a/src/bindings/python/transforms/PyRangeTransform.cpp +++ b/src/bindings/python/transforms/PyRangeTransform.cpp @@ -1,7 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + #include "PyTransform.h" +#include "PyUtils.h" + namespace OCIO_NAMESPACE { From 9412bec86342c18bc9894115e90020a5c4d549f9 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 11:12:31 +0000 Subject: [PATCH 31/48] Reduce dependencies on PyUtils.h Signed-off-by: Kevin Wheatley --- src/bindings/python/PyConfigIOProxy.cpp | 3 +- src/bindings/python/PyDynamicProperty.cpp | 3 +- src/bindings/python/PyGpuShaderCreator.h | 8 ++-- src/bindings/python/PyImageDesc.h | 17 ++++---- src/bindings/python/PyTransform.h | 52 +++++++++++------------ 5 files changed, 44 insertions(+), 39 deletions(-) diff --git a/src/bindings/python/PyConfigIOProxy.cpp b/src/bindings/python/PyConfigIOProxy.cpp index 70384187f..cb175b52e 100644 --- a/src/bindings/python/PyConfigIOProxy.cpp +++ b/src/bindings/python/PyConfigIOProxy.cpp @@ -2,9 +2,10 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include +#include #include "PyOpenColorIO.h" -#include "PyUtils.h" #include #include diff --git a/src/bindings/python/PyDynamicProperty.cpp b/src/bindings/python/PyDynamicProperty.cpp index 626a5883d..33c3d275f 100644 --- a/src/bindings/python/PyDynamicProperty.cpp +++ b/src/bindings/python/PyDynamicProperty.cpp @@ -1,8 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include "PyOpenColorIO.h" #include "PyDynamicProperty.h" -#include "PyTransform.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderCreator.h b/src/bindings/python/PyGpuShaderCreator.h index b1ed02a28..8016549a4 100644 --- a/src/bindings/python/PyGpuShaderCreator.h +++ b/src/bindings/python/PyGpuShaderCreator.h @@ -4,12 +4,14 @@ #ifndef INCLUDED_OCIO_PYGPUSHADERCREATOR_H #define INCLUDED_OCIO_PYGPUSHADERCREATOR_H -#include "PyOpenColorIO.h" -#include "PyUtils.h" +#include "OpenColorABI.h" + +#include + namespace OCIO_NAMESPACE { -void bindPyGpuShaderDesc(py::module & m); +void bindPyGpuShaderDesc(pybind11::module & m); } // namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyImageDesc.h b/src/bindings/python/PyImageDesc.h index eb6ca80a4..302f68592 100644 --- a/src/bindings/python/PyImageDesc.h +++ b/src/bindings/python/PyImageDesc.h @@ -4,8 +4,9 @@ #ifndef INCLUDED_OCIO_PYIMAGEDESC_H #define INCLUDED_OCIO_PYIMAGEDESC_H -#include "PyOpenColorIO.h" -#include "PyUtils.h" +#include + +#include namespace OCIO_NAMESPACE { @@ -15,8 +16,8 @@ using PlanarImageDescRcPtr = OCIO_SHARED_PTR; // ImageDesc does NOT claim ownership of its pixels or copy image data. This is problematic in // Python when image data passed to the constructor only exists in the function call's scope. -// The py::buffer is garbage collected immediately following initialization, leaving a dangling -// pointer in the ImageDesc. Consider this scenario: +// The pybind11::buffer is garbage collected immediately following initialization, leaving a +// dangling pointer in the ImageDesc. Consider this scenario: // // >>> img1 = OCIO.PackedImageDesc(np.array(0.18, ...), ...) // >>> img1.getData() @@ -28,7 +29,7 @@ using PlanarImageDescRcPtr = OCIO_SHARED_PTR; // np.array(0.05, ...) # img1 and img2 are pointing to the same memory // // To get around this, ImageDesc and its subclasses are wrapped in a container struct which owns -// persistent copies of the initializing py::buffer object(s). +// persistent copies of the initializing pybind11::buffer object(s). struct OCIOHIDDEN PyImageDesc { @@ -58,7 +59,7 @@ struct OCIOHIDDEN PyImageDescImpl : public PyImageDesc OCIO_SHARED_PTR getImg() const { return OCIO_DYNAMIC_POINTER_CAST(m_img); } - py::buffer m_data[N]; + pybind11::buffer m_data[N]; private: PyImageDescImpl(const PyImageDescImpl &) = delete; @@ -68,8 +69,8 @@ struct OCIOHIDDEN PyImageDescImpl : public PyImageDesc using PyPackedImageDesc = PyImageDescImpl; using PyPlanarImageDesc = PyImageDescImpl; -void bindPyPackedImageDesc(py::module & m); -void bindPyPlanarImageDesc(py::module & m); +void bindPyPackedImageDesc(pybind11::module & m); +void bindPyPlanarImageDesc(pybind11::module & m); } // namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyTransform.h b/src/bindings/python/PyTransform.h index 89fa49d20..ea59dd473 100644 --- a/src/bindings/python/PyTransform.h +++ b/src/bindings/python/PyTransform.h @@ -4,38 +4,38 @@ #ifndef INCLUDED_OCIO_PYTRANSFORM_H #define INCLUDED_OCIO_PYTRANSFORM_H -#include +#include "OpenColorABI.h" + +#include -#include "PyOpenColorIO.h" -#include "PyUtils.h" namespace OCIO_NAMESPACE { // Subclasses -void bindPyAllocationTransform(py::module & m); -void bindPyBuiltinTransform(py::module & m); -void bindPyCDLTransform(py::module & m); -void bindPyColorSpaceTransform(py::module & m); -void bindPyDisplayViewTransform(py::module & m); -void bindPyExponentTransform(py::module & m); -void bindPyExponentWithLinearTransform(py::module & m); -void bindPyExposureContrastTransform(py::module & m); -void bindPyFileTransform(py::module & m); -void bindPyFixedFunctionTransform(py::module & m); -void bindPyGradingPrimaryTransform(py::module & m); -void bindPyGradingRGBCurveTransform(py::module & m); -void bindPyGradingHueCurveTransform(py::module & m); -void bindPyGradingToneTransform(py::module & m); -void bindPyGroupTransform(py::module & m); -void bindPyLogAffineTransform(py::module & m); -void bindPyLogCameraTransform(py::module & m); -void bindPyLogTransform(py::module & m); -void bindPyLookTransform(py::module & m); -void bindPyLut1DTransform(py::module & m); -void bindPyLut3DTransform(py::module & m); -void bindPyMatrixTransform(py::module & m); -void bindPyRangeTransform(py::module & m); +void bindPyAllocationTransform(pybind11::module & m); +void bindPyBuiltinTransform(pybind11::module & m); +void bindPyCDLTransform(pybind11::module & m); +void bindPyColorSpaceTransform(pybind11::module & m); +void bindPyDisplayViewTransform(pybind11::module & m); +void bindPyExponentTransform(pybind11::module & m); +void bindPyExponentWithLinearTransform(pybind11::module & m); +void bindPyExposureContrastTransform(pybind11::module & m); +void bindPyFileTransform(pybind11::module & m); +void bindPyFixedFunctionTransform(pybind11::module & m); +void bindPyGradingPrimaryTransform(pybind11::module & m); +void bindPyGradingRGBCurveTransform(pybind11::module & m); +void bindPyGradingHueCurveTransform(pybind11::module & m); +void bindPyGradingToneTransform(pybind11::module & m); +void bindPyGroupTransform(pybind11::module & m); +void bindPyLogAffineTransform(pybind11::module & m); +void bindPyLogCameraTransform(pybind11::module & m); +void bindPyLogTransform(pybind11::module & m); +void bindPyLookTransform(pybind11::module & m); +void bindPyLut1DTransform(pybind11::module & m); +void bindPyLut3DTransform(pybind11::module & m); +void bindPyMatrixTransform(pybind11::module & m); +void bindPyRangeTransform(pybind11::module & m); } // namespace OCIO_NAMESPACE From 0bcaa9a5d57ea69d98fe229e2795769e239867b3 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 15:35:07 +0000 Subject: [PATCH 32/48] Defend docstrings.h against multiple inclusion Signed-off-by: Kevin Wheatley --- share/docs/docstrings.h | 4 ++++ share/docs/extract_docstrings.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/share/docs/docstrings.h b/share/docs/docstrings.h index e906f1f00..0efeb78de 100644 --- a/share/docs/docstrings.h +++ b/share/docs/docstrings.h @@ -38,6 +38,8 @@ ----------------------------------------------------------------------------- */ +#ifndef INCLUDED_OCIO_DOCSTRINGS_H +#define INCLUDED_OCIO_DOCSTRINGS_H #define DOC(...) __doc_none @@ -51,3 +53,5 @@ static const char *__doc_none = R"doc()doc"; #if defined(__GNUG__) #pragma GCC diagnostic pop #endif + +#endif diff --git a/share/docs/extract_docstrings.py b/share/docs/extract_docstrings.py index 221f407e3..567aefbc7 100644 --- a/share/docs/extract_docstrings.py +++ b/share/docs/extract_docstrings.py @@ -68,6 +68,8 @@ This file contains docstrings for use in the Python bindings. Do not edit! They were automatically extracted by OpenColorIO/share/docs/extract_docstrings.py. */ +#ifndef INCLUDED_OCIO_DOCSTRINGS_H +#define INCLUDED_OCIO_DOCSTRINGS_H #define __EXPAND(x) x #define __COUNT(_1, _2, _3, _4, _5, _6, _7, COUNT, ...) COUNT @@ -93,6 +95,7 @@ #if defined(__GNUG__) #pragma GCC diagnostic pop #endif +#endif """ CPP_OPERATORS = { From f8a7b352184ac61832fb7cc68f52be8869022c6f Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 16:08:45 +0000 Subject: [PATCH 33/48] Ensure we get correct visibility definition for pybind11 namespace Signed-off-by: Kevin Wheatley --- src/bindings/python/PyOpenColorIO.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index 9e67ceb26..aee7dec08 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -67,7 +67,7 @@ void bindPyMixingHelpers(py::module & m); namespace OCIO = OCIO_NAMESPACE; -namespace pybind11 +namespace PYBIND11_NAMESPACE { template<> From 383741d59ccbfdc7bfeebdb1e3535f91074758f8 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 16:38:11 +0000 Subject: [PATCH 34/48] Include docstrings directly in cpp files Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBaker.cpp | 1 + src/bindings/python/PyBuiltinConfigRegistry.cpp | 1 + src/bindings/python/PyBuiltinTransformRegistry.cpp | 1 + src/bindings/python/PyCPUProcessor.cpp | 1 + src/bindings/python/PyColorSpace.cpp | 1 + src/bindings/python/PyColorSpaceSet.cpp | 1 + src/bindings/python/PyConfig.cpp | 1 + src/bindings/python/PyContext.cpp | 1 + src/bindings/python/PyDynamicProperty.cpp | 1 + src/bindings/python/PyFileRules.cpp | 1 + src/bindings/python/PyFormatMetadata.cpp | 2 +- src/bindings/python/PyGPUProcessor.cpp | 1 + src/bindings/python/PyGpuShaderCreator.cpp | 1 + src/bindings/python/PyGpuShaderDesc.cpp | 1 + src/bindings/python/PyGradingData.cpp | 1 + src/bindings/python/PyImageDesc.cpp | 1 + src/bindings/python/PyLook.cpp | 1 + src/bindings/python/PyNamedTransform.cpp | 1 + src/bindings/python/PyOpenColorIO.cpp | 1 + src/bindings/python/PyOpenColorIO.h | 3 --- src/bindings/python/PyPackedImageDesc.cpp | 1 + src/bindings/python/PyPlanarImageDesc.cpp | 1 + src/bindings/python/PyProcessor.cpp | 1 + src/bindings/python/PyProcessorMetadata.cpp | 1 + src/bindings/python/PySystemMonitors.cpp | 1 + src/bindings/python/PyTransform.cpp | 1 + src/bindings/python/PyTypes.cpp | 1 + src/bindings/python/PyViewTransform.cpp | 2 ++ src/bindings/python/PyViewingRules.cpp | 1 + src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp | 1 + src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp | 1 + src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp | 1 + src/bindings/python/apphelpers/PyMergeConfigs.cpp | 1 + src/bindings/python/apphelpers/PyMixingHelpers.cpp | 1 + src/bindings/python/transforms/PyAllocationTransform.cpp | 1 + src/bindings/python/transforms/PyBuiltinTransform.cpp | 1 + src/bindings/python/transforms/PyCDLTransform.cpp | 1 + src/bindings/python/transforms/PyColorSpaceTransform.cpp | 1 + src/bindings/python/transforms/PyDisplayViewTransform.cpp | 1 + src/bindings/python/transforms/PyExponentTransform.cpp | 1 + .../python/transforms/PyExponentWithLinearTransform.cpp | 1 + src/bindings/python/transforms/PyExposureContrastTransform.cpp | 1 + src/bindings/python/transforms/PyFileTransform.cpp | 1 + src/bindings/python/transforms/PyFixedFunctionTransform.cpp | 1 + src/bindings/python/transforms/PyGradingHueCurveTransform.cpp | 1 + src/bindings/python/transforms/PyGradingPrimaryTransform.cpp | 1 + src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp | 1 + src/bindings/python/transforms/PyGradingToneTransform.cpp | 1 + src/bindings/python/transforms/PyGroupTransform.cpp | 1 + src/bindings/python/transforms/PyLogAffineTransform.cpp | 1 + src/bindings/python/transforms/PyLogCameraTransform.cpp | 1 + src/bindings/python/transforms/PyLogTransform.cpp | 1 + src/bindings/python/transforms/PyLookTransform.cpp | 1 + src/bindings/python/transforms/PyLut1DTransform.cpp | 1 + src/bindings/python/transforms/PyLut3DTransform.cpp | 1 + src/bindings/python/transforms/PyMatrixTransform.cpp | 1 + src/bindings/python/transforms/PyRangeTransform.cpp | 1 + 57 files changed, 57 insertions(+), 4 deletions(-) diff --git a/src/bindings/python/PyBaker.cpp b/src/bindings/python/PyBaker.cpp index 561205986..27b19cc32 100644 --- a/src/bindings/python/PyBaker.cpp +++ b/src/bindings/python/PyBaker.cpp @@ -7,6 +7,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinConfigRegistry.cpp b/src/bindings/python/PyBuiltinConfigRegistry.cpp index 4d6686b31..1b88440b4 100644 --- a/src/bindings/python/PyBuiltinConfigRegistry.cpp +++ b/src/bindings/python/PyBuiltinConfigRegistry.cpp @@ -6,6 +6,7 @@ #include "PyBuiltinConfigRegistry.h" #include "PyUtils.h" #include "utils/StringUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp index 0c7ccef46..aa73e6a4c 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.cpp +++ b/src/bindings/python/PyBuiltinTransformRegistry.cpp @@ -7,6 +7,7 @@ #include "PyBuiltinTransformRegistry.h" #include "PyUtils.h" #include "utils/StringUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyCPUProcessor.cpp b/src/bindings/python/PyCPUProcessor.cpp index e6ce5015c..abcb05670 100644 --- a/src/bindings/python/PyCPUProcessor.cpp +++ b/src/bindings/python/PyCPUProcessor.cpp @@ -7,6 +7,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" #include "PyImageDesc.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyColorSpace.cpp b/src/bindings/python/PyColorSpace.cpp index e35c5249e..80d9040c0 100644 --- a/src/bindings/python/PyColorSpace.cpp +++ b/src/bindings/python/PyColorSpace.cpp @@ -6,6 +6,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyColorSpaceSet.cpp b/src/bindings/python/PyColorSpaceSet.cpp index d6c4831e2..783bf03b8 100644 --- a/src/bindings/python/PyColorSpaceSet.cpp +++ b/src/bindings/python/PyColorSpaceSet.cpp @@ -3,6 +3,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyConfig.cpp b/src/bindings/python/PyConfig.cpp index 993201a16..b6418e349 100644 --- a/src/bindings/python/PyConfig.cpp +++ b/src/bindings/python/PyConfig.cpp @@ -10,6 +10,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" #include "utils/StringUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyContext.cpp b/src/bindings/python/PyContext.cpp index 97faa3e7b..2d5442592 100644 --- a/src/bindings/python/PyContext.cpp +++ b/src/bindings/python/PyContext.cpp @@ -8,6 +8,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" #include "utils/StringUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyDynamicProperty.cpp b/src/bindings/python/PyDynamicProperty.cpp index 33c3d275f..e2d4369ff 100644 --- a/src/bindings/python/PyDynamicProperty.cpp +++ b/src/bindings/python/PyDynamicProperty.cpp @@ -3,6 +3,7 @@ #include "PyOpenColorIO.h" #include "PyDynamicProperty.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyFileRules.cpp b/src/bindings/python/PyFileRules.cpp index b73547426..5ef339b43 100644 --- a/src/bindings/python/PyFileRules.cpp +++ b/src/bindings/python/PyFileRules.cpp @@ -3,6 +3,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyFormatMetadata.cpp b/src/bindings/python/PyFormatMetadata.cpp index 1ab6bf87e..06d885b5d 100644 --- a/src/bindings/python/PyFormatMetadata.cpp +++ b/src/bindings/python/PyFormatMetadata.cpp @@ -7,8 +7,8 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" #include "utils/StringUtils.h" +#include "docstrings.h" -#include namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGPUProcessor.cpp b/src/bindings/python/PyGPUProcessor.cpp index 01986eb1c..9f99ca547 100644 --- a/src/bindings/python/PyGPUProcessor.cpp +++ b/src/bindings/python/PyGPUProcessor.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include "PyOpenColorIO.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderCreator.cpp b/src/bindings/python/PyGpuShaderCreator.cpp index 110bffab3..94e5c5ba2 100644 --- a/src/bindings/python/PyGpuShaderCreator.cpp +++ b/src/bindings/python/PyGpuShaderCreator.cpp @@ -6,6 +6,7 @@ #include "PyUtils.h" #include "PyDynamicProperty.h" #include "PyGpuShaderCreator.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderDesc.cpp b/src/bindings/python/PyGpuShaderDesc.cpp index 7f4653316..a16722231 100644 --- a/src/bindings/python/PyGpuShaderDesc.cpp +++ b/src/bindings/python/PyGpuShaderDesc.cpp @@ -8,6 +8,7 @@ #include "PyOpenColorIO.h" #include "PyGpuShaderCreator.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGradingData.cpp b/src/bindings/python/PyGradingData.cpp index 10939fba8..0f915532b 100644 --- a/src/bindings/python/PyGradingData.cpp +++ b/src/bindings/python/PyGradingData.cpp @@ -5,6 +5,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyImageDesc.cpp b/src/bindings/python/PyImageDesc.cpp index 1196c0529..cb422b091 100644 --- a/src/bindings/python/PyImageDesc.cpp +++ b/src/bindings/python/PyImageDesc.cpp @@ -7,6 +7,7 @@ #include "PyImageDesc.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyLook.cpp b/src/bindings/python/PyLook.cpp index 5441d6ed5..e086e75da 100644 --- a/src/bindings/python/PyLook.cpp +++ b/src/bindings/python/PyLook.cpp @@ -5,6 +5,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyNamedTransform.cpp b/src/bindings/python/PyNamedTransform.cpp index 47683d5d0..73286ba50 100644 --- a/src/bindings/python/PyNamedTransform.cpp +++ b/src/bindings/python/PyNamedTransform.cpp @@ -6,6 +6,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyOpenColorIO.cpp b/src/bindings/python/PyOpenColorIO.cpp index aa9308b5d..a0c41c336 100644 --- a/src/bindings/python/PyOpenColorIO.cpp +++ b/src/bindings/python/PyOpenColorIO.cpp @@ -4,6 +4,7 @@ #include #include "PyOpenColorIO.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index aee7dec08..51236afc0 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -12,9 +12,6 @@ #include -// Generated at build time: '${PROJECT_BINARY_DIR}/docs/_doxygen/docstrings.h' -#include "docstrings.h" - namespace py = pybind11; using namespace pybind11::literals; diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp index 2b6124d31..5058ba34c 100644 --- a/src/bindings/python/PyPackedImageDesc.cpp +++ b/src/bindings/python/PyPackedImageDesc.cpp @@ -7,6 +7,7 @@ #include "PyImageDesc.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyPlanarImageDesc.cpp b/src/bindings/python/PyPlanarImageDesc.cpp index b6fdd8290..46bc05345 100644 --- a/src/bindings/python/PyPlanarImageDesc.cpp +++ b/src/bindings/python/PyPlanarImageDesc.cpp @@ -7,6 +7,7 @@ #include "PyImageDesc.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyProcessor.cpp b/src/bindings/python/PyProcessor.cpp index 2071ccc78..f6360a929 100644 --- a/src/bindings/python/PyProcessor.cpp +++ b/src/bindings/python/PyProcessor.cpp @@ -4,6 +4,7 @@ #include "PyDynamicProperty.h" #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyProcessorMetadata.cpp b/src/bindings/python/PyProcessorMetadata.cpp index 55977f760..878aed49c 100644 --- a/src/bindings/python/PyProcessorMetadata.cpp +++ b/src/bindings/python/PyProcessorMetadata.cpp @@ -3,6 +3,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PySystemMonitors.cpp b/src/bindings/python/PySystemMonitors.cpp index 36720b243..998f3c20f 100644 --- a/src/bindings/python/PySystemMonitors.cpp +++ b/src/bindings/python/PySystemMonitors.cpp @@ -3,6 +3,7 @@ #include "PySystemMonitors.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyTransform.cpp b/src/bindings/python/PyTransform.cpp index 91fa21c7d..b5b27d72a 100644 --- a/src/bindings/python/PyTransform.cpp +++ b/src/bindings/python/PyTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyTypes.cpp b/src/bindings/python/PyTypes.cpp index 3305bdbf1..4894604fa 100644 --- a/src/bindings/python/PyTypes.cpp +++ b/src/bindings/python/PyTypes.cpp @@ -7,6 +7,7 @@ #include "PyBuiltinConfigRegistry.h" #include "PyBuiltinTransformRegistry.h" #include "PyDynamicProperty.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyViewTransform.cpp b/src/bindings/python/PyViewTransform.cpp index c6ab6711c..ef822325c 100644 --- a/src/bindings/python/PyViewTransform.cpp +++ b/src/bindings/python/PyViewTransform.cpp @@ -6,6 +6,8 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyViewingRules.cpp b/src/bindings/python/PyViewingRules.cpp index 33bc3565b..31ce91c16 100644 --- a/src/bindings/python/PyViewingRules.cpp +++ b/src/bindings/python/PyViewingRules.cpp @@ -5,6 +5,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp index bee62264d..5a32beeed 100644 --- a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp +++ b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp @@ -6,6 +6,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp index 8cef64619..c6f39c9f4 100644 --- a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp +++ b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp @@ -4,6 +4,7 @@ #include #include "PyOpenColorIO.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp b/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp index 0ea459c11..875163b7b 100644 --- a/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp +++ b/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp @@ -3,6 +3,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyMergeConfigs.cpp b/src/bindings/python/apphelpers/PyMergeConfigs.cpp index a75d1adf2..c2d9a46e2 100644 --- a/src/bindings/python/apphelpers/PyMergeConfigs.cpp +++ b/src/bindings/python/apphelpers/PyMergeConfigs.cpp @@ -5,6 +5,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/apphelpers/PyMixingHelpers.cpp b/src/bindings/python/apphelpers/PyMixingHelpers.cpp index 94203c3f4..baf9f5b68 100644 --- a/src/bindings/python/apphelpers/PyMixingHelpers.cpp +++ b/src/bindings/python/apphelpers/PyMixingHelpers.cpp @@ -3,6 +3,7 @@ #include "PyOpenColorIO.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyAllocationTransform.cpp b/src/bindings/python/transforms/PyAllocationTransform.cpp index 63352f8ed..639011c1b 100644 --- a/src/bindings/python/transforms/PyAllocationTransform.cpp +++ b/src/bindings/python/transforms/PyAllocationTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyBuiltinTransform.cpp b/src/bindings/python/transforms/PyBuiltinTransform.cpp index fcf351541..17cdaddb2 100644 --- a/src/bindings/python/transforms/PyBuiltinTransform.cpp +++ b/src/bindings/python/transforms/PyBuiltinTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyCDLTransform.cpp b/src/bindings/python/transforms/PyCDLTransform.cpp index 300120e37..34df8ea52 100644 --- a/src/bindings/python/transforms/PyCDLTransform.cpp +++ b/src/bindings/python/transforms/PyCDLTransform.cpp @@ -8,6 +8,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyColorSpaceTransform.cpp b/src/bindings/python/transforms/PyColorSpaceTransform.cpp index b3d52d70d..8684cbec0 100644 --- a/src/bindings/python/transforms/PyColorSpaceTransform.cpp +++ b/src/bindings/python/transforms/PyColorSpaceTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyDisplayViewTransform.cpp b/src/bindings/python/transforms/PyDisplayViewTransform.cpp index b1f2a934a..27f9df96c 100644 --- a/src/bindings/python/transforms/PyDisplayViewTransform.cpp +++ b/src/bindings/python/transforms/PyDisplayViewTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyExponentTransform.cpp b/src/bindings/python/transforms/PyExponentTransform.cpp index 85676ef83..32236cd60 100644 --- a/src/bindings/python/transforms/PyExponentTransform.cpp +++ b/src/bindings/python/transforms/PyExponentTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp index 00bed6754..8fc4724de 100644 --- a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp +++ b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyExposureContrastTransform.cpp b/src/bindings/python/transforms/PyExposureContrastTransform.cpp index b8011b4eb..79c936297 100644 --- a/src/bindings/python/transforms/PyExposureContrastTransform.cpp +++ b/src/bindings/python/transforms/PyExposureContrastTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyFileTransform.cpp b/src/bindings/python/transforms/PyFileTransform.cpp index 4c513aefe..8ce3eda35 100644 --- a/src/bindings/python/transforms/PyFileTransform.cpp +++ b/src/bindings/python/transforms/PyFileTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp index 129cd4124..fea3b7bf6 100644 --- a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp +++ b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp index 1c47ab5fe..c78e07565 100644 --- a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp index ab06a56e2..f80c466b1 100644 --- a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp +++ b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp index 3096070fa..3939fb5f7 100644 --- a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyGradingToneTransform.cpp b/src/bindings/python/transforms/PyGradingToneTransform.cpp index 3975f37f2..d106291c3 100644 --- a/src/bindings/python/transforms/PyGradingToneTransform.cpp +++ b/src/bindings/python/transforms/PyGradingToneTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyGroupTransform.cpp b/src/bindings/python/transforms/PyGroupTransform.cpp index 48e525a99..fa592892d 100644 --- a/src/bindings/python/transforms/PyGroupTransform.cpp +++ b/src/bindings/python/transforms/PyGroupTransform.cpp @@ -10,6 +10,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLogAffineTransform.cpp b/src/bindings/python/transforms/PyLogAffineTransform.cpp index dc67c10c9..5be5f9c31 100644 --- a/src/bindings/python/transforms/PyLogAffineTransform.cpp +++ b/src/bindings/python/transforms/PyLogAffineTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyLogCameraTransform.cpp b/src/bindings/python/transforms/PyLogCameraTransform.cpp index 51721abf7..7a5815122 100644 --- a/src/bindings/python/transforms/PyLogCameraTransform.cpp +++ b/src/bindings/python/transforms/PyLogCameraTransform.cpp @@ -9,6 +9,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyLogTransform.cpp b/src/bindings/python/transforms/PyLogTransform.cpp index ffbfde98c..89ad85993 100644 --- a/src/bindings/python/transforms/PyLogTransform.cpp +++ b/src/bindings/python/transforms/PyLogTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyLookTransform.cpp b/src/bindings/python/transforms/PyLookTransform.cpp index 8f7cf2007..3b672045c 100644 --- a/src/bindings/python/transforms/PyLookTransform.cpp +++ b/src/bindings/python/transforms/PyLookTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyLut1DTransform.cpp b/src/bindings/python/transforms/PyLut1DTransform.cpp index a2c931e37..e4445b354 100644 --- a/src/bindings/python/transforms/PyLut1DTransform.cpp +++ b/src/bindings/python/transforms/PyLut1DTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyLut3DTransform.cpp b/src/bindings/python/transforms/PyLut3DTransform.cpp index d7c7396b9..7a37a2e7f 100644 --- a/src/bindings/python/transforms/PyLut3DTransform.cpp +++ b/src/bindings/python/transforms/PyLut3DTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyMatrixTransform.cpp b/src/bindings/python/transforms/PyMatrixTransform.cpp index e239a4369..046ad1dca 100644 --- a/src/bindings/python/transforms/PyMatrixTransform.cpp +++ b/src/bindings/python/transforms/PyMatrixTransform.cpp @@ -7,6 +7,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyRangeTransform.cpp b/src/bindings/python/transforms/PyRangeTransform.cpp index bbb831261..6a5d3aaca 100644 --- a/src/bindings/python/transforms/PyRangeTransform.cpp +++ b/src/bindings/python/transforms/PyRangeTransform.cpp @@ -5,6 +5,7 @@ #include "PyTransform.h" #include "PyUtils.h" +#include "docstrings.h" namespace OCIO_NAMESPACE From 1e442d70be3ab82b09b7d9fd1feaff31043a5e25 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 21 Jan 2026 17:06:15 +0000 Subject: [PATCH 35/48] move pybind11 numpy and functional includes from generic header Signed-off-by: Kevin Wheatley --- src/bindings/python/PyOpenColorIO.cpp | 3 +++ src/bindings/python/PyOpenColorIO.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bindings/python/PyOpenColorIO.cpp b/src/bindings/python/PyOpenColorIO.cpp index a0c41c336..f85fccc3b 100644 --- a/src/bindings/python/PyOpenColorIO.cpp +++ b/src/bindings/python/PyOpenColorIO.cpp @@ -3,6 +3,9 @@ #include +#include +#include + #include "PyOpenColorIO.h" #include "docstrings.h" diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index 51236afc0..12c27f285 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -5,8 +5,6 @@ #define INCLUDED_OCIO_PYOPENCOLORIO_H #include -#include -#include #include #include From e675ea6f9ae6f4b786cde2f6571ba693f102acd6 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 22 Jan 2026 15:03:35 +0000 Subject: [PATCH 36/48] Add pybind11 includes to python binding .cpp files Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBaker.cpp | 5 +++ .../python/PyBuiltinConfigRegistry.cpp | 5 +++ .../python/PyBuiltinTransformRegistry.cpp | 5 +++ src/bindings/python/PyCPUProcessor.cpp | 5 +++ src/bindings/python/PyColorSpace.cpp | 5 +++ src/bindings/python/PyColorSpaceSet.cpp | 5 +++ src/bindings/python/PyConfig.cpp | 5 +++ src/bindings/python/PyConfigIOProxy.cpp | 6 +++- src/bindings/python/PyContext.cpp | 7 ++++ src/bindings/python/PyDynamicProperty.cpp | 4 +++ src/bindings/python/PyFileRules.cpp | 5 +++ src/bindings/python/PyFormatMetadata.cpp | 4 +++ src/bindings/python/PyGPUProcessor.cpp | 5 +++ src/bindings/python/PyGpuShaderCreator.cpp | 3 ++ src/bindings/python/PyGpuShaderDesc.cpp | 3 ++ src/bindings/python/PyGradingData.cpp | 5 +++ src/bindings/python/PyImageDesc.cpp | 2 ++ src/bindings/python/PyLook.cpp | 5 +++ src/bindings/python/PyNamedTransform.cpp | 4 +++ src/bindings/python/PyOpenColorIO.cpp | 2 ++ src/bindings/python/PyPackedImageDesc.cpp | 2 ++ src/bindings/python/PyPlanarImageDesc.cpp | 2 ++ src/bindings/python/PyProcessor.cpp | 5 +++ src/bindings/python/PyProcessorMetadata.cpp | 4 +++ src/bindings/python/PySystemMonitors.cpp | 4 +++ src/bindings/python/PyTransform.cpp | 2 ++ src/bindings/python/PyTypes.cpp | 5 +++ src/bindings/python/PyUtils.cpp | 5 +++ src/bindings/python/PyUtils.h | 35 ++++++++++--------- src/bindings/python/PyViewTransform.cpp | 4 +++ src/bindings/python/PyViewingRules.cpp | 5 +++ .../python/apphelpers/PyColorSpaceHelpers.cpp | 5 +++ .../apphelpers/PyDisplayViewHelpers.cpp | 5 +++ .../apphelpers/PyLegacyViewingPipeline.cpp | 5 +++ .../python/apphelpers/PyMergeConfigs.cpp | 4 +++ .../python/apphelpers/PyMixingHelpers.cpp | 5 +++ .../transforms/PyAllocationTransform.cpp | 3 ++ .../python/transforms/PyBuiltinTransform.cpp | 2 ++ .../python/transforms/PyCDLTransform.cpp | 2 ++ .../transforms/PyColorSpaceTransform.cpp | 2 ++ .../transforms/PyDisplayViewTransform.cpp | 2 ++ .../python/transforms/PyExponentTransform.cpp | 2 ++ .../PyExponentWithLinearTransform.cpp | 2 ++ .../PyExposureContrastTransform.cpp | 2 ++ .../python/transforms/PyFileTransform.cpp | 2 ++ .../transforms/PyFixedFunctionTransform.cpp | 2 ++ .../transforms/PyGradingHueCurveTransform.cpp | 2 ++ .../transforms/PyGradingPrimaryTransform.cpp | 2 ++ .../transforms/PyGradingRGBCurveTransform.cpp | 2 ++ .../transforms/PyGradingToneTransform.cpp | 2 ++ .../python/transforms/PyGroupTransform.cpp | 3 ++ .../transforms/PyLogAffineTransform.cpp | 2 ++ .../transforms/PyLogCameraTransform.cpp | 2 ++ .../python/transforms/PyLogTransform.cpp | 2 ++ .../python/transforms/PyLookTransform.cpp | 2 ++ .../python/transforms/PyLut1DTransform.cpp | 2 ++ .../python/transforms/PyLut3DTransform.cpp | 2 ++ .../python/transforms/PyMatrixTransform.cpp | 3 ++ .../python/transforms/PyRangeTransform.cpp | 2 ++ 59 files changed, 219 insertions(+), 17 deletions(-) diff --git a/src/bindings/python/PyBaker.cpp b/src/bindings/python/PyBaker.cpp index 27b19cc32..381981137 100644 --- a/src/bindings/python/PyBaker.cpp +++ b/src/bindings/python/PyBaker.cpp @@ -5,10 +5,15 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinConfigRegistry.cpp b/src/bindings/python/PyBuiltinConfigRegistry.cpp index 1b88440b4..69cb44c23 100644 --- a/src/bindings/python/PyBuiltinConfigRegistry.cpp +++ b/src/bindings/python/PyBuiltinConfigRegistry.cpp @@ -3,11 +3,16 @@ #include +#include + +#include + #include "PyBuiltinConfigRegistry.h" #include "PyUtils.h" #include "utils/StringUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp index aa73e6a4c..66ca9507f 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.cpp +++ b/src/bindings/python/PyBuiltinTransformRegistry.cpp @@ -4,11 +4,16 @@ #include #include +#include + +#include + #include "PyBuiltinTransformRegistry.h" #include "PyUtils.h" #include "utils/StringUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyCPUProcessor.cpp b/src/bindings/python/PyCPUProcessor.cpp index abcb05670..d60eedd89 100644 --- a/src/bindings/python/PyCPUProcessor.cpp +++ b/src/bindings/python/PyCPUProcessor.cpp @@ -3,12 +3,17 @@ #include +#include + +#include + #include "PyDynamicProperty.h" #include "PyOpenColorIO.h" #include "PyUtils.h" #include "PyImageDesc.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyColorSpace.cpp b/src/bindings/python/PyColorSpace.cpp index 80d9040c0..34ecaddf8 100644 --- a/src/bindings/python/PyColorSpace.cpp +++ b/src/bindings/python/PyColorSpace.cpp @@ -4,10 +4,15 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyColorSpaceSet.cpp b/src/bindings/python/PyColorSpaceSet.cpp index 783bf03b8..7f5aa74a9 100644 --- a/src/bindings/python/PyColorSpaceSet.cpp +++ b/src/bindings/python/PyColorSpaceSet.cpp @@ -1,10 +1,15 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyConfig.cpp b/src/bindings/python/PyConfig.cpp index b6418e349..d52d297ae 100644 --- a/src/bindings/python/PyConfig.cpp +++ b/src/bindings/python/PyConfig.cpp @@ -7,11 +7,16 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "utils/StringUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyConfigIOProxy.cpp b/src/bindings/python/PyConfigIOProxy.cpp index cb175b52e..374b3223e 100644 --- a/src/bindings/python/PyConfigIOProxy.cpp +++ b/src/bindings/python/PyConfigIOProxy.cpp @@ -5,12 +5,16 @@ #include #include -#include "PyOpenColorIO.h" +#include +#include #include #include #include +#include "PyOpenColorIO.h" + + PYBIND11_MAKE_OPAQUE(std::vector); namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyContext.cpp b/src/bindings/python/PyContext.cpp index 2d5442592..6d14569d4 100644 --- a/src/bindings/python/PyContext.cpp +++ b/src/bindings/python/PyContext.cpp @@ -4,12 +4,19 @@ #include #include #include +#include + +#include + +#include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" #include "utils/StringUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyDynamicProperty.cpp b/src/bindings/python/PyDynamicProperty.cpp index e2d4369ff..b7a68f631 100644 --- a/src/bindings/python/PyDynamicProperty.cpp +++ b/src/bindings/python/PyDynamicProperty.cpp @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyOpenColorIO.h" #include "PyDynamicProperty.h" #include "docstrings.h" diff --git a/src/bindings/python/PyFileRules.cpp b/src/bindings/python/PyFileRules.cpp index 5ef339b43..dd5a58708 100644 --- a/src/bindings/python/PyFileRules.cpp +++ b/src/bindings/python/PyFileRules.cpp @@ -1,10 +1,15 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include "OpenColorIO/OpenColorIO.h" + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyFormatMetadata.cpp b/src/bindings/python/PyFormatMetadata.cpp index 06d885b5d..607f59da4 100644 --- a/src/bindings/python/PyFormatMetadata.cpp +++ b/src/bindings/python/PyFormatMetadata.cpp @@ -4,6 +4,10 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "utils/StringUtils.h" diff --git a/src/bindings/python/PyGPUProcessor.cpp b/src/bindings/python/PyGPUProcessor.cpp index 9f99ca547..b65b2206a 100644 --- a/src/bindings/python/PyGPUProcessor.cpp +++ b/src/bindings/python/PyGPUProcessor.cpp @@ -1,9 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyOpenColorIO.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderCreator.cpp b/src/bindings/python/PyGpuShaderCreator.cpp index 94e5c5ba2..8bbbd3677 100644 --- a/src/bindings/python/PyGpuShaderCreator.cpp +++ b/src/bindings/python/PyGpuShaderCreator.cpp @@ -3,11 +3,14 @@ #include +#include + #include "PyUtils.h" #include "PyDynamicProperty.h" #include "PyGpuShaderCreator.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderDesc.cpp b/src/bindings/python/PyGpuShaderDesc.cpp index a16722231..6adc42003 100644 --- a/src/bindings/python/PyGpuShaderDesc.cpp +++ b/src/bindings/python/PyGpuShaderDesc.cpp @@ -5,11 +5,14 @@ #include +#include + #include "PyOpenColorIO.h" #include "PyGpuShaderCreator.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGradingData.cpp b/src/bindings/python/PyGradingData.cpp index 0f915532b..820fba089 100644 --- a/src/bindings/python/PyGradingData.cpp +++ b/src/bindings/python/PyGradingData.cpp @@ -3,10 +3,15 @@ #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyImageDesc.cpp b/src/bindings/python/PyImageDesc.cpp index cb422b091..b23effb9e 100644 --- a/src/bindings/python/PyImageDesc.cpp +++ b/src/bindings/python/PyImageDesc.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyImageDesc.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyLook.cpp b/src/bindings/python/PyLook.cpp index e086e75da..cd026653a 100644 --- a/src/bindings/python/PyLook.cpp +++ b/src/bindings/python/PyLook.cpp @@ -3,10 +3,15 @@ #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyNamedTransform.cpp b/src/bindings/python/PyNamedTransform.cpp index 73286ba50..1e44fc918 100644 --- a/src/bindings/python/PyNamedTransform.cpp +++ b/src/bindings/python/PyNamedTransform.cpp @@ -4,6 +4,10 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyOpenColorIO.cpp b/src/bindings/python/PyOpenColorIO.cpp index f85fccc3b..7ab61d4fa 100644 --- a/src/bindings/python/PyOpenColorIO.cpp +++ b/src/bindings/python/PyOpenColorIO.cpp @@ -3,6 +3,8 @@ #include +#include + #include #include diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp index 5058ba34c..e38946dee 100644 --- a/src/bindings/python/PyPackedImageDesc.cpp +++ b/src/bindings/python/PyPackedImageDesc.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyImageDesc.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyPlanarImageDesc.cpp b/src/bindings/python/PyPlanarImageDesc.cpp index 46bc05345..c6d7c9e44 100644 --- a/src/bindings/python/PyPlanarImageDesc.cpp +++ b/src/bindings/python/PyPlanarImageDesc.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyImageDesc.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyProcessor.cpp b/src/bindings/python/PyProcessor.cpp index f6360a929..fc191d641 100644 --- a/src/bindings/python/PyProcessor.cpp +++ b/src/bindings/python/PyProcessor.cpp @@ -1,11 +1,16 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyDynamicProperty.h" #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyProcessorMetadata.cpp b/src/bindings/python/PyProcessorMetadata.cpp index 878aed49c..3fb0e0739 100644 --- a/src/bindings/python/PyProcessorMetadata.cpp +++ b/src/bindings/python/PyProcessorMetadata.cpp @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PySystemMonitors.cpp b/src/bindings/python/PySystemMonitors.cpp index 998f3c20f..c76e0cbf3 100644 --- a/src/bindings/python/PySystemMonitors.cpp +++ b/src/bindings/python/PySystemMonitors.cpp @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PySystemMonitors.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyTransform.cpp b/src/bindings/python/PyTransform.cpp index b5b27d72a..a49ac4249 100644 --- a/src/bindings/python/PyTransform.cpp +++ b/src/bindings/python/PyTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyTypes.cpp b/src/bindings/python/PyTypes.cpp index 4894604fa..fb448626b 100644 --- a/src/bindings/python/PyTypes.cpp +++ b/src/bindings/python/PyTypes.cpp @@ -1,6 +1,10 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyOpenColorIO.h" #include "PyImageDesc.h" #include "PySystemMonitors.h" @@ -9,6 +13,7 @@ #include "PyDynamicProperty.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyUtils.cpp b/src/bindings/python/PyUtils.cpp index 82fd2062a..557eb5c97 100644 --- a/src/bindings/python/PyUtils.cpp +++ b/src/bindings/python/PyUtils.cpp @@ -8,8 +8,13 @@ #include #include +#include + +#include + #include "PyUtils.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyUtils.h b/src/bindings/python/PyUtils.h index 09e03c6a2..ea4b61d98 100644 --- a/src/bindings/python/PyUtils.h +++ b/src/bindings/python/PyUtils.h @@ -9,17 +9,20 @@ #include #include -#include "PyOpenColorIO.h" +#include "OpenColorABI.h" +#include #include +#include "PyOpenColorIO.h" + namespace OCIO_NAMESPACE { // Define __repr__ implementation compatible with *most* OCIO classes template -void defRepr(py::class_, EXTRA ...> & cls) +void defRepr(pybind11::class_, EXTRA ...> & cls) { cls.def("__repr__", [](OCIO_SHARED_PTR & self) { @@ -30,7 +33,7 @@ void defRepr(py::class_, EXTRA ...> & cls) } template -void defRepr(py::class_ & cls) +void defRepr(pybind11::class_ & cls) { cls.def("__repr__", [](T & self) { @@ -48,13 +51,13 @@ struct PyIterator int nextIndex(int num) { - if (m_i >= num) { throw py::stop_iteration(); } + if (m_i >= num) { throw pybind11::stop_iteration(); } return m_i++; } void checkIndex(int i, int num) { - if (i >= num) { throw py::index_error("Iterator index out of range"); } + if (i >= num) { throw pybind11::index_error("Iterator index out of range"); } } T m_obj; @@ -65,36 +68,36 @@ struct PyIterator }; // Convert Python buffer protocol format code to NumPy dtype name -std::string formatCodeToDtypeName(const std::string & format, py::ssize_t numBits); +std::string formatCodeToDtypeName(const std::string & format, pybind11::ssize_t numBits); // Convert OCIO BitDepth to NumPy dtype -py::dtype bitDepthToDtype(BitDepth bitDepth); +pybind11::dtype bitDepthToDtype(BitDepth bitDepth); // Convert OCIO BitDepth to data type byte count -py::ssize_t bitDepthToBytes(BitDepth bitDepth); +pybind11::ssize_t bitDepthToBytes(BitDepth bitDepth); // Convert OCIO ChannelOrdering to channel count long chanOrderToNumChannels(ChannelOrdering chanOrder); // Return string that describes Python buffer's N-dimensional array shape -std::string getBufferShapeStr(const py::buffer_info & info); +std::string getBufferShapeStr(const pybind11::buffer_info & info); // Return BitDepth for a supported Python buffer data type -BitDepth getBufferBitDepth(const py::buffer_info & info); +BitDepth getBufferBitDepth(const pybind11::buffer_info & info); // Throw if Python buffer format is incompatible with a NumPy dtype -void checkBufferType(const py::buffer_info & info, const py::dtype & dt); +void checkBufferType(const pybind11::buffer_info & info, const pybind11::dtype & dt); // Throw if Python buffer format is incompatible with an OCIO BitDepth -void checkBufferType(const py::buffer_info & info, BitDepth bitDepth); +void checkBufferType(const pybind11::buffer_info & info, BitDepth bitDepth); // Throw if Python buffer size is not divisible by channel count -void checkBufferDivisible(const py::buffer_info & info, py::ssize_t numChannels); +void checkBufferDivisible(const pybind11::buffer_info & info, pybind11::ssize_t numChannels); // Throw if Python buffer does not have an exact count of entries -void checkBufferSize(const py::buffer_info & info, py::ssize_t numEntries); +void checkBufferSize(const pybind11::buffer_info & info, pybind11::ssize_t numEntries); // Calculate 3D grid size from a packed 3D LUT buffer -unsigned long getBufferLut3DGridSize(const py::buffer_info & info); +unsigned long getBufferLut3DGridSize(const pybind11::buffer_info & info); // Throw if vector size is not divisible by channel count void checkVectorDivisible(const std::vector & pixel, size_t numChannels); // Throw if array is not C-contiguous -void checkCContiguousArray(const py::buffer_info & info); +void checkCContiguousArray(const pybind11::buffer_info & info); } // namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyViewTransform.cpp b/src/bindings/python/PyViewTransform.cpp index ef822325c..55a0b7a38 100644 --- a/src/bindings/python/PyViewTransform.cpp +++ b/src/bindings/python/PyViewTransform.cpp @@ -4,6 +4,10 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyViewingRules.cpp b/src/bindings/python/PyViewingRules.cpp index 31ce91c16..09ad092f2 100644 --- a/src/bindings/python/PyViewingRules.cpp +++ b/src/bindings/python/PyViewingRules.cpp @@ -3,10 +3,15 @@ #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp index 5a32beeed..8f03b9fd6 100644 --- a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp +++ b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp @@ -4,10 +4,15 @@ #include #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp index c6f39c9f4..650a4f22d 100644 --- a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp +++ b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp @@ -3,9 +3,14 @@ #include +#include + +#include + #include "PyOpenColorIO.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp b/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp index 875163b7b..7453c92a4 100644 --- a/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp +++ b/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp @@ -1,10 +1,15 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include "OpenColorIO/OpenColorIO.h" + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyMergeConfigs.cpp b/src/bindings/python/apphelpers/PyMergeConfigs.cpp index c2d9a46e2..96adaf411 100644 --- a/src/bindings/python/apphelpers/PyMergeConfigs.cpp +++ b/src/bindings/python/apphelpers/PyMergeConfigs.cpp @@ -3,6 +3,10 @@ #include +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/apphelpers/PyMixingHelpers.cpp b/src/bindings/python/apphelpers/PyMixingHelpers.cpp index baf9f5b68..6473c9af0 100644 --- a/src/bindings/python/apphelpers/PyMixingHelpers.cpp +++ b/src/bindings/python/apphelpers/PyMixingHelpers.cpp @@ -1,10 +1,15 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include + +#include + #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyAllocationTransform.cpp b/src/bindings/python/transforms/PyAllocationTransform.cpp index 639011c1b..c363a0e4a 100644 --- a/src/bindings/python/transforms/PyAllocationTransform.cpp +++ b/src/bindings/python/transforms/PyAllocationTransform.cpp @@ -5,10 +5,13 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/transforms/PyBuiltinTransform.cpp b/src/bindings/python/transforms/PyBuiltinTransform.cpp index 17cdaddb2..6bc7b6b58 100644 --- a/src/bindings/python/transforms/PyBuiltinTransform.cpp +++ b/src/bindings/python/transforms/PyBuiltinTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyCDLTransform.cpp b/src/bindings/python/transforms/PyCDLTransform.cpp index 34df8ea52..4b64b0011 100644 --- a/src/bindings/python/transforms/PyCDLTransform.cpp +++ b/src/bindings/python/transforms/PyCDLTransform.cpp @@ -6,6 +6,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyColorSpaceTransform.cpp b/src/bindings/python/transforms/PyColorSpaceTransform.cpp index 8684cbec0..b50db1501 100644 --- a/src/bindings/python/transforms/PyColorSpaceTransform.cpp +++ b/src/bindings/python/transforms/PyColorSpaceTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyDisplayViewTransform.cpp b/src/bindings/python/transforms/PyDisplayViewTransform.cpp index 27f9df96c..bb42ee16e 100644 --- a/src/bindings/python/transforms/PyDisplayViewTransform.cpp +++ b/src/bindings/python/transforms/PyDisplayViewTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyExponentTransform.cpp b/src/bindings/python/transforms/PyExponentTransform.cpp index 32236cd60..a956dbe4d 100644 --- a/src/bindings/python/transforms/PyExponentTransform.cpp +++ b/src/bindings/python/transforms/PyExponentTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp index 8fc4724de..68c2ed0dc 100644 --- a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp +++ b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyExposureContrastTransform.cpp b/src/bindings/python/transforms/PyExposureContrastTransform.cpp index 79c936297..01c5716c2 100644 --- a/src/bindings/python/transforms/PyExposureContrastTransform.cpp +++ b/src/bindings/python/transforms/PyExposureContrastTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyFileTransform.cpp b/src/bindings/python/transforms/PyFileTransform.cpp index 8ce3eda35..e26af2e2d 100644 --- a/src/bindings/python/transforms/PyFileTransform.cpp +++ b/src/bindings/python/transforms/PyFileTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp index fea3b7bf6..391489805 100644 --- a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp +++ b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp index c78e07565..d27939c87 100644 --- a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp index f80c466b1..2f0660a3a 100644 --- a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp +++ b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp index 3939fb5f7..fa61fd3ee 100644 --- a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingToneTransform.cpp b/src/bindings/python/transforms/PyGradingToneTransform.cpp index d106291c3..547e60d71 100644 --- a/src/bindings/python/transforms/PyGradingToneTransform.cpp +++ b/src/bindings/python/transforms/PyGradingToneTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGroupTransform.cpp b/src/bindings/python/transforms/PyGroupTransform.cpp index fa592892d..aad47497a 100644 --- a/src/bindings/python/transforms/PyGroupTransform.cpp +++ b/src/bindings/python/transforms/PyGroupTransform.cpp @@ -8,10 +8,13 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/transforms/PyLogAffineTransform.cpp b/src/bindings/python/transforms/PyLogAffineTransform.cpp index 5be5f9c31..5a674078e 100644 --- a/src/bindings/python/transforms/PyLogAffineTransform.cpp +++ b/src/bindings/python/transforms/PyLogAffineTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLogCameraTransform.cpp b/src/bindings/python/transforms/PyLogCameraTransform.cpp index 7a5815122..61f5509a5 100644 --- a/src/bindings/python/transforms/PyLogCameraTransform.cpp +++ b/src/bindings/python/transforms/PyLogCameraTransform.cpp @@ -7,6 +7,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLogTransform.cpp b/src/bindings/python/transforms/PyLogTransform.cpp index 89ad85993..87c0cdc3d 100644 --- a/src/bindings/python/transforms/PyLogTransform.cpp +++ b/src/bindings/python/transforms/PyLogTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLookTransform.cpp b/src/bindings/python/transforms/PyLookTransform.cpp index 3b672045c..49683c9bb 100644 --- a/src/bindings/python/transforms/PyLookTransform.cpp +++ b/src/bindings/python/transforms/PyLookTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLut1DTransform.cpp b/src/bindings/python/transforms/PyLut1DTransform.cpp index e4445b354..6c30cdb33 100644 --- a/src/bindings/python/transforms/PyLut1DTransform.cpp +++ b/src/bindings/python/transforms/PyLut1DTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLut3DTransform.cpp b/src/bindings/python/transforms/PyLut3DTransform.cpp index 7a37a2e7f..e2ec66f78 100644 --- a/src/bindings/python/transforms/PyLut3DTransform.cpp +++ b/src/bindings/python/transforms/PyLut3DTransform.cpp @@ -5,6 +5,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyMatrixTransform.cpp b/src/bindings/python/transforms/PyMatrixTransform.cpp index 046ad1dca..dbb2c361b 100644 --- a/src/bindings/python/transforms/PyMatrixTransform.cpp +++ b/src/bindings/python/transforms/PyMatrixTransform.cpp @@ -5,10 +5,13 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyRangeTransform.cpp b/src/bindings/python/transforms/PyRangeTransform.cpp index 6a5d3aaca..b6be59495 100644 --- a/src/bindings/python/transforms/PyRangeTransform.cpp +++ b/src/bindings/python/transforms/PyRangeTransform.cpp @@ -3,6 +3,8 @@ #include +#include + #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" From 5f39faed47121160cd8a45f2608a392cc783caee Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Thu, 22 Jan 2026 16:22:46 +0000 Subject: [PATCH 37/48] include cstddef to define ptrdiff_t Signed-off-by: Kevin Wheatley --- src/OpenColorIO/ImageDesc.cpp | 1 + src/OpenColorIO/ImagePacking.cpp | 1 + src/OpenColorIO/ImagePacking.h | 2 ++ src/bindings/python/PyImageDesc.h | 2 ++ src/bindings/python/PyPackedImageDesc.cpp | 1 + src/bindings/python/PyPlanarImageDesc.cpp | 1 + src/bindings/python/PyUtils.cpp | 1 + tests/cpu/CPUProcessor_tests.cpp | 2 ++ 8 files changed, 11 insertions(+) diff --git a/src/OpenColorIO/ImageDesc.cpp b/src/OpenColorIO/ImageDesc.cpp index cdfa4ff4f..c20cb526a 100644 --- a/src/OpenColorIO/ImageDesc.cpp +++ b/src/OpenColorIO/ImageDesc.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include diff --git a/src/OpenColorIO/ImagePacking.cpp b/src/OpenColorIO/ImagePacking.cpp index 27eade0c1..25c05e41d 100644 --- a/src/OpenColorIO/ImagePacking.cpp +++ b/src/OpenColorIO/ImagePacking.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include diff --git a/src/OpenColorIO/ImagePacking.h b/src/OpenColorIO/ImagePacking.h index 578bb997e..5e743b07b 100644 --- a/src/OpenColorIO/ImagePacking.h +++ b/src/OpenColorIO/ImagePacking.h @@ -5,6 +5,8 @@ #ifndef INCLUDED_OCIO_IMAGEPACKING_H #define INCLUDED_OCIO_IMAGEPACKING_H +#include + #include #include "Op.h" diff --git a/src/bindings/python/PyImageDesc.h b/src/bindings/python/PyImageDesc.h index 302f68592..8bfe5b7fb 100644 --- a/src/bindings/python/PyImageDesc.h +++ b/src/bindings/python/PyImageDesc.h @@ -4,6 +4,8 @@ #ifndef INCLUDED_OCIO_PYIMAGEDESC_H #define INCLUDED_OCIO_PYIMAGEDESC_H +#include + #include #include diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp index e38946dee..48a9f8fe4 100644 --- a/src/bindings/python/PyPackedImageDesc.cpp +++ b/src/bindings/python/PyPackedImageDesc.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/bindings/python/PyPlanarImageDesc.cpp b/src/bindings/python/PyPlanarImageDesc.cpp index c6d7c9e44..aa15017ef 100644 --- a/src/bindings/python/PyPlanarImageDesc.cpp +++ b/src/bindings/python/PyPlanarImageDesc.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include diff --git a/src/bindings/python/PyUtils.cpp b/src/bindings/python/PyUtils.cpp index 557eb5c97..831d33e75 100644 --- a/src/bindings/python/PyUtils.cpp +++ b/src/bindings/python/PyUtils.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/tests/cpu/CPUProcessor_tests.cpp b/tests/cpu/CPUProcessor_tests.cpp index 77a67599d..0611774df 100644 --- a/tests/cpu/CPUProcessor_tests.cpp +++ b/tests/cpu/CPUProcessor_tests.cpp @@ -6,12 +6,14 @@ #include #include #include +#include #include "CPUProcessor.cpp" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" + namespace OCIO = OCIO_NAMESPACE; From 6cea3283a6e3dec880e247ec3a41de22b15158be Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 23 Jan 2026 12:36:19 +0000 Subject: [PATCH 38/48] Avoid bringing in py:: and pybind11::literals into scope via header inclusion Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBaker.cpp | 4 ++ .../python/PyBuiltinConfigRegistry.cpp | 3 + .../python/PyBuiltinTransformRegistry.cpp | 3 + src/bindings/python/PyCPUProcessor.cpp | 5 ++ src/bindings/python/PyColorSpace.cpp | 4 ++ src/bindings/python/PyColorSpaceSet.cpp | 4 ++ src/bindings/python/PyConfig.cpp | 5 ++ src/bindings/python/PyConfigIOProxy.cpp | 3 + src/bindings/python/PyContext.cpp | 3 + src/bindings/python/PyDynamicProperty.cpp | 4 ++ src/bindings/python/PyFileRules.cpp | 4 ++ src/bindings/python/PyFormatMetadata.cpp | 4 ++ src/bindings/python/PyGPUProcessor.cpp | 4 ++ src/bindings/python/PyGpuShaderCreator.cpp | 4 ++ src/bindings/python/PyGpuShaderDesc.cpp | 4 ++ src/bindings/python/PyGradingData.cpp | 5 ++ src/bindings/python/PyImageDesc.cpp | 3 + src/bindings/python/PyLook.cpp | 4 ++ src/bindings/python/PyNamedTransform.cpp | 6 ++ src/bindings/python/PyOpenColorIO.cpp | 5 ++ src/bindings/python/PyOpenColorIO.h | 62 +++++++++---------- src/bindings/python/PyPackedImageDesc.cpp | 5 ++ src/bindings/python/PyPlanarImageDesc.cpp | 4 ++ src/bindings/python/PyProcessor.cpp | 4 ++ src/bindings/python/PyProcessorMetadata.cpp | 5 ++ src/bindings/python/PySystemMonitors.cpp | 4 ++ src/bindings/python/PyTransform.cpp | 4 ++ src/bindings/python/PyTypes.cpp | 4 ++ src/bindings/python/PyUtils.cpp | 4 ++ src/bindings/python/PyViewTransform.cpp | 5 ++ src/bindings/python/PyViewingRules.cpp | 4 ++ .../python/apphelpers/PyColorSpaceHelpers.cpp | 4 ++ .../apphelpers/PyDisplayViewHelpers.cpp | 4 ++ .../apphelpers/PyLegacyViewingPipeline.cpp | 4 ++ .../python/apphelpers/PyMergeConfigs.cpp | 4 ++ .../python/apphelpers/PyMixingHelpers.cpp | 4 ++ .../transforms/PyAllocationTransform.cpp | 5 ++ .../python/transforms/PyBuiltinTransform.cpp | 4 ++ .../python/transforms/PyCDLTransform.cpp | 4 ++ .../transforms/PyColorSpaceTransform.cpp | 4 ++ .../transforms/PyDisplayViewTransform.cpp | 4 ++ .../python/transforms/PyExponentTransform.cpp | 5 ++ .../PyExponentWithLinearTransform.cpp | 4 ++ .../PyExposureContrastTransform.cpp | 4 ++ .../python/transforms/PyFileTransform.cpp | 4 ++ .../transforms/PyFixedFunctionTransform.cpp | 5 ++ .../transforms/PyGradingHueCurveTransform.cpp | 3 + .../transforms/PyGradingPrimaryTransform.cpp | 4 ++ .../transforms/PyGradingRGBCurveTransform.cpp | 4 ++ .../transforms/PyGradingToneTransform.cpp | 4 ++ .../python/transforms/PyGroupTransform.cpp | 5 ++ .../transforms/PyLogAffineTransform.cpp | 5 ++ .../transforms/PyLogCameraTransform.cpp | 5 ++ .../python/transforms/PyLogTransform.cpp | 4 ++ .../python/transforms/PyLookTransform.cpp | 4 ++ .../python/transforms/PyLut1DTransform.cpp | 5 ++ .../python/transforms/PyLut3DTransform.cpp | 5 ++ .../python/transforms/PyMatrixTransform.cpp | 5 ++ .../python/transforms/PyRangeTransform.cpp | 4 ++ 59 files changed, 274 insertions(+), 32 deletions(-) diff --git a/src/bindings/python/PyBaker.cpp b/src/bindings/python/PyBaker.cpp index 381981137..30761f678 100644 --- a/src/bindings/python/PyBaker.cpp +++ b/src/bindings/python/PyBaker.cpp @@ -14,6 +14,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinConfigRegistry.cpp b/src/bindings/python/PyBuiltinConfigRegistry.cpp index 69cb44c23..c999f540b 100644 --- a/src/bindings/python/PyBuiltinConfigRegistry.cpp +++ b/src/bindings/python/PyBuiltinConfigRegistry.cpp @@ -13,6 +13,9 @@ #include "docstrings.h" +namespace py = pybind11; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp index 66ca9507f..90da8080d 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.cpp +++ b/src/bindings/python/PyBuiltinTransformRegistry.cpp @@ -14,6 +14,9 @@ #include "docstrings.h" +namespace py = pybind11; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyCPUProcessor.cpp b/src/bindings/python/PyCPUProcessor.cpp index d60eedd89..66e25f863 100644 --- a/src/bindings/python/PyCPUProcessor.cpp +++ b/src/bindings/python/PyCPUProcessor.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "PyDynamicProperty.h" #include "PyOpenColorIO.h" @@ -14,6 +15,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyColorSpace.cpp b/src/bindings/python/PyColorSpace.cpp index 34ecaddf8..0774465e9 100644 --- a/src/bindings/python/PyColorSpace.cpp +++ b/src/bindings/python/PyColorSpace.cpp @@ -13,6 +13,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyColorSpaceSet.cpp b/src/bindings/python/PyColorSpaceSet.cpp index 7f5aa74a9..e44a3f434 100644 --- a/src/bindings/python/PyColorSpaceSet.cpp +++ b/src/bindings/python/PyColorSpaceSet.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyConfig.cpp b/src/bindings/python/PyConfig.cpp index d52d297ae..41884ffb3 100644 --- a/src/bindings/python/PyConfig.cpp +++ b/src/bindings/python/PyConfig.cpp @@ -10,6 +10,7 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" @@ -17,6 +18,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyConfigIOProxy.cpp b/src/bindings/python/PyConfigIOProxy.cpp index 374b3223e..a73f1738c 100644 --- a/src/bindings/python/PyConfigIOProxy.cpp +++ b/src/bindings/python/PyConfigIOProxy.cpp @@ -15,6 +15,9 @@ #include "PyOpenColorIO.h" +namespace py = pybind11; + + PYBIND11_MAKE_OPAQUE(std::vector); namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyContext.cpp b/src/bindings/python/PyContext.cpp index 6d14569d4..ca4a37cb0 100644 --- a/src/bindings/python/PyContext.cpp +++ b/src/bindings/python/PyContext.cpp @@ -17,6 +17,9 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyDynamicProperty.cpp b/src/bindings/python/PyDynamicProperty.cpp index b7a68f631..48c22f75f 100644 --- a/src/bindings/python/PyDynamicProperty.cpp +++ b/src/bindings/python/PyDynamicProperty.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyFileRules.cpp b/src/bindings/python/PyFileRules.cpp index dd5a58708..613c5c004 100644 --- a/src/bindings/python/PyFileRules.cpp +++ b/src/bindings/python/PyFileRules.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyFormatMetadata.cpp b/src/bindings/python/PyFormatMetadata.cpp index 607f59da4..185a40993 100644 --- a/src/bindings/python/PyFormatMetadata.cpp +++ b/src/bindings/python/PyFormatMetadata.cpp @@ -14,6 +14,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGPUProcessor.cpp b/src/bindings/python/PyGPUProcessor.cpp index b65b2206a..1d31ab561 100644 --- a/src/bindings/python/PyGPUProcessor.cpp +++ b/src/bindings/python/PyGPUProcessor.cpp @@ -9,6 +9,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderCreator.cpp b/src/bindings/python/PyGpuShaderCreator.cpp index 8bbbd3677..aad09b122 100644 --- a/src/bindings/python/PyGpuShaderCreator.cpp +++ b/src/bindings/python/PyGpuShaderCreator.cpp @@ -11,6 +11,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGpuShaderDesc.cpp b/src/bindings/python/PyGpuShaderDesc.cpp index 6adc42003..538d716e5 100644 --- a/src/bindings/python/PyGpuShaderDesc.cpp +++ b/src/bindings/python/PyGpuShaderDesc.cpp @@ -13,6 +13,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyGradingData.cpp b/src/bindings/python/PyGradingData.cpp index 820fba089..c984c0369 100644 --- a/src/bindings/python/PyGradingData.cpp +++ b/src/bindings/python/PyGradingData.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyImageDesc.cpp b/src/bindings/python/PyImageDesc.cpp index b23effb9e..5da897fcf 100644 --- a/src/bindings/python/PyImageDesc.cpp +++ b/src/bindings/python/PyImageDesc.cpp @@ -12,6 +12,9 @@ #include "docstrings.h" +namespace py = pybind11; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyLook.cpp b/src/bindings/python/PyLook.cpp index cd026653a..07416afa8 100644 --- a/src/bindings/python/PyLook.cpp +++ b/src/bindings/python/PyLook.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyNamedTransform.cpp b/src/bindings/python/PyNamedTransform.cpp index 1e44fc918..d961f7b65 100644 --- a/src/bindings/python/PyNamedTransform.cpp +++ b/src/bindings/python/PyNamedTransform.cpp @@ -7,11 +7,17 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" + +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyOpenColorIO.cpp b/src/bindings/python/PyOpenColorIO.cpp index 7ab61d4fa..1f1b50cba 100644 --- a/src/bindings/python/PyOpenColorIO.cpp +++ b/src/bindings/python/PyOpenColorIO.cpp @@ -11,6 +11,11 @@ #include "PyOpenColorIO.h" #include "docstrings.h" + +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index 12c27f285..c9a121610 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -10,49 +10,47 @@ #include -namespace py = pybind11; -using namespace pybind11::literals; namespace OCIO_NAMESPACE { // OpenColorIOTypes -void bindPyTypes(py::module & m); +void bindPyTypes(pybind11::module & m); // OpenColorIO -void bindPyBaker(py::module & m); -void bindPyBuiltinConfigRegistry(py::module & m); -void bindPyColorSpace(py::module & m); -void bindPyColorSpaceSet(py::module & m); -void bindPyConfig(py::module & m); -void bindPyContext(py::module & m); -void bindPyConfigIOProxy(py::module & m); -void bindPyCPUProcessor(py::module & m); -void bindPyFileRules(py::module & m); -void bindPyGPUProcessor(py::module & m); -void bindPyGpuShaderCreator(py::module & m); -void bindPyImageDesc(py::module & m); -void bindPyLook(py::module & m); -void bindPyNamedTransform(py::module & m); -void bindPyProcessor(py::module & m); -void bindPyProcessorMetadata(py::module & m); -void bindPySystemMonitors(py::module & m); -void bindPyViewingRules(py::module & m); -void bindPyViewTransform(py::module & m); +void bindPyBaker(pybind11::module & m); +void bindPyBuiltinConfigRegistry(pybind11::module & m); +void bindPyColorSpace(pybind11::module & m); +void bindPyColorSpaceSet(pybind11::module & m); +void bindPyConfig(pybind11::module & m); +void bindPyContext(pybind11::module & m); +void bindPyConfigIOProxy(pybind11::module & m); +void bindPyCPUProcessor(pybind11::module & m); +void bindPyFileRules(pybind11::module & m); +void bindPyGPUProcessor(pybind11::module & m); +void bindPyGpuShaderCreator(pybind11::module & m); +void bindPyImageDesc(pybind11::module & m); +void bindPyLook(pybind11::module & m); +void bindPyNamedTransform(pybind11::module & m); +void bindPyProcessor(pybind11::module & m); +void bindPyProcessorMetadata(pybind11::module & m); +void bindPySystemMonitors(pybind11::module & m); +void bindPyViewingRules(pybind11::module & m); +void bindPyViewTransform(pybind11::module & m); // OpenColorIOTransforms -void bindPyBuiltinTransformRegistry(py::module & m); -void bindPyDynamicProperty(py::module & m); -void bindPyFormatMetadata(py::module & m); -void bindPyGradingData(py::module & m); -void bindPyTransform(py::module & m); +void bindPyBuiltinTransformRegistry(pybind11::module & m); +void bindPyDynamicProperty(pybind11::module & m); +void bindPyFormatMetadata(pybind11::module & m); +void bindPyGradingData(pybind11::module & m); +void bindPyTransform(pybind11::module & m); // OpenColorIOAppHelpers -void bindPyColorSpaceMenuHelpers(py::module & m); -void bindPyConfigMergingHelpers(py::module & m); -void bindPyDisplayViewHelpers(py::module & m); -void bindPyLegacyViewingPipeline(py::module & m); -void bindPyMixingHelpers(py::module & m); +void bindPyColorSpaceMenuHelpers(pybind11::module & m); +void bindPyConfigMergingHelpers(pybind11::module & m); +void bindPyDisplayViewHelpers(pybind11::module & m); +void bindPyLegacyViewingPipeline(pybind11::module & m); +void bindPyMixingHelpers(pybind11::module & m); } // namespace OCIO_NAMESPACE diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp index 48a9f8fe4..b529ee253 100644 --- a/src/bindings/python/PyPackedImageDesc.cpp +++ b/src/bindings/python/PyPackedImageDesc.cpp @@ -7,12 +7,17 @@ #include #include +#include #include "PyImageDesc.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyPlanarImageDesc.cpp b/src/bindings/python/PyPlanarImageDesc.cpp index aa15017ef..e5de5e11a 100644 --- a/src/bindings/python/PyPlanarImageDesc.cpp +++ b/src/bindings/python/PyPlanarImageDesc.cpp @@ -13,6 +13,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyProcessor.cpp b/src/bindings/python/PyProcessor.cpp index fc191d641..cbbe085fc 100644 --- a/src/bindings/python/PyProcessor.cpp +++ b/src/bindings/python/PyProcessor.cpp @@ -11,6 +11,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyProcessorMetadata.cpp b/src/bindings/python/PyProcessorMetadata.cpp index 3fb0e0739..0558afdab 100644 --- a/src/bindings/python/PyProcessorMetadata.cpp +++ b/src/bindings/python/PyProcessorMetadata.cpp @@ -9,6 +9,11 @@ #include "PyUtils.h" #include "docstrings.h" + +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PySystemMonitors.cpp b/src/bindings/python/PySystemMonitors.cpp index c76e0cbf3..274624794 100644 --- a/src/bindings/python/PySystemMonitors.cpp +++ b/src/bindings/python/PySystemMonitors.cpp @@ -9,6 +9,10 @@ #include "PyUtils.h" #include "docstrings.h" + +namespace py = pybind11; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyTransform.cpp b/src/bindings/python/PyTransform.cpp index a49ac4249..23c02f07a 100644 --- a/src/bindings/python/PyTransform.cpp +++ b/src/bindings/python/PyTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyTypes.cpp b/src/bindings/python/PyTypes.cpp index fb448626b..6d2fbc6b3 100644 --- a/src/bindings/python/PyTypes.cpp +++ b/src/bindings/python/PyTypes.cpp @@ -14,6 +14,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyUtils.cpp b/src/bindings/python/PyUtils.cpp index 831d33e75..acde619ac 100644 --- a/src/bindings/python/PyUtils.cpp +++ b/src/bindings/python/PyUtils.cpp @@ -12,10 +12,14 @@ #include #include +#include #include "PyUtils.h" +namespace py = pybind11; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/PyViewTransform.cpp b/src/bindings/python/PyViewTransform.cpp index 55a0b7a38..aa11779bb 100644 --- a/src/bindings/python/PyViewTransform.cpp +++ b/src/bindings/python/PyViewTransform.cpp @@ -7,12 +7,17 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/PyViewingRules.cpp b/src/bindings/python/PyViewingRules.cpp index 09ad092f2..55aead271 100644 --- a/src/bindings/python/PyViewingRules.cpp +++ b/src/bindings/python/PyViewingRules.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp index 8f03b9fd6..81dcda316 100644 --- a/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp +++ b/src/bindings/python/apphelpers/PyColorSpaceHelpers.cpp @@ -13,6 +13,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp index 650a4f22d..bd87b7fb8 100644 --- a/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp +++ b/src/bindings/python/apphelpers/PyDisplayViewHelpers.cpp @@ -11,6 +11,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp b/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp index 7453c92a4..44b3c1325 100644 --- a/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp +++ b/src/bindings/python/apphelpers/PyLegacyViewingPipeline.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyMergeConfigs.cpp b/src/bindings/python/apphelpers/PyMergeConfigs.cpp index 96adaf411..364938eb0 100644 --- a/src/bindings/python/apphelpers/PyMergeConfigs.cpp +++ b/src/bindings/python/apphelpers/PyMergeConfigs.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/apphelpers/PyMixingHelpers.cpp b/src/bindings/python/apphelpers/PyMixingHelpers.cpp index 6473c9af0..3ccb82448 100644 --- a/src/bindings/python/apphelpers/PyMixingHelpers.cpp +++ b/src/bindings/python/apphelpers/PyMixingHelpers.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyAllocationTransform.cpp b/src/bindings/python/transforms/PyAllocationTransform.cpp index c363a0e4a..530fa1cf3 100644 --- a/src/bindings/python/transforms/PyAllocationTransform.cpp +++ b/src/bindings/python/transforms/PyAllocationTransform.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/transforms/PyBuiltinTransform.cpp b/src/bindings/python/transforms/PyBuiltinTransform.cpp index 6bc7b6b58..6759e78ce 100644 --- a/src/bindings/python/transforms/PyBuiltinTransform.cpp +++ b/src/bindings/python/transforms/PyBuiltinTransform.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyCDLTransform.cpp b/src/bindings/python/transforms/PyCDLTransform.cpp index 4b64b0011..f4b3252d1 100644 --- a/src/bindings/python/transforms/PyCDLTransform.cpp +++ b/src/bindings/python/transforms/PyCDLTransform.cpp @@ -13,6 +13,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyColorSpaceTransform.cpp b/src/bindings/python/transforms/PyColorSpaceTransform.cpp index b50db1501..39a0e59a2 100644 --- a/src/bindings/python/transforms/PyColorSpaceTransform.cpp +++ b/src/bindings/python/transforms/PyColorSpaceTransform.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyDisplayViewTransform.cpp b/src/bindings/python/transforms/PyDisplayViewTransform.cpp index bb42ee16e..ffb694d8b 100644 --- a/src/bindings/python/transforms/PyDisplayViewTransform.cpp +++ b/src/bindings/python/transforms/PyDisplayViewTransform.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExponentTransform.cpp b/src/bindings/python/transforms/PyExponentTransform.cpp index a956dbe4d..8893c040b 100644 --- a/src/bindings/python/transforms/PyExponentTransform.cpp +++ b/src/bindings/python/transforms/PyExponentTransform.cpp @@ -6,11 +6,16 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp index 68c2ed0dc..8effb5aad 100644 --- a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp +++ b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyExposureContrastTransform.cpp b/src/bindings/python/transforms/PyExposureContrastTransform.cpp index 01c5716c2..48ec750d9 100644 --- a/src/bindings/python/transforms/PyExposureContrastTransform.cpp +++ b/src/bindings/python/transforms/PyExposureContrastTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyFileTransform.cpp b/src/bindings/python/transforms/PyFileTransform.cpp index e26af2e2d..6ba5fbf38 100644 --- a/src/bindings/python/transforms/PyFileTransform.cpp +++ b/src/bindings/python/transforms/PyFileTransform.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp index 391489805..18089826c 100644 --- a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp +++ b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp index d27939c87..f60ac10e0 100644 --- a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp @@ -10,6 +10,9 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp index 2f0660a3a..4234eeaaf 100644 --- a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp +++ b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp index fa61fd3ee..7cde94c4b 100644 --- a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGradingToneTransform.cpp b/src/bindings/python/transforms/PyGradingToneTransform.cpp index 547e60d71..4f04ce0b7 100644 --- a/src/bindings/python/transforms/PyGradingToneTransform.cpp +++ b/src/bindings/python/transforms/PyGradingToneTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyGroupTransform.cpp b/src/bindings/python/transforms/PyGroupTransform.cpp index aad47497a..883a88ac8 100644 --- a/src/bindings/python/transforms/PyGroupTransform.cpp +++ b/src/bindings/python/transforms/PyGroupTransform.cpp @@ -9,12 +9,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { namespace diff --git a/src/bindings/python/transforms/PyLogAffineTransform.cpp b/src/bindings/python/transforms/PyLogAffineTransform.cpp index 5a674078e..86646395a 100644 --- a/src/bindings/python/transforms/PyLogAffineTransform.cpp +++ b/src/bindings/python/transforms/PyLogAffineTransform.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLogCameraTransform.cpp b/src/bindings/python/transforms/PyLogCameraTransform.cpp index 61f5509a5..1c1c1addf 100644 --- a/src/bindings/python/transforms/PyLogCameraTransform.cpp +++ b/src/bindings/python/transforms/PyLogCameraTransform.cpp @@ -8,12 +8,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLogTransform.cpp b/src/bindings/python/transforms/PyLogTransform.cpp index 87c0cdc3d..9044806fb 100644 --- a/src/bindings/python/transforms/PyLogTransform.cpp +++ b/src/bindings/python/transforms/PyLogTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLookTransform.cpp b/src/bindings/python/transforms/PyLookTransform.cpp index 49683c9bb..7d0f574bf 100644 --- a/src/bindings/python/transforms/PyLookTransform.cpp +++ b/src/bindings/python/transforms/PyLookTransform.cpp @@ -12,6 +12,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLut1DTransform.cpp b/src/bindings/python/transforms/PyLut1DTransform.cpp index 6c30cdb33..f8ce8da3b 100644 --- a/src/bindings/python/transforms/PyLut1DTransform.cpp +++ b/src/bindings/python/transforms/PyLut1DTransform.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyLut3DTransform.cpp b/src/bindings/python/transforms/PyLut3DTransform.cpp index e2ec66f78..fa5fbc48e 100644 --- a/src/bindings/python/transforms/PyLut3DTransform.cpp +++ b/src/bindings/python/transforms/PyLut3DTransform.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyMatrixTransform.cpp b/src/bindings/python/transforms/PyMatrixTransform.cpp index dbb2c361b..025533e96 100644 --- a/src/bindings/python/transforms/PyMatrixTransform.cpp +++ b/src/bindings/python/transforms/PyMatrixTransform.cpp @@ -6,12 +6,17 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { diff --git a/src/bindings/python/transforms/PyRangeTransform.cpp b/src/bindings/python/transforms/PyRangeTransform.cpp index b6be59495..8e646ab4c 100644 --- a/src/bindings/python/transforms/PyRangeTransform.cpp +++ b/src/bindings/python/transforms/PyRangeTransform.cpp @@ -10,6 +10,10 @@ #include "docstrings.h" +namespace py = pybind11; +using namespace pybind11::literals; + + namespace OCIO_NAMESPACE { From c1fed4b7827fdac5064f25ad63174a31cb198ae0 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 23 Jan 2026 13:06:24 +0000 Subject: [PATCH 39/48] Remove namespace alias Signed-off-by: Kevin Wheatley --- src/bindings/python/PyOpenColorIO.h | 120 ++++++++++++++-------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index c9a121610..756217b39 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -4,6 +4,8 @@ #ifndef INCLUDED_OCIO_PYOPENCOLORIO_H #define INCLUDED_OCIO_PYOPENCOLORIO_H +#include + #include #include #include @@ -58,24 +60,22 @@ void bindPyMixingHelpers(pybind11::module & m); // is needed to return Transform subclass types from the OCIO API. See: // https://pybind11.readthedocs.io/en/stable/advanced/classes.html#custom-automatic-downcasters -namespace OCIO = OCIO_NAMESPACE; - namespace PYBIND11_NAMESPACE { template<> -struct polymorphic_type_hook { - static const void *get(const OCIO::ImageDesc *const src, const std::type_info*& type) { +struct polymorphic_type_hook { + static const void *get(const OCIO_NAMESPACE::ImageDesc *const src, const std::type_info*& type) { // Note: src may be nullptr if (src) { - if(dynamic_cast(src)) + if(dynamic_cast(src)) { - type = &typeid(OCIO::PackedImageDesc); + type = &typeid(OCIO_NAMESPACE::PackedImageDesc); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::PlanarImageDesc); + type = &typeid(OCIO_NAMESPACE::PlanarImageDesc); } } return src; @@ -83,14 +83,14 @@ struct polymorphic_type_hook { }; template<> -struct polymorphic_type_hook { - static const void *get(const OCIO::GpuShaderCreator *const src, const std::type_info*& type) { +struct polymorphic_type_hook { + static const void *get(const OCIO_NAMESPACE::GpuShaderCreator *const src, const std::type_info*& type) { // Note: src may be nullptr if (src) { - if(dynamic_cast(src)) + if(dynamic_cast(src)) { - type = &typeid(OCIO::GpuShaderDesc); + type = &typeid(OCIO_NAMESPACE::GpuShaderDesc); } } return src; @@ -98,102 +98,102 @@ struct polymorphic_type_hook { }; template<> -struct polymorphic_type_hook { - static const void *get(const OCIO::Transform *const src, const std::type_info*& type) { +struct polymorphic_type_hook { + static const void *get(const OCIO_NAMESPACE::Transform *const src, const std::type_info*& type) { // Note: src may be nullptr if (src) { - if(dynamic_cast(src)) + if(dynamic_cast(src)) { - type = &typeid(OCIO::AllocationTransform); + type = &typeid(OCIO_NAMESPACE::AllocationTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::BuiltinTransform); + type = &typeid(OCIO_NAMESPACE::BuiltinTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::CDLTransform); + type = &typeid(OCIO_NAMESPACE::CDLTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::ColorSpaceTransform); + type = &typeid(OCIO_NAMESPACE::ColorSpaceTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::DisplayViewTransform); + type = &typeid(OCIO_NAMESPACE::DisplayViewTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::ExponentTransform); + type = &typeid(OCIO_NAMESPACE::ExponentTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::ExponentWithLinearTransform); + type = &typeid(OCIO_NAMESPACE::ExponentWithLinearTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::ExposureContrastTransform); + type = &typeid(OCIO_NAMESPACE::ExposureContrastTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::FileTransform); + type = &typeid(OCIO_NAMESPACE::FileTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::FixedFunctionTransform); + type = &typeid(OCIO_NAMESPACE::FixedFunctionTransform); } - else if (dynamic_cast(src)) + else if (dynamic_cast(src)) { - type = &typeid(OCIO::GradingPrimaryTransform); + type = &typeid(OCIO_NAMESPACE::GradingPrimaryTransform); } - else if (dynamic_cast(src)) + else if (dynamic_cast(src)) { - type = &typeid(OCIO::GradingRGBCurveTransform); + type = &typeid(OCIO_NAMESPACE::GradingRGBCurveTransform); } - else if (dynamic_cast(src)) + else if (dynamic_cast(src)) { - type = &typeid(OCIO::GradingHueCurveTransform); + type = &typeid(OCIO_NAMESPACE::GradingHueCurveTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::GradingToneTransform); + type = &typeid(OCIO_NAMESPACE::GradingToneTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::GroupTransform); + type = &typeid(OCIO_NAMESPACE::GroupTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::LogAffineTransform); + type = &typeid(OCIO_NAMESPACE::LogAffineTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::LogCameraTransform); + type = &typeid(OCIO_NAMESPACE::LogCameraTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::LogTransform); + type = &typeid(OCIO_NAMESPACE::LogTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::LookTransform); + type = &typeid(OCIO_NAMESPACE::LookTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::Lut1DTransform); + type = &typeid(OCIO_NAMESPACE::Lut1DTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::Lut3DTransform); + type = &typeid(OCIO_NAMESPACE::Lut3DTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::MatrixTransform); + type = &typeid(OCIO_NAMESPACE::MatrixTransform); } - else if(dynamic_cast(src)) + else if(dynamic_cast(src)) { - type = &typeid(OCIO::RangeTransform); + type = &typeid(OCIO_NAMESPACE::RangeTransform); } } return src; From 20a80c4471918378dcb5c3ce994c24aa3baa6ade Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 23 Jan 2026 14:37:09 +0000 Subject: [PATCH 40/48] Add missing pybind11/stl.h includes Signed-off-by: Kevin Wheatley --- src/bindings/python/PyColorSpace.cpp | 1 + src/bindings/python/PyLook.cpp | 1 + src/bindings/python/transforms/PyCDLTransform.cpp | 1 + src/bindings/python/transforms/PyExponentWithLinearTransform.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/src/bindings/python/PyColorSpace.cpp b/src/bindings/python/PyColorSpace.cpp index 0774465e9..e0e20d3fe 100644 --- a/src/bindings/python/PyColorSpace.cpp +++ b/src/bindings/python/PyColorSpace.cpp @@ -7,6 +7,7 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/PyLook.cpp b/src/bindings/python/PyLook.cpp index 07416afa8..066b08c7e 100644 --- a/src/bindings/python/PyLook.cpp +++ b/src/bindings/python/PyLook.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyUtils.h" diff --git a/src/bindings/python/transforms/PyCDLTransform.cpp b/src/bindings/python/transforms/PyCDLTransform.cpp index f4b3252d1..aef246a16 100644 --- a/src/bindings/python/transforms/PyCDLTransform.cpp +++ b/src/bindings/python/transforms/PyCDLTransform.cpp @@ -7,6 +7,7 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" diff --git a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp index 8effb5aad..96938205f 100644 --- a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp +++ b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "PyTransform.h" #include "PyUtils.h" From 3937fe0564e45a76325752dda637681340239f54 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 23 Jan 2026 16:11:13 +0000 Subject: [PATCH 41/48] Remove pybind11/stl.h from generic header Signed-off-by: Kevin Wheatley --- src/bindings/python/PyOpenColorIO.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bindings/python/PyOpenColorIO.h b/src/bindings/python/PyOpenColorIO.h index 756217b39..d672e9ba4 100644 --- a/src/bindings/python/PyOpenColorIO.h +++ b/src/bindings/python/PyOpenColorIO.h @@ -8,7 +8,6 @@ #include #include -#include #include From 9d03b2e61c9d1a092d2ffea35f9f230b92fad952 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 23 Jan 2026 16:20:46 +0000 Subject: [PATCH 42/48] Directly include "PyOpenColorIO.h" for polymorphic_type_hook Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBuiltinTransformRegistry.cpp | 1 + src/bindings/python/PyGpuShaderCreator.cpp | 1 + src/bindings/python/PyImageDesc.cpp | 1 + src/bindings/python/PyTransform.cpp | 1 + src/bindings/python/transforms/PyAllocationTransform.cpp | 1 + src/bindings/python/transforms/PyBuiltinTransform.cpp | 1 + src/bindings/python/transforms/PyCDLTransform.cpp | 1 + src/bindings/python/transforms/PyColorSpaceTransform.cpp | 1 + src/bindings/python/transforms/PyDisplayViewTransform.cpp | 1 + src/bindings/python/transforms/PyExponentTransform.cpp | 1 + src/bindings/python/transforms/PyExponentWithLinearTransform.cpp | 1 + src/bindings/python/transforms/PyExposureContrastTransform.cpp | 1 + src/bindings/python/transforms/PyFileTransform.cpp | 1 + src/bindings/python/transforms/PyFixedFunctionTransform.cpp | 1 + src/bindings/python/transforms/PyGradingHueCurveTransform.cpp | 1 + src/bindings/python/transforms/PyGradingPrimaryTransform.cpp | 1 + src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp | 1 + src/bindings/python/transforms/PyGradingToneTransform.cpp | 1 + src/bindings/python/transforms/PyGroupTransform.cpp | 1 + src/bindings/python/transforms/PyLogAffineTransform.cpp | 1 + src/bindings/python/transforms/PyLogCameraTransform.cpp | 1 + src/bindings/python/transforms/PyLogTransform.cpp | 1 + src/bindings/python/transforms/PyLookTransform.cpp | 1 + src/bindings/python/transforms/PyMatrixTransform.cpp | 1 + src/bindings/python/transforms/PyRangeTransform.cpp | 1 + 25 files changed, 25 insertions(+) diff --git a/src/bindings/python/PyBuiltinTransformRegistry.cpp b/src/bindings/python/PyBuiltinTransformRegistry.cpp index 90da8080d..e1f3c92c7 100644 --- a/src/bindings/python/PyBuiltinTransformRegistry.cpp +++ b/src/bindings/python/PyBuiltinTransformRegistry.cpp @@ -8,6 +8,7 @@ #include +#include "PyOpenColorIO.h" #include "PyBuiltinTransformRegistry.h" #include "PyUtils.h" #include "utils/StringUtils.h" diff --git a/src/bindings/python/PyGpuShaderCreator.cpp b/src/bindings/python/PyGpuShaderCreator.cpp index aad09b122..4941bba68 100644 --- a/src/bindings/python/PyGpuShaderCreator.cpp +++ b/src/bindings/python/PyGpuShaderCreator.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyUtils.h" #include "PyDynamicProperty.h" #include "PyGpuShaderCreator.h" diff --git a/src/bindings/python/PyImageDesc.cpp b/src/bindings/python/PyImageDesc.cpp index 5da897fcf..e01c4550d 100644 --- a/src/bindings/python/PyImageDesc.cpp +++ b/src/bindings/python/PyImageDesc.cpp @@ -7,6 +7,7 @@ #include +#include "PyOpenColorIO.h" #include "PyImageDesc.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyTransform.cpp b/src/bindings/python/PyTransform.cpp index 23c02f07a..ea022daf7 100644 --- a/src/bindings/python/PyTransform.cpp +++ b/src/bindings/python/PyTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyAllocationTransform.cpp b/src/bindings/python/transforms/PyAllocationTransform.cpp index 530fa1cf3..38dc5da6d 100644 --- a/src/bindings/python/transforms/PyAllocationTransform.cpp +++ b/src/bindings/python/transforms/PyAllocationTransform.cpp @@ -8,6 +8,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyBuiltinTransform.cpp b/src/bindings/python/transforms/PyBuiltinTransform.cpp index 6759e78ce..9a24abfbd 100644 --- a/src/bindings/python/transforms/PyBuiltinTransform.cpp +++ b/src/bindings/python/transforms/PyBuiltinTransform.cpp @@ -7,6 +7,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyCDLTransform.cpp b/src/bindings/python/transforms/PyCDLTransform.cpp index aef246a16..0be2c3a4e 100644 --- a/src/bindings/python/transforms/PyCDLTransform.cpp +++ b/src/bindings/python/transforms/PyCDLTransform.cpp @@ -9,6 +9,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyColorSpaceTransform.cpp b/src/bindings/python/transforms/PyColorSpaceTransform.cpp index 39a0e59a2..e032d5bcd 100644 --- a/src/bindings/python/transforms/PyColorSpaceTransform.cpp +++ b/src/bindings/python/transforms/PyColorSpaceTransform.cpp @@ -7,6 +7,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyDisplayViewTransform.cpp b/src/bindings/python/transforms/PyDisplayViewTransform.cpp index ffb694d8b..161cb054a 100644 --- a/src/bindings/python/transforms/PyDisplayViewTransform.cpp +++ b/src/bindings/python/transforms/PyDisplayViewTransform.cpp @@ -7,6 +7,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyExponentTransform.cpp b/src/bindings/python/transforms/PyExponentTransform.cpp index 8893c040b..5d5c6da92 100644 --- a/src/bindings/python/transforms/PyExponentTransform.cpp +++ b/src/bindings/python/transforms/PyExponentTransform.cpp @@ -8,6 +8,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp index 96938205f..2f59a437d 100644 --- a/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp +++ b/src/bindings/python/transforms/PyExponentWithLinearTransform.cpp @@ -8,6 +8,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyExposureContrastTransform.cpp b/src/bindings/python/transforms/PyExposureContrastTransform.cpp index 48ec750d9..f222a59da 100644 --- a/src/bindings/python/transforms/PyExposureContrastTransform.cpp +++ b/src/bindings/python/transforms/PyExposureContrastTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyFileTransform.cpp b/src/bindings/python/transforms/PyFileTransform.cpp index 6ba5fbf38..7c9432e2f 100644 --- a/src/bindings/python/transforms/PyFileTransform.cpp +++ b/src/bindings/python/transforms/PyFileTransform.cpp @@ -7,6 +7,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp index 18089826c..be65d2587 100644 --- a/src/bindings/python/transforms/PyFixedFunctionTransform.cpp +++ b/src/bindings/python/transforms/PyFixedFunctionTransform.cpp @@ -8,6 +8,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp index f60ac10e0..14962850d 100644 --- a/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingHueCurveTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp index 4234eeaaf..d92323b85 100644 --- a/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp +++ b/src/bindings/python/transforms/PyGradingPrimaryTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp index 7cde94c4b..c97962404 100644 --- a/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp +++ b/src/bindings/python/transforms/PyGradingRGBCurveTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGradingToneTransform.cpp b/src/bindings/python/transforms/PyGradingToneTransform.cpp index 4f04ce0b7..b166947c6 100644 --- a/src/bindings/python/transforms/PyGradingToneTransform.cpp +++ b/src/bindings/python/transforms/PyGradingToneTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyGroupTransform.cpp b/src/bindings/python/transforms/PyGroupTransform.cpp index 883a88ac8..f6562f7d9 100644 --- a/src/bindings/python/transforms/PyGroupTransform.cpp +++ b/src/bindings/python/transforms/PyGroupTransform.cpp @@ -11,6 +11,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLogAffineTransform.cpp b/src/bindings/python/transforms/PyLogAffineTransform.cpp index 86646395a..b6afe2b25 100644 --- a/src/bindings/python/transforms/PyLogAffineTransform.cpp +++ b/src/bindings/python/transforms/PyLogAffineTransform.cpp @@ -8,6 +8,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLogCameraTransform.cpp b/src/bindings/python/transforms/PyLogCameraTransform.cpp index 1c1c1addf..0e9386277 100644 --- a/src/bindings/python/transforms/PyLogCameraTransform.cpp +++ b/src/bindings/python/transforms/PyLogCameraTransform.cpp @@ -10,6 +10,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLogTransform.cpp b/src/bindings/python/transforms/PyLogTransform.cpp index 9044806fb..5570a7b0b 100644 --- a/src/bindings/python/transforms/PyLogTransform.cpp +++ b/src/bindings/python/transforms/PyLogTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLookTransform.cpp b/src/bindings/python/transforms/PyLookTransform.cpp index 7d0f574bf..aa0992180 100644 --- a/src/bindings/python/transforms/PyLookTransform.cpp +++ b/src/bindings/python/transforms/PyLookTransform.cpp @@ -7,6 +7,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyMatrixTransform.cpp b/src/bindings/python/transforms/PyMatrixTransform.cpp index 025533e96..26a950c7f 100644 --- a/src/bindings/python/transforms/PyMatrixTransform.cpp +++ b/src/bindings/python/transforms/PyMatrixTransform.cpp @@ -8,6 +8,7 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyRangeTransform.cpp b/src/bindings/python/transforms/PyRangeTransform.cpp index 8e646ab4c..509f524ad 100644 --- a/src/bindings/python/transforms/PyRangeTransform.cpp +++ b/src/bindings/python/transforms/PyRangeTransform.cpp @@ -5,6 +5,7 @@ #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" #include "docstrings.h" From 47f776c29402f0c0f037abd0bdbe44fb38640274 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Fri, 23 Jan 2026 16:30:47 +0000 Subject: [PATCH 43/48] Split PyUtils into separate Utils and bufferUtils header to reduce exposure to pybind11/numpy.h Signed-off-by: Kevin Wheatley --- src/bindings/python/PyBufferUtils.h | 52 +++++++++++++++++++ src/bindings/python/PyCPUProcessor.cpp | 3 +- src/bindings/python/PyGpuShaderDesc.cpp | 2 + src/bindings/python/PyPackedImageDesc.cpp | 3 +- src/bindings/python/PyPlanarImageDesc.cpp | 4 +- src/bindings/python/PyUtils.cpp | 2 +- src/bindings/python/PyUtils.h | 36 ------------- .../python/transforms/PyLut1DTransform.cpp | 2 + .../python/transforms/PyLut3DTransform.cpp | 2 + 9 files changed, 66 insertions(+), 40 deletions(-) create mode 100644 src/bindings/python/PyBufferUtils.h diff --git a/src/bindings/python/PyBufferUtils.h b/src/bindings/python/PyBufferUtils.h new file mode 100644 index 000000000..1b04c53fd --- /dev/null +++ b/src/bindings/python/PyBufferUtils.h @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: BSD-3-Clause +// Copyright Contributors to the OpenColorIO Project. + +#ifndef INCLUDED_OCIO_PYBUFFERUTILS_H +#define INCLUDED_OCIO_PYBUFFERUTILS_H + +#include + +#include +#include + +#include +#include + +namespace OCIO_NAMESPACE +{ + +// Convert Python buffer protocol format code to NumPy dtype name +std::string formatCodeToDtypeName(const std::string & format, pybind11::ssize_t numBits); +// Convert OCIO BitDepth to NumPy dtype +pybind11::dtype bitDepthToDtype(BitDepth bitDepth); +// Convert OCIO BitDepth to data type byte count +pybind11::ssize_t bitDepthToBytes(BitDepth bitDepth); +// Convert OCIO ChannelOrdering to channel count +long chanOrderToNumChannels(ChannelOrdering chanOrder); + +// Return string that describes Python buffer's N-dimensional array shape +std::string getBufferShapeStr(const pybind11::buffer_info & info); +// Return BitDepth for a supported Python buffer data type +BitDepth getBufferBitDepth(const pybind11::buffer_info & info); + +// Throw if Python buffer format is incompatible with a NumPy dtype +void checkBufferType(const pybind11::buffer_info & info, const pybind11::dtype & dt); +// Throw if Python buffer format is incompatible with an OCIO BitDepth +void checkBufferType(const pybind11::buffer_info & info, BitDepth bitDepth); +// Throw if Python buffer size is not divisible by channel count +void checkBufferDivisible(const pybind11::buffer_info & info, pybind11::ssize_t numChannels); +// Throw if Python buffer does not have an exact count of entries +void checkBufferSize(const pybind11::buffer_info & info, pybind11::ssize_t numEntries); + +// Calculate 3D grid size from a packed 3D LUT buffer +unsigned long getBufferLut3DGridSize(const pybind11::buffer_info & info); + +// Throw if vector size is not divisible by channel count +void checkVectorDivisible(const std::vector & pixel, size_t numChannels); + +// Throw if array is not C-contiguous +void checkCContiguousArray(const pybind11::buffer_info & info); + +} // namespace OCIO_NAMESPACE + +#endif // INCLUDED_OCIO_PYBUFFERUTILS_H diff --git a/src/bindings/python/PyCPUProcessor.cpp b/src/bindings/python/PyCPUProcessor.cpp index 66e25f863..ff6441474 100644 --- a/src/bindings/python/PyCPUProcessor.cpp +++ b/src/bindings/python/PyCPUProcessor.cpp @@ -7,10 +7,11 @@ #include #include +#include #include "PyDynamicProperty.h" #include "PyOpenColorIO.h" -#include "PyUtils.h" +#include "PyBufferUtils.h" #include "PyImageDesc.h" #include "docstrings.h" diff --git a/src/bindings/python/PyGpuShaderDesc.cpp b/src/bindings/python/PyGpuShaderDesc.cpp index 538d716e5..ca7322603 100644 --- a/src/bindings/python/PyGpuShaderDesc.cpp +++ b/src/bindings/python/PyGpuShaderDesc.cpp @@ -6,10 +6,12 @@ #include #include +#include #include "PyOpenColorIO.h" #include "PyGpuShaderCreator.h" #include "PyUtils.h" +#include "PyBufferUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyPackedImageDesc.cpp b/src/bindings/python/PyPackedImageDesc.cpp index b529ee253..7df39299f 100644 --- a/src/bindings/python/PyPackedImageDesc.cpp +++ b/src/bindings/python/PyPackedImageDesc.cpp @@ -9,8 +9,9 @@ #include #include +#include "PyOpenColorIO.h" #include "PyImageDesc.h" -#include "PyUtils.h" +#include "PyBufferUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyPlanarImageDesc.cpp b/src/bindings/python/PyPlanarImageDesc.cpp index e5de5e11a..039d43c9a 100644 --- a/src/bindings/python/PyPlanarImageDesc.cpp +++ b/src/bindings/python/PyPlanarImageDesc.cpp @@ -7,9 +7,11 @@ #include #include +#include +#include "PyOpenColorIO.h" #include "PyImageDesc.h" -#include "PyUtils.h" +#include "PyBufferUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/PyUtils.cpp b/src/bindings/python/PyUtils.cpp index acde619ac..8da590b9d 100644 --- a/src/bindings/python/PyUtils.cpp +++ b/src/bindings/python/PyUtils.cpp @@ -14,7 +14,7 @@ #include #include -#include "PyUtils.h" +#include "PyBufferUtils.h" namespace py = pybind11; diff --git a/src/bindings/python/PyUtils.h b/src/bindings/python/PyUtils.h index ea4b61d98..8360f8568 100644 --- a/src/bindings/python/PyUtils.h +++ b/src/bindings/python/PyUtils.h @@ -4,17 +4,12 @@ #ifndef INCLUDED_OCIO_PYUTILS_H #define INCLUDED_OCIO_PYUTILS_H -#include #include -#include #include #include "OpenColorABI.h" #include -#include - -#include "PyOpenColorIO.h" namespace OCIO_NAMESPACE @@ -67,37 +62,6 @@ struct PyIterator int m_i = 0; }; -// Convert Python buffer protocol format code to NumPy dtype name -std::string formatCodeToDtypeName(const std::string & format, pybind11::ssize_t numBits); -// Convert OCIO BitDepth to NumPy dtype -pybind11::dtype bitDepthToDtype(BitDepth bitDepth); -// Convert OCIO BitDepth to data type byte count -pybind11::ssize_t bitDepthToBytes(BitDepth bitDepth); -// Convert OCIO ChannelOrdering to channel count -long chanOrderToNumChannels(ChannelOrdering chanOrder); - -// Return string that describes Python buffer's N-dimensional array shape -std::string getBufferShapeStr(const pybind11::buffer_info & info); -// Return BitDepth for a supported Python buffer data type -BitDepth getBufferBitDepth(const pybind11::buffer_info & info); - -// Throw if Python buffer format is incompatible with a NumPy dtype -void checkBufferType(const pybind11::buffer_info & info, const pybind11::dtype & dt); -// Throw if Python buffer format is incompatible with an OCIO BitDepth -void checkBufferType(const pybind11::buffer_info & info, BitDepth bitDepth); -// Throw if Python buffer size is not divisible by channel count -void checkBufferDivisible(const pybind11::buffer_info & info, pybind11::ssize_t numChannels); -// Throw if Python buffer does not have an exact count of entries -void checkBufferSize(const pybind11::buffer_info & info, pybind11::ssize_t numEntries); - -// Calculate 3D grid size from a packed 3D LUT buffer -unsigned long getBufferLut3DGridSize(const pybind11::buffer_info & info); - -// Throw if vector size is not divisible by channel count -void checkVectorDivisible(const std::vector & pixel, size_t numChannels); - -// Throw if array is not C-contiguous -void checkCContiguousArray(const pybind11::buffer_info & info); } // namespace OCIO_NAMESPACE diff --git a/src/bindings/python/transforms/PyLut1DTransform.cpp b/src/bindings/python/transforms/PyLut1DTransform.cpp index f8ce8da3b..e7891c6b4 100644 --- a/src/bindings/python/transforms/PyLut1DTransform.cpp +++ b/src/bindings/python/transforms/PyLut1DTransform.cpp @@ -8,8 +8,10 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" +#include "PyBufferUtils.h" #include "docstrings.h" diff --git a/src/bindings/python/transforms/PyLut3DTransform.cpp b/src/bindings/python/transforms/PyLut3DTransform.cpp index fa5fbc48e..a5cd336ca 100644 --- a/src/bindings/python/transforms/PyLut3DTransform.cpp +++ b/src/bindings/python/transforms/PyLut3DTransform.cpp @@ -8,8 +8,10 @@ #include #include +#include "PyOpenColorIO.h" #include "PyTransform.h" #include "PyUtils.h" +#include "PyBufferUtils.h" #include "docstrings.h" From b5569dca3e983cd58990d827641adaa70fc987ab Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Mon, 26 Jan 2026 12:39:11 +0000 Subject: [PATCH 44/48] Attemp to reduce dependencies on half.h Signed-off-by: Kevin Wheatley --- src/OpenColorIO/AVX.h | 4 ++++ src/OpenColorIO/AVX2.h | 4 ++++ src/OpenColorIO/AVX512.h | 2 ++ src/OpenColorIO/MathHalfUtils.h | 21 +++++++++++++++++++ src/OpenColorIO/MathUtils.cpp | 3 +++ src/OpenColorIO/MathUtils.h | 10 +-------- src/OpenColorIO/SSE2.h | 2 ++ .../fileformats/FileFormatDiscreet1DL.cpp | 2 ++ .../fileformats/ctf/CTFTransform.cpp | 2 ++ src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp | 2 ++ src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp | 3 +++ src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp | 2 ++ src/OpenColorIO/ops/range/RangeOp.cpp | 2 -- src/OpenColorIO/transforms/builtins/ACES.cpp | 2 -- tests/cpu/AVX2_tests.cpp | 2 ++ tests/cpu/AVX512_tests.cpp | 2 ++ tests/cpu/MathUtils_tests.cpp | 2 ++ tests/cpu/SSE2_tests.cpp | 2 ++ tests/cpu/fileformats/FileFormatCTF_tests.cpp | 2 ++ tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp | 4 ++++ tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp | 2 ++ 21 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 src/OpenColorIO/MathHalfUtils.h diff --git a/src/OpenColorIO/AVX.h b/src/OpenColorIO/AVX.h index b4184f89d..e8bb3c37b 100644 --- a/src/OpenColorIO/AVX.h +++ b/src/OpenColorIO/AVX.h @@ -10,6 +10,10 @@ #include +#if OCIO_USE_F16C +#include +#endif + #include #include "BitDepthUtils.h" diff --git a/src/OpenColorIO/AVX2.h b/src/OpenColorIO/AVX2.h index 85bf48dc8..b0982970e 100644 --- a/src/OpenColorIO/AVX2.h +++ b/src/OpenColorIO/AVX2.h @@ -10,6 +10,10 @@ #include +#if OCIO_USE_F16C +#include +#endif + #include #include "BitDepthUtils.h" diff --git a/src/OpenColorIO/AVX512.h b/src/OpenColorIO/AVX512.h index 1ffef09f7..0a2d3700d 100644 --- a/src/OpenColorIO/AVX512.h +++ b/src/OpenColorIO/AVX512.h @@ -10,6 +10,8 @@ #include +#include + #include #include "BitDepthUtils.h" diff --git a/src/OpenColorIO/MathHalfUtils.h b/src/OpenColorIO/MathHalfUtils.h new file mode 100644 index 000000000..9d4d24a77 --- /dev/null +++ b/src/OpenColorIO/MathHalfUtils.h @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: BSD-3-Clause +// Copyright Contributors to the OpenColorIO Project. + +#ifndef INCLUDED_OCIO_MATHHALFUTILS_H +#define INCLUDED_OCIO_MATHHALFUTILS_H + +#include + +#include + +namespace OCIO_NAMESPACE +{ +// Compares half-floats as raw integers with a tolerance (essentially in ULPs). +// Returns true if the integer difference is strictly greater than the tolerance. +// If aimHalf is a NaN, valHalf must also be one of the NaNs. +// Inf is treated like any other value (diff from HALFMAX is 1). +bool HalfsDiffer(const half expected, const half actual, const int tolerance); + +} // namespace OCIO_NAMESPACE + +#endif diff --git a/src/OpenColorIO/MathUtils.cpp b/src/OpenColorIO/MathUtils.cpp index a2a94094a..099781af5 100644 --- a/src/OpenColorIO/MathUtils.cpp +++ b/src/OpenColorIO/MathUtils.cpp @@ -7,9 +7,12 @@ #include #include +#include + #include #include "MathUtils.h" +#include "MathHalfUtils.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h index 9ed0bcb6b..ae180c722 100644 --- a/src/OpenColorIO/MathUtils.h +++ b/src/OpenColorIO/MathUtils.h @@ -7,9 +7,7 @@ #include #include -#include - -#include +#include namespace OCIO_NAMESPACE { @@ -213,12 +211,6 @@ inline float AddULP(const float f, const int ulp) bool FloatsDiffer(const float expected, const float actual, const int tolerance, const bool compressDenorms); -// Compares half-floats as raw integers with a tolerance (essentially in ULPs). -// Returns true if the integer difference is strictly greater than the tolerance. -// If aimHalf is a NaN, valHalf must also be one of the NaNs. -// Inf is treated like any other value (diff from HALFMAX is 1). -bool HalfsDiffer(const half expected, const half actual, const int tolerance); - } // namespace OCIO_NAMESPACE #endif diff --git a/src/OpenColorIO/SSE2.h b/src/OpenColorIO/SSE2.h index 012862340..afb5dcc24 100644 --- a/src/OpenColorIO/SSE2.h +++ b/src/OpenColorIO/SSE2.h @@ -8,6 +8,8 @@ #include "CPUInfo.h" #if OCIO_USE_SSE2 +#include + // Include the appropriate SIMD intrinsics header based on the architecture (Intel vs. ARM). #if !defined(__aarch64__) && !defined(_M_ARM64) #include diff --git a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp index 3fd10df10..d7f0b5a93 100755 --- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp +++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp @@ -11,6 +11,8 @@ #include +#include + #include #include "BitDepthUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp index 87f287d40..206b7aa82 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp @@ -10,6 +10,8 @@ #include #include +#include + #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderUtils.h" #include "fileformats/ctf/CTFTransform.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp index 55dc1cd53..15cb75b6a 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp @@ -6,6 +6,8 @@ #include #include +#include + #include #include "BitDepthUtils.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp index 0a6f93f3d..12941d584 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp @@ -5,11 +5,14 @@ #include #include +#include + #include #include "BitDepthUtils.h" #include "HashUtils.h" #include "MathUtils.h" +#include "MathHalfUtils.h" #include "ops/lut1d/Lut1DOp.h" #include "ops/lut1d/Lut1DOpData.h" #include "ops/OpTools.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp index fb81b2be8..a7ac005be 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpGPU.cpp @@ -5,6 +5,8 @@ #include #include +#include + #include #include "GpuShaderUtils.h" diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp index 7cb49b101..4a7d897f5 100644 --- a/src/OpenColorIO/ops/range/RangeOp.cpp +++ b/src/OpenColorIO/ops/range/RangeOp.cpp @@ -5,8 +5,6 @@ #include -#include - #include "ops/lut1d/Lut1DOpData.h" #include "ops/lut3d/Lut3DOpData.h" #include "ops/range/RangeOpCPU.h" diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp index b341fb325..0fe028622 100644 --- a/src/OpenColorIO/transforms/builtins/ACES.cpp +++ b/src/OpenColorIO/transforms/builtins/ACES.cpp @@ -8,8 +8,6 @@ #include -#include - #include "ops/fixedfunction/FixedFunctionOp.h" #include "ops/gradingrgbcurve/GradingRGBCurveOp.h" #include "ops/log/LogOp.h" diff --git a/tests/cpu/AVX2_tests.cpp b/tests/cpu/AVX2_tests.cpp index 304ffb046..d51840560 100644 --- a/tests/cpu/AVX2_tests.cpp +++ b/tests/cpu/AVX2_tests.cpp @@ -8,6 +8,8 @@ #include #include +#include + #include #include diff --git a/tests/cpu/AVX512_tests.cpp b/tests/cpu/AVX512_tests.cpp index 70152a370..a993e4c8d 100644 --- a/tests/cpu/AVX512_tests.cpp +++ b/tests/cpu/AVX512_tests.cpp @@ -8,6 +8,8 @@ #include #include +#include + #include #include diff --git a/tests/cpu/MathUtils_tests.cpp b/tests/cpu/MathUtils_tests.cpp index a6dfd1b1e..177a3f9fc 100644 --- a/tests/cpu/MathUtils_tests.cpp +++ b/tests/cpu/MathUtils_tests.cpp @@ -5,6 +5,8 @@ #include #include +#include + #include "MathUtils.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/SSE2_tests.cpp b/tests/cpu/SSE2_tests.cpp index 8a6dd0e28..9c876fc86 100644 --- a/tests/cpu/SSE2_tests.cpp +++ b/tests/cpu/SSE2_tests.cpp @@ -8,6 +8,8 @@ #include #include +#include + #include #include "MathUtils.h" diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp index 1c759e43b..7ff2b65bb 100644 --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp @@ -8,6 +8,8 @@ #include #include +#include + #include "BitDepthUtils.h" #include "fileformats/FileFormatCTF.cpp" #include "ops/fixedfunction/FixedFunctionOp.h" diff --git a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp index 99bd5429e..1606e8751 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpCPU_tests.cpp @@ -8,6 +8,10 @@ #include #include +#include + +#include "MathHalfUtils.h" + #include "ops/lut1d/Lut1DOpCPU.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp index 79e9eb851..ce1be22c5 100644 --- a/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOpData_tests.cpp @@ -5,6 +5,8 @@ #include #include +#include + #include "ops/lut1d/Lut1DOpData.cpp" #include "testutils/UnitTest.h" From 75333425cb9dde1930f4afde597a498e24412b03 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Mon, 26 Jan 2026 18:14:24 +0000 Subject: [PATCH 45/48] Some include what you use header suggestions arround the ACES code Signed-off-by: Kevin Wheatley --- src/OpenColorIO/ops/range/RangeOp.cpp | 3 +++ src/OpenColorIO/ops/range/RangeOpCPU.cpp | 4 ++++ src/OpenColorIO/transforms/BuiltinTransform.cpp | 1 + src/OpenColorIO/transforms/BuiltinTransform.h | 2 ++ src/OpenColorIO/transforms/builtins/ACES.cpp | 10 ++++++++++ tests/cpu/ops/range/RangeOp_tests.cpp | 5 +++++ tests/cpu/transforms/BuiltinTransform_tests.cpp | 4 ++++ 7 files changed, 29 insertions(+) diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp index 4a7d897f5..71aa0036c 100644 --- a/src/OpenColorIO/ops/range/RangeOp.cpp +++ b/src/OpenColorIO/ops/range/RangeOp.cpp @@ -10,8 +10,11 @@ #include "ops/range/RangeOpCPU.h" #include "ops/range/RangeOpGPU.h" #include "ops/range/RangeOp.h" +#include "ops/range/RangeOpData.h" #include "transforms/RangeTransform.h" #include "ops/matrix/MatrixOp.h" +#include "ops/matrix/MatrixOpData.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/range/RangeOpCPU.cpp b/src/OpenColorIO/ops/range/RangeOpCPU.cpp index c041af099..bc22cad54 100644 --- a/src/OpenColorIO/ops/range/RangeOpCPU.cpp +++ b/src/OpenColorIO/ops/range/RangeOpCPU.cpp @@ -3,11 +3,15 @@ #include +#include #include +#include "Op.h" #include "MathUtils.h" #include "ops/range/RangeOpCPU.h" +#include "ops/range/RangeOpData.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/transforms/BuiltinTransform.cpp b/src/OpenColorIO/transforms/BuiltinTransform.cpp index 1f3f4d8e7..0394c86dd 100644 --- a/src/OpenColorIO/transforms/BuiltinTransform.cpp +++ b/src/OpenColorIO/transforms/BuiltinTransform.cpp @@ -3,6 +3,7 @@ #include +#include #include diff --git a/src/OpenColorIO/transforms/BuiltinTransform.h b/src/OpenColorIO/transforms/BuiltinTransform.h index 3c053f272..bd367aa59 100644 --- a/src/OpenColorIO/transforms/BuiltinTransform.h +++ b/src/OpenColorIO/transforms/BuiltinTransform.h @@ -6,6 +6,8 @@ #define INCLUDED_OCIO_BUILTINTRANSFORM_H +#include + #include diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp index 0fe028622..a2ebeb996 100644 --- a/src/OpenColorIO/transforms/builtins/ACES.cpp +++ b/src/OpenColorIO/transforms/builtins/ACES.cpp @@ -2,17 +2,27 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include #include #include +#include +#include #include +#include "Op.h" #include "ops/fixedfunction/FixedFunctionOp.h" +#include "ops/fixedfunction/FixedFunctionOpData.h" #include "ops/gradingrgbcurve/GradingRGBCurveOp.h" +#include "ops/gradingrgbcurve/GradingRGBCurveOpData.h" #include "ops/log/LogOp.h" +#include "ops/log/LogOpData.h" #include "ops/matrix/MatrixOp.h" +#include "ops/matrix/MatrixOpData.h" #include "ops/range/RangeOp.h" +#include "ops/range/RangeOpData.h" +#include "transforms/builtins/ColorMatrixHelpers.h" #include "transforms/builtins/ACES.h" #include "transforms/builtins/BuiltinTransformRegistry.h" #include "transforms/builtins/OpHelpers.h" diff --git a/tests/cpu/ops/range/RangeOp_tests.cpp b/tests/cpu/ops/range/RangeOp_tests.cpp index c865c01fd..f147af183 100644 --- a/tests/cpu/ops/range/RangeOp_tests.cpp +++ b/tests/cpu/ops/range/RangeOp_tests.cpp @@ -5,7 +5,12 @@ #include #include +#include + +#include "Op.h" #include "ops/range/RangeOp.cpp" +#include "fileformats/FormatMetadata.h" +#include "ops/matrix/MatrixOpData.h" #include "testutils/UnitTest.h" diff --git a/tests/cpu/transforms/BuiltinTransform_tests.cpp b/tests/cpu/transforms/BuiltinTransform_tests.cpp index 41d8b7558..a8b607c31 100644 --- a/tests/cpu/transforms/BuiltinTransform_tests.cpp +++ b/tests/cpu/transforms/BuiltinTransform_tests.cpp @@ -2,6 +2,7 @@ // Copyright Contributors to the OpenColorIO Project. +#include #include #include #include @@ -18,12 +19,15 @@ #include "ops/lut3d/Lut3DOp.h" #include "transforms/builtins/ColorMatrixHelpers.h" +#include "ops/matrix/MatrixOpData.h" #include "transforms/builtins/OpHelpers.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" + namespace OCIO = OCIO_NAMESPACE; + OCIO_ADD_TEST(BuiltinTransform, creation) { // Tests around the creation of a built-in transform instance. From ac88ffe5ddba6f6964d1acd69f30d75c8da7793c Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 28 Jan 2026 10:14:28 +0000 Subject: [PATCH 46/48] ACES Transform: Ensure we use the mathematical functions from the std namespace Without this the code behaviour depends on the prior inclusions. If we have previously only included then the bare sqrt() called with a float argument will promote the float to a double and call the 'C' function: double sqrt(double) If we had included then on Linux with GCC, etc it will have using std::sqrt; Which now adds float sqrt(float) to the overload set, and so that gets called. This code and its tests assumed the call to the float behaviour, so we enforce it by explicitly choosing from which namespace we pull the mathematical functions. Found when removing an include of from a transitivly depended on header. Removing half.h also removed an include of math.h Signed-off-by: Kevin Wheatley --- .../ops/fixedfunction/ACES2/Transform.cpp | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/OpenColorIO/ops/fixedfunction/ACES2/Transform.cpp b/src/OpenColorIO/ops/fixedfunction/ACES2/Transform.cpp index 889c2a90b..4524d4e81 100644 --- a/src/OpenColorIO/ops/fixedfunction/ACES2/Transform.cpp +++ b/src/OpenColorIO/ops/fixedfunction/ACES2/Transform.cpp @@ -1,13 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Transform.h" - #include #include #include #include +#include "Transform.h" + + namespace OCIO_NAMESPACE { @@ -193,7 +194,7 @@ f3 Aab_to_JMh(const f3 &Aab, const JMhParams &p) return {0.f, 0.f, 0.f}; } const float J = Achromatic_n_to_J(Aab[0], p.cz); - const float M = sqrt(Aab[1] * Aab[1] + Aab[2] * Aab[2]); + const float M = std::sqrt(Aab[1] * Aab[1] + Aab[2] * Aab[2]); const float h_rad = std::atan2(Aab[2], Aab[1]); float h = _from_radians(h_rad); // Call to unwrapped hue version due to atan2 limits @@ -222,8 +223,8 @@ f3 JMh_to_Aab(const f3 &JMh, const JMhParams &p) { const float h = JMh[2]; const float h_rad = to_radians(h); - const float cos_hr = cos(h_rad); - const float sin_hr = sin(h_rad); + const float cos_hr = std::cos(h_rad); + const float sin_hr = std::sin(h_rad); return JMh_to_Aab(JMh, cos_hr, sin_hr, p); } @@ -340,12 +341,12 @@ inline float toe_fwd( float x, float limit, float k1_in, float k2_in) } const float k2 = std::max(k2_in, 0.001f); - const float k1 = sqrt(k1_in * k1_in + k2 * k2); + const float k1 = std::sqrt(k1_in * k1_in + k2 * k2); const float k3 = (limit + k1) / (limit + k2); const float minus_b = k3 * x - k1; const float minus_ac = k2 * k3 * x; // a is 1.0 - return 0.5f * (minus_b + sqrt(minus_b * minus_b + 4.f * minus_ac)); // a is 1.0, mins_b squared == b^2 + return 0.5f * (minus_b + std::sqrt(minus_b * minus_b + 4.f * minus_ac)); // a is 1.0, mins_b squared == b^2 } inline float toe_inv( float x, float limit, float k1_in, float k2_in) @@ -356,7 +357,7 @@ inline float toe_inv( float x, float limit, float k1_in, float k2_in) } const float k2 = std::max(k2_in, 0.001f); - const float k1 = sqrt(k1_in * k1_in + k2 * k2); + const float k1 = std::sqrt(k1_in * k1_in + k2 * k2); const float k3 = (limit + k1) / (limit + k2); return (x * x + k1 * x) / (k3 * (x + k2)); } @@ -368,7 +369,7 @@ inline float aces_tonescale(const float Y_in, const ToneScaleParams &pt) { const float Y_ts_norm = Y_in / reference_luminance; // TODO const float Z = std::max(0.f, std::min(pt.inverse_limit, Y_ts_norm)); // TODO: could eliminate max in the context of the full tonescale - const float f = (Z + sqrt(Z * (4.f * pt.t_1 + Z))) / 2.f; + const float f = (Z + std::sqrt(Z * (4.f * pt.t_1 + Z))) / 2.f; const float Y = pt.s_2 / (powf((pt.m_2 / f), (1.f / pt.g)) - 1.f); // TODO: investigate precomputing reciprocal m_2 and a negative power? may swap a division for a multiply? powf(pt.m_2_recip * f, (-1.f / pt.g)) return Y; } @@ -430,7 +431,7 @@ f3 chroma_compress_fwd(const f3 &JMh, const float J_ts, const float Mnorm, const M_cp = M * powf(J_ts / J, pr.model_gamma_inv); M_cp = M_cp / Mnorm; - M_cp = limit - toe_fwd(limit - M_cp, limit - 0.001f, snJ * pc.sat, sqrt(nJ * nJ + pc.sat_thr)); + M_cp = limit - toe_fwd(limit - M_cp, limit - 0.001f, snJ * pc.sat, std::sqrt(nJ * nJ + pc.sat_thr)); M_cp = toe_fwd(M_cp, limit, nJ * pc.compr, snJ); M_cp = M_cp * Mnorm; } @@ -453,7 +454,7 @@ f3 chroma_compress_inv(const f3 &JMh, const float J, const float Mnorm, const Re M = M_cp / Mnorm; M = toe_inv(M, limit, nJ * pc.compr, snJ); - M = limit - toe_inv(limit - M, limit - 0.001f, snJ * pc.sat, sqrt(nJ * nJ + pc.sat_thr)); + M = limit - toe_inv(limit - M, limit - 0.001f, snJ * pc.sat, std::sqrt(nJ * nJ + pc.sat_thr)); M = M * Mnorm; M = M * powf(J_ts / J, -pr.model_gamma_inv); } @@ -464,7 +465,7 @@ f3 chroma_compress_inv(const f3 &JMh, const float J, const float Mnorm, const Re inline float model_gamma(void) { // c * z nonlinearity - return surround[1] * (1.48f + sqrt(Y_b / reference_luminance)); + return surround[1] * (1.48f + std::sqrt(Y_b / reference_luminance)); } JMhParams init_JMhParams(const Primaries &prims) @@ -921,7 +922,7 @@ inline float get_focus_gain(float J, float analytical_threshold, float limit_J_m if (J > analytical_threshold) { // Approximate inverse required above threshold due to the introduction of J in the calculation - float gain_adjustment = log10((limit_J_max - analytical_threshold) / std::max(0.0001f, limit_J_max - J)); + float gain_adjustment = std::log10((limit_J_max - analytical_threshold) / std::max(0.0001f, limit_J_max - J)); //gain = powf(gain, focus_adjust_gain_inv) + 1.f; gain_adjustment = gain_adjustment * gain_adjustment + 1.f; gain = gain * gain_adjustment; @@ -939,7 +940,7 @@ float solve_J_intersect(float J, float M, float focusJ, float maxJ, float slope_ const float b = 1.f - M_scaled; const float c = -J; const float det = b * b - 4.f * a * c; - const float root = sqrt(det); + const float root = std::sqrt(det); return -2.f * c / (b + root); } else @@ -947,7 +948,7 @@ float solve_J_intersect(float J, float M, float focusJ, float maxJ, float slope_ const float b = -(1.f + M_scaled + maxJ * a); const float c = maxJ * M_scaled + J; const float det = b * b - 4.f * a * c; - const float root = sqrt(det); + const float root = std::sqrt(det); return -2.f * c / (b - root); } } @@ -1280,14 +1281,14 @@ ToneScaleParams init_ToneScaleParams(float peakLuminance) // Calculate output constants // TODO: factor these calculations into well named functions // TODO: ensure correct use of n_r vs n vs reference_luminance vs 100.f etc - const float r_hit = r_hit_min + (r_hit_max - r_hit_min) * (log(n/n_r)/log(10000.f/100.f)); + const float r_hit = r_hit_min + (r_hit_max - r_hit_min) * (std::log(n/n_r)/std::log(10000.f/100.f)); const float m_0 = (n / n_r); - const float m_1 = 0.5f * (m_0 + sqrt(m_0 * (m_0 + 4.f * t_1))); + const float m_1 = 0.5f * (m_0 + std::sqrt(m_0 * (m_0 + 4.f * t_1))); const float u = powf((r_hit/m_1)/((r_hit/m_1)+1.f),g); const float m = m_1 / u; - const float w_i = log(n/100.f)/log(2.f); + const float w_i = std::log(n/100.f)/std::log(2.f); const float c_t = c_d/n_r * (1.f + w_i * w_g); - const float g_ip = 0.5f * (c_t + sqrt(c_t * (c_t + 4.f * t_1))); + const float g_ip = 0.5f * (c_t + std::sqrt(c_t * (c_t + 4.f * t_1))); const float g_ipp2 = -(m_1 * powf((g_ip/m),(1.f/g))) / (powf(g_ip/m , 1.f/g)-1.f); const float w_2 = c / g_ipp2; const float s_2 = w_2 * m_1 * reference_luminance; @@ -1295,7 +1296,7 @@ ToneScaleParams init_ToneScaleParams(float peakLuminance) const float m_2 = m_1 / u_2; const float inverse_limit = n / (u_2 * n_r); const float forward_limit = 8.0f * r_hit; - const float log_peak = log10( n / n_r); + const float log_peak = std::log10( n / n_r); ToneScaleParams TonescaleParams = { n, From d2215e777d0af3ded70fb26bc3d79ac5d198cf75 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 28 Jan 2026 14:20:50 +0000 Subject: [PATCH 47/48] Tidy Usage of Mutex and CPUInfo Signed-off-by: Kevin Wheatley --- src/OpenColorIO/AVX.h | 3 ++- src/OpenColorIO/AVX2.h | 2 +- src/OpenColorIO/AVX512.h | 2 +- src/OpenColorIO/CPUInfo.h | 3 ++- src/OpenColorIO/CPUProcessor.cpp | 1 + src/OpenColorIO/CPUProcessor.h | 1 + src/OpenColorIO/Config.cpp | 1 + src/OpenColorIO/ConfigUtils.cpp | 2 ++ src/OpenColorIO/GPUProcessor.cpp | 6 +----- src/OpenColorIO/GPUProcessor.h | 1 + src/OpenColorIO/MathUtils.h | 1 + src/OpenColorIO/Processor.cpp | 1 + src/OpenColorIO/SSE.h | 1 + src/OpenColorIO/SSE2.h | 5 +++-- src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp | 1 - src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp | 4 ++++ src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h | 3 +++ src/OpenColorIO/fileformats/ctf/CTFTransform.cpp | 2 ++ src/OpenColorIO/ops/OpArray.h | 4 ++-- src/OpenColorIO/ops/cdl/CDLOpCPU.cpp | 1 + src/OpenColorIO/ops/cdl/CDLOpData.cpp | 1 + src/OpenColorIO/ops/exponent/ExponentOp.cpp | 2 ++ .../ops/exposurecontrast/ExposureContrastOpCPU.cpp | 1 + .../ops/exposurecontrast/ExposureContrastOpData.cpp | 2 ++ src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp | 2 +- .../ops/fixedfunction/FixedFunctionOpData.cpp | 1 + src/OpenColorIO/ops/gamma/GammaOpCPU.cpp | 1 + src/OpenColorIO/ops/gamma/GammaOpData.cpp | 2 ++ .../ops/gradinghuecurve/GradingHueCurveOpData.cpp | 2 ++ .../ops/gradingprimary/GradingPrimaryOpCPU.cpp | 1 + .../ops/gradingprimary/GradingPrimaryOpData.cpp | 2 ++ .../ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp | 2 ++ .../ops/gradingrgbcurve/GradingRGBCurveOpData.cpp | 1 + src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp | 1 + src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp | 2 ++ src/OpenColorIO/ops/log/LogOpCPU.cpp | 3 +++ src/OpenColorIO/ops/log/LogOpData.cpp | 2 ++ src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp | 2 +- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp | 7 ++++++- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.h | 2 +- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp | 8 +++++++- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.h | 7 ++++--- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp | 7 ++++++- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.h | 8 +++++--- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp | 8 +++++++- src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.h | 8 +++++--- src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp | 2 ++ src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp | 2 +- src/OpenColorIO/ops/lut3d/Lut3DOpCPU.h | 3 +-- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.cpp | 7 ++++++- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.h | 7 ++++--- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp | 7 ++++++- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.h | 7 ++++--- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp | 7 ++++++- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.h | 8 +++++--- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.cpp | 8 +++++++- src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.h | 7 ++++--- src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp | 2 ++ src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp | 1 + src/OpenColorIO/ops/matrix/MatrixOpData.cpp | 2 ++ src/OpenColorIO/ops/range/RangeOp.cpp | 2 ++ src/OpenColorIO/ops/range/RangeOpData.cpp | 2 ++ src/apps/ociocpuinfo/main.cpp | 2 ++ tests/cpu/AVX2_tests.cpp | 3 ++- tests/cpu/AVX512_tests.cpp | 3 ++- tests/cpu/AVX_tests.cpp | 3 ++- tests/cpu/CPUProcessor_tests.cpp | 4 ++++ tests/cpu/Caching_tests.cpp | 4 ++++ tests/cpu/ConfigUtils_tests.cpp | 2 ++ tests/cpu/SSE2_tests.cpp | 3 ++- tests/cpu/SSE_tests.cpp | 2 ++ tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp | 9 ++++++++- tests/cpu/fileformats/FileFormatCTF_tests.cpp | 2 ++ tests/cpu/ops/allocation/AllocationOp_tests.cpp | 1 + tests/cpu/ops/cdl/CDLOp_tests.cpp | 5 +++++ .../ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp | 2 ++ tests/cpu/ops/gamma/GammaOpCPU_tests.cpp | 3 +++ .../cpu/ops/gradinghuecurve/GradingHueCurveOp_tests.cpp | 2 ++ .../cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp | 3 +++ tests/cpu/ops/gradingprimary/GradingPrimaryOp_tests.cpp | 2 ++ .../ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp | 3 +++ .../cpu/ops/gradingrgbcurve/GradingRGBCurveOp_tests.cpp | 2 ++ tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp | 3 +++ tests/cpu/ops/log/LogOpCPU_tests.cpp | 3 +++ tests/cpu/ops/log/LogOp_tests.cpp | 4 ++++ tests/cpu/ops/lut1d/Lut1DOp_tests.cpp | 2 ++ tests/cpu/ops/lut3d/Lut3DOp_tests.cpp | 2 ++ tests/cpu/transforms/CDLTransform_tests.cpp | 2 ++ tests/cpu/transforms/ExponentTransform_tests.cpp | 2 ++ tests/cpu/transforms/LogAffineTransform_tests.cpp | 2 ++ tests/cpu/transforms/LogCameraTransform_tests.cpp | 2 ++ tests/cpu/transforms/LogTransform_tests.cpp | 2 ++ tests/gpu/FixedFunctionOp_test.cpp | 2 +- tests/gpu/GPUUnitTest.h | 3 ++- tests/gpu/GammaOp_test.cpp | 1 + tests/gpu/LogOp_test.cpp | 1 + 96 files changed, 239 insertions(+), 56 deletions(-) diff --git a/src/OpenColorIO/AVX.h b/src/OpenColorIO/AVX.h index e8bb3c37b..f48c41110 100644 --- a/src/OpenColorIO/AVX.h +++ b/src/OpenColorIO/AVX.h @@ -6,6 +6,7 @@ #define INCLUDED_OCIO_AVX_H #include "CPUInfo.h" + #if OCIO_USE_AVX #include @@ -14,7 +15,7 @@ #include #endif -#include +#include "OpenColorABI.h" #include "BitDepthUtils.h" // Macros for alignment declarations diff --git a/src/OpenColorIO/AVX2.h b/src/OpenColorIO/AVX2.h index b0982970e..67ce1d709 100644 --- a/src/OpenColorIO/AVX2.h +++ b/src/OpenColorIO/AVX2.h @@ -14,7 +14,7 @@ #include #endif -#include +#include "OpenColorABI.h" #include "BitDepthUtils.h" // Macros for alignment declarations diff --git a/src/OpenColorIO/AVX512.h b/src/OpenColorIO/AVX512.h index 0a2d3700d..6557bdd40 100644 --- a/src/OpenColorIO/AVX512.h +++ b/src/OpenColorIO/AVX512.h @@ -12,7 +12,7 @@ #include -#include +#include "OpenColorABI.h" #include "BitDepthUtils.h" // Macros for alignment declarations diff --git a/src/OpenColorIO/CPUInfo.h b/src/OpenColorIO/CPUInfo.h index 80e9792e0..45ad123b3 100644 --- a/src/OpenColorIO/CPUInfo.h +++ b/src/OpenColorIO/CPUInfo.h @@ -5,7 +5,8 @@ #ifndef CPUInfo_H #define CPUInfo_H -#include +#include "OpenColorABI.h" + #include "CPUInfoConfig.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/CPUProcessor.cpp b/src/OpenColorIO/CPUProcessor.cpp index 73783f36b..e937bc270 100644 --- a/src/OpenColorIO/CPUProcessor.cpp +++ b/src/OpenColorIO/CPUProcessor.cpp @@ -12,6 +12,7 @@ #include "ops/lut1d/Lut1DOpCPU.h" #include "ops/matrix/MatrixOp.h" #include "ScanlineHelper.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/CPUProcessor.h b/src/OpenColorIO/CPUProcessor.h index d5fcb4380..a756fec15 100644 --- a/src/OpenColorIO/CPUProcessor.h +++ b/src/OpenColorIO/CPUProcessor.h @@ -9,6 +9,7 @@ #include #include "Op.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/Config.cpp b/src/OpenColorIO/Config.cpp index 351b3a2a8..cdebdfca2 100644 --- a/src/OpenColorIO/Config.cpp +++ b/src/OpenColorIO/Config.cpp @@ -39,6 +39,7 @@ #include "ViewingRules.h" #include "SystemMonitor.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ConfigUtils.cpp b/src/OpenColorIO/ConfigUtils.cpp index c6290d245..5a9adcd67 100644 --- a/src/OpenColorIO/ConfigUtils.cpp +++ b/src/OpenColorIO/ConfigUtils.cpp @@ -6,6 +6,8 @@ #include #include +#include + #include #include "ConfigUtils.h" diff --git a/src/OpenColorIO/GPUProcessor.cpp b/src/OpenColorIO/GPUProcessor.cpp index e463903c0..057c3ae62 100644 --- a/src/OpenColorIO/GPUProcessor.cpp +++ b/src/OpenColorIO/GPUProcessor.cpp @@ -9,13 +9,9 @@ #include #include "GPUProcessor.h" -#include "GpuShader.h" #include "GpuShaderUtils.h" #include "HashUtils.h" -#include "Logging.h" -#include "ops/allocation/AllocationOp.h" -#include "ops/lut3d/Lut3DOp.h" -#include "ops/noop/NoOps.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/GPUProcessor.h b/src/OpenColorIO/GPUProcessor.h index 30039a1cd..00cc64040 100644 --- a/src/OpenColorIO/GPUProcessor.h +++ b/src/OpenColorIO/GPUProcessor.h @@ -9,6 +9,7 @@ #include #include "Op.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h index ae180c722..869499259 100644 --- a/src/OpenColorIO/MathUtils.h +++ b/src/OpenColorIO/MathUtils.h @@ -9,6 +9,7 @@ #include + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/Processor.cpp b/src/OpenColorIO/Processor.cpp index fe6cb9ebc..f5fb9e2c9 100755 --- a/src/OpenColorIO/Processor.cpp +++ b/src/OpenColorIO/Processor.cpp @@ -17,6 +17,7 @@ #include "TransformBuilder.h" #include "utils/StringUtils.h" #include "PrivateTypes.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/SSE.h b/src/OpenColorIO/SSE.h index 6aebc45d4..aee53084b 100644 --- a/src/OpenColorIO/SSE.h +++ b/src/OpenColorIO/SSE.h @@ -6,6 +6,7 @@ #define INCLUDED_OCIO_SSE_H #include "CPUInfoConfig.h" + #if OCIO_USE_SSE2 // Include the appropriate SIMD intrinsics header based on the architecture (Intel vs. ARM). diff --git a/src/OpenColorIO/SSE2.h b/src/OpenColorIO/SSE2.h index afb5dcc24..dbe4c6326 100644 --- a/src/OpenColorIO/SSE2.h +++ b/src/OpenColorIO/SSE2.h @@ -5,7 +5,8 @@ #ifndef INCLUDED_OCIO_SSE2_H #define INCLUDED_OCIO_SSE2_H -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_SSE2 #include @@ -47,7 +48,7 @@ #endif #endif -#include +#include "OpenColorABI.h" #include "BitDepthUtils.h" // Macros for alignment declarations diff --git a/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp b/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp index f33350f05..36dca04ec 100644 --- a/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp +++ b/src/OpenColorIO/apphelpers/ColorSpaceHelpers.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp index 5e47f800e..de0427d86 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.cpp @@ -6,6 +6,9 @@ #include #include #include +#include + +#include #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderHelper.h" @@ -13,6 +16,7 @@ #include "fileformats/xmlutils/XMLReaderUtils.h" #include "Logging.h" #include "MathUtils.h" +#include "DynamicProperty.h" #include "ops/log/LogUtils.h" #include "Platform.h" #include "utils/StringUtils.h" diff --git a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h index 7f3e7dbc4..91e71a0b8 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h +++ b/src/OpenColorIO/fileformats/ctf/CTFReaderHelper.h @@ -4,6 +4,7 @@ #ifndef INCLUDED_OCIO_FILEFORMATS_CTF_CTFREADERHELPER_H #define INCLUDED_OCIO_FILEFORMATS_CTF_CTFREADERHELPER_H +#include #include #include @@ -28,6 +29,8 @@ #include "ops/lut3d/Lut3DOpData.h" #include "ops/range/RangeOpData.h" #include "ops/reference/ReferenceOpData.h" +#include "ops/matrix/MatrixOpData.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp index 206b7aa82..e27def65e 100644 --- a/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp +++ b/src/OpenColorIO/fileformats/ctf/CTFTransform.cpp @@ -12,6 +12,8 @@ #include +#include + #include "BitDepthUtils.h" #include "fileformats/ctf/CTFReaderUtils.h" #include "fileformats/ctf/CTFTransform.h" diff --git a/src/OpenColorIO/ops/OpArray.h b/src/OpenColorIO/ops/OpArray.h index 4a7b0b72f..69273350a 100644 --- a/src/OpenColorIO/ops/OpArray.h +++ b/src/OpenColorIO/ops/OpArray.h @@ -173,8 +173,8 @@ template class ArrayT : public ArrayBase if (m_data.size() != getNumValues()) { std::ostringstream os; - os << "Array contains: " << m_data.size() << " values, "; - os << "but " << getNumValues() << " are expected."; + os << "Array contains: " << m_data.size() << " values, " + "but " << getNumValues() << " are expected."; throw Exception(os.str().c_str()); } } diff --git a/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp b/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp index 1f9344011..8e1ae83a3 100644 --- a/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp +++ b/src/OpenColorIO/ops/cdl/CDLOpCPU.cpp @@ -7,6 +7,7 @@ #include +#include "CPUInfoConfig.h" #include "CDLOpCPU.h" #include "SSE.h" diff --git a/src/OpenColorIO/ops/cdl/CDLOpData.cpp b/src/OpenColorIO/ops/cdl/CDLOpData.cpp index 82aa5b5ee..7f9571da0 100644 --- a/src/OpenColorIO/ops/cdl/CDLOpData.cpp +++ b/src/OpenColorIO/ops/cdl/CDLOpData.cpp @@ -12,6 +12,7 @@ #include "ops/matrix/MatrixOpData.h" #include "ops/range/RangeOpData.h" #include "Platform.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/exponent/ExponentOp.cpp b/src/OpenColorIO/ops/exponent/ExponentOp.cpp index c4921351c..bf91d5c59 100644 --- a/src/OpenColorIO/ops/exponent/ExponentOp.cpp +++ b/src/OpenColorIO/ops/exponent/ExponentOp.cpp @@ -11,6 +11,8 @@ #include "ops/exponent/ExponentOp.h" #include "GpuShaderUtils.h" #include "MathUtils.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp index 1fa3e2d6f..3895c8a83 100644 --- a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp +++ b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpCPU.cpp @@ -6,6 +6,7 @@ #include +#include "CPUInfoConfig.h" #include "DynamicProperty.h" #include "ops/exposurecontrast/ExposureContrastOpCPU.h" #include "SSE.h" diff --git a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpData.cpp b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpData.cpp index 869b28e60..f18f97900 100644 --- a/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpData.cpp +++ b/src/OpenColorIO/ops/exposurecontrast/ExposureContrastOpData.cpp @@ -7,6 +7,8 @@ #include "ops/exposurecontrast/ExposureContrastOpData.h" #include "Platform.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp index 629d3ce3f..b846a3006 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpCPU.cpp @@ -12,7 +12,7 @@ #include "MathUtils.h" #include "ops/fixedfunction/FixedFunctionOpCPU.h" #include "SSE.h" -#include "CPUInfo.h" +#include "CPUInfoConfig.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.cpp b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.cpp index 8e5d5833d..1d383145c 100644 --- a/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.cpp +++ b/src/OpenColorIO/ops/fixedfunction/FixedFunctionOpData.cpp @@ -8,6 +8,7 @@ #include "ops/fixedfunction/FixedFunctionOpData.h" #include "Platform.h" +#include "Mutex.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp b/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp index 089e0aba1..cefac5e8f 100644 --- a/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp +++ b/src/OpenColorIO/ops/gamma/GammaOpCPU.cpp @@ -10,6 +10,7 @@ #include "ops/gamma/GammaOpCPU.h" #include "ops/gamma/GammaOpUtils.h" +#include "CPUInfoConfig.h" #include "SSE.h" #if OCIO_USE_SSE2 == 0 diff --git a/src/OpenColorIO/ops/gamma/GammaOpData.cpp b/src/OpenColorIO/ops/gamma/GammaOpData.cpp index 6c06389af..8d8725d92 100644 --- a/src/OpenColorIO/ops/gamma/GammaOpData.cpp +++ b/src/OpenColorIO/ops/gamma/GammaOpData.cpp @@ -9,6 +9,8 @@ #include "ops/gamma/GammaOpData.h" #include "ops/range/RangeOpData.h" #include "Platform.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp index a59ec75bc..3e5718d9e 100644 --- a/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp +++ b/src/OpenColorIO/ops/gradinghuecurve/GradingHueCurveOpData.cpp @@ -6,6 +6,8 @@ #include #include "ops/gradinghuecurve/GradingHueCurveOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp index a89cf0289..437838fd2 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpCPU.cpp @@ -7,6 +7,7 @@ #include #include "ops/gradingprimary/GradingPrimaryOpCPU.h" +#include "CPUInfoConfig.h" #include "SSE.h" #if OCIO_USE_SSE2 == 0 diff --git a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp index a2e08a943..4a11fead4 100644 --- a/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp +++ b/src/OpenColorIO/ops/gradingprimary/GradingPrimaryOpData.cpp @@ -7,6 +7,8 @@ #include "ops/gradingprimary/GradingPrimaryOpData.h" #include "ops/range/RangeOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp index 71d7213af..4704272d2 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp @@ -4,6 +4,8 @@ #include #include +#include "CPUInfoConfig.h" + #if OCIO_USE_SSE2 == 0 #include #endif diff --git a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp index 7aee63fc9..a0ee1f703 100644 --- a/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp +++ b/src/OpenColorIO/ops/gradingrgbcurve/GradingRGBCurveOpData.cpp @@ -7,6 +7,7 @@ #include "ops/gradingrgbcurve/GradingRGBCurve.h" #include "ops/gradingrgbcurve/GradingRGBCurveOpData.h" +#include "Mutex.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp index f07519991..8611e50ff 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOpCPU.cpp @@ -9,6 +9,7 @@ #include "MathUtils.h" #include "ops/gradingtone/GradingToneOpCPU.h" +#include "CPUInfoConfig.h" #include "SSE.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp b/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp index e1b5a8a03..a52c3a6b7 100644 --- a/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp +++ b/src/OpenColorIO/ops/gradingtone/GradingToneOpData.cpp @@ -7,6 +7,8 @@ #include "ops/gradingtone/GradingTone.h" #include "ops/gradingtone/GradingToneOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/log/LogOpCPU.cpp b/src/OpenColorIO/ops/log/LogOpCPU.cpp index ca78bd6e5..c15ad987c 100644 --- a/src/OpenColorIO/ops/log/LogOpCPU.cpp +++ b/src/OpenColorIO/ops/log/LogOpCPU.cpp @@ -6,6 +6,9 @@ #include #include #include + +#include "CPUInfoConfig.h" + #if OCIO_USE_SSE2 == 0 #include #endif diff --git a/src/OpenColorIO/ops/log/LogOpData.cpp b/src/OpenColorIO/ops/log/LogOpData.cpp index cf747dbdc..38d8caa8e 100644 --- a/src/OpenColorIO/ops/log/LogOpData.cpp +++ b/src/OpenColorIO/ops/log/LogOpData.cpp @@ -12,6 +12,8 @@ #include "ops/log/LogOpData.h" #include "ops/matrix/MatrixOpData.h" #include "ops/range/RangeOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp index 15cb75b6a..44b62281b 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU.cpp @@ -13,9 +13,9 @@ #include "BitDepthUtils.h" #include "MathUtils.h" #include "ops/lut1d/Lut1DOpCPU.h" +#include "CPUInfo.h" #include "SSE.h" -#include "CPUInfo.h" #include "Lut1DOpCPU_SSE2.h" #include "Lut1DOpCPU_AVX.h" #include "Lut1DOpCPU_AVX2.h" diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp index 51af4a2e3..d245486d4 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.cpp @@ -1,12 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut1DOpCPU_AVX.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX #include #include "AVX.h" +#include "BitDepthUtils.h" + +#include "Lut1DOpCPU_AVX.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.h b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.h index c828169fd..0b781c0ab 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX.h @@ -6,7 +6,7 @@ #include -#include "CPUInfo.h" +#include "CPUInfoConfig.h" typedef void (Lut1DOpCPUApplyFunc)(const float *, const float *, const float *, int, const void *, void *, long); diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp index 87f6088fa..d06427bd0 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.cpp @@ -1,12 +1,18 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut1DOpCPU_AVX2.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX2 #include +#include "OpenColorABI.h" + #include "AVX2.h" +#include "BitDepthUtils.h" + +#include "Lut1DOpCPU_AVX2.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.h b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.h index a3e63d67e..858c44243 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX2.h @@ -4,13 +4,14 @@ #ifndef INCLUDED_OCIO_LUT1DOP_CPU_AVX2_H #define INCLUDED_OCIO_LUT1DOP_CPU_AVX2_H -#include +#include "CPUInfoConfig.h" -#include "CPUInfo.h" +#if OCIO_USE_AVX2 + +#include typedef void (Lut1DOpCPUApplyFunc)(const float *, const float *, const float *, int, const void *, void *, long); -#if OCIO_USE_AVX2 namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp index 94e46c6ca..ca9770319 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.cpp @@ -1,12 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut1DOpCPU_AVX512.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX512 #include +#include "OpenColorABI.h" #include "AVX512.h" +#include "BitDepthUtils.h" + +#include "Lut1DOpCPU_AVX512.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.h b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.h index 2120d7354..1a91c2c34 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_AVX512.h @@ -4,13 +4,15 @@ #ifndef INCLUDED_OCIO_LUT1DOP_CPU_AVX512_H #define INCLUDED_OCIO_LUT1DOP_CPU_AVX512_H -#include -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + +#if OCIO_USE_AVX512 + +#include typedef void (Lut1DOpCPUApplyFunc)(const float *, const float *, const float *, int, const void *, void *, long); -#if OCIO_USE_AVX512 namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp index acad06b9e..cea4a119f 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.cpp @@ -1,11 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut1DOpCPU_SSE2.h" + +#include "CPUInfoConfig.h" #if OCIO_USE_SSE2 +#include "OpenColorABI.h" #include "SSE2.h" +#include "BitDepthUtils.h" + +#include "Lut1DOpCPU_SSE2.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.h b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.h index 9349e7653..79b4e9885 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.h +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpCPU_SSE2.h @@ -4,13 +4,15 @@ #ifndef INCLUDED_OCIO_LUT1DOP_CPU_SSE2_H #define INCLUDED_OCIO_LUT1DOP_CPU_SSE2_H -#include -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + +#if OCIO_USE_SSE2 + +#include typedef void (Lut1DOpCPUApplyFunc)(const float *, const float *, const float *, int, const void *, void *, long); -#if OCIO_USE_SSE2 namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp b/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp index 12941d584..465184f65 100644 --- a/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp +++ b/src/OpenColorIO/ops/lut1d/Lut1DOpData.cpp @@ -17,6 +17,8 @@ #include "ops/lut1d/Lut1DOpData.h" #include "ops/OpTools.h" #include "ops/range/RangeOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp index a287c5cdf..9c98c68af 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.cpp @@ -11,8 +11,8 @@ #include "MathUtils.h" #include "ops/lut3d/Lut3DOpCPU.h" #include "Platform.h" -#include "SSE.h" #include "CPUInfo.h" +#include "SSE.h" #include "Lut3DOpCPU_SSE2.h" #include "Lut3DOpCPU_AVX.h" #include "Lut3DOpCPU_AVX2.h" diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.h b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.h index 7e286ed9d..6ab57ce46 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.h +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU.h @@ -4,8 +4,7 @@ #ifndef INCLUDED_OCIO_LUT3DOP_CPU_H #define INCLUDED_OCIO_LUT3DOP_CPU_H -#include - +#include "OpenColorABI.h" #include "Op.h" #include "ops/lut3d/Lut3DOpData.h" diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.cpp index 8bb7784f2..629f49d5a 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.cpp @@ -1,13 +1,18 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut3DOpCPU_AVX.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX #include "AVX.h" +#include "BitDepthUtils.h" #include +#include "Lut3DOpCPU_AVX.h" + + namespace OCIO_NAMESPACE { namespace { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.h b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.h index abed452ae..8a987591d 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.h +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX.h @@ -4,11 +4,12 @@ #ifndef INCLUDED_OCIO_LUT3DOP_CPU_AVX_H #define INCLUDED_OCIO_LUT3DOP_CPU_AVX_H -#include - -#include "CPUInfo.h" +#include "CPUInfoConfig.h" #if OCIO_USE_AVX + +#include "OpenColorABI.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp index e62ea9b8b..7f5b50c73 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.cpp @@ -1,12 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut3DOpCPU_AVX2.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX2 #include +#include "OpenColorABI.h" + #include "AVX2.h" +#include "BitDepthUtils.h" +#include "Lut3DOpCPU_AVX2.h" namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.h b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.h index 6a8f72395..bc295e7a7 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.h +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX2.h @@ -4,11 +4,12 @@ #ifndef INCLUDED_OCIO_LUT3DOP_CPU_AVX2_H #define INCLUDED_OCIO_LUT3DOP_CPU_AVX2_H -#include - -#include "CPUInfo.h" +#include "CPUInfoConfig.h" #if OCIO_USE_AVX2 + +#include "OpenColorABI.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp index 1486d2bd9..a716e8a32 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.cpp @@ -1,12 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut3DOpCPU_AVX512.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX512 #include #include "AVX512.h" +#include "BitDepthUtils.h" + +#include "Lut3DOpCPU_AVX512.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.h b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.h index 70ff195cd..7ab92b939 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.h +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_AVX512.h @@ -4,11 +4,13 @@ #ifndef INCLUDED_OCIO_LUT3DOP_CPU_AVX512_H #define INCLUDED_OCIO_LUT3DOP_CPU_AVX512_H -#include - -#include "CPUInfo.h" +#include "CPUInfoConfig.h" #if OCIO_USE_AVX512 + +#include "OpenColorABI.h" + + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.cpp index e7b338d36..4bf4e60e8 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.cpp @@ -1,11 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. -#include "Lut3DOpCPU_SSE2.h" +#include "CPUInfoConfig.h" #if OCIO_USE_SSE2 +#include "OpenColorABI.h" +#include "OpenColorTypes.h" #include "SSE2.h" +#include "BitDepthUtils.h" + +#include "Lut3DOpCPU_SSE2.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.h b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.h index 8e6293642..ad2e352b4 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.h +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpCPU_SSE2.h @@ -4,11 +4,12 @@ #ifndef INCLUDED_OCIO_LUT3DOP_CPU_SSE2_H #define INCLUDED_OCIO_LUT3DOP_CPU_SSE2_H -#include - -#include "CPUInfo.h" +#include "CPUInfoConfig.h" #if OCIO_USE_SSE2 + +#include "OpenColorABI.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp b/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp index 008d551c1..fcc7146dc 100644 --- a/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp +++ b/src/OpenColorIO/ops/lut3d/Lut3DOpData.cpp @@ -11,6 +11,8 @@ #include "ops/lut3d/Lut3DOpData.h" #include "ops/OpTools.h" #include "ops/range/RangeOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp b/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp index c090d6b99..76cf37032 100644 --- a/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp +++ b/src/OpenColorIO/ops/matrix/MatrixOpCPU.cpp @@ -4,6 +4,7 @@ #include #include "ops/matrix/MatrixOpCPU.h" +#include "CPUInfoConfig.h" #include "SSE.h" namespace OCIO_NAMESPACE diff --git a/src/OpenColorIO/ops/matrix/MatrixOpData.cpp b/src/OpenColorIO/ops/matrix/MatrixOpData.cpp index 2418787a3..af9d4447e 100644 --- a/src/OpenColorIO/ops/matrix/MatrixOpData.cpp +++ b/src/OpenColorIO/ops/matrix/MatrixOpData.cpp @@ -9,6 +9,8 @@ #include "HashUtils.h" #include "MathUtils.h" #include "ops/matrix/MatrixOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp index 71aa0036c..bb5a8af0a 100644 --- a/src/OpenColorIO/ops/range/RangeOp.cpp +++ b/src/OpenColorIO/ops/range/RangeOp.cpp @@ -1,7 +1,9 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include #include +#include #include diff --git a/src/OpenColorIO/ops/range/RangeOpData.cpp b/src/OpenColorIO/ops/range/RangeOpData.cpp index 237f8003a..b8a17e682 100644 --- a/src/OpenColorIO/ops/range/RangeOpData.cpp +++ b/src/OpenColorIO/ops/range/RangeOpData.cpp @@ -12,6 +12,8 @@ #include "MathUtils.h" #include "fileformats/ctf/IndexMapping.h" #include "ops/range/RangeOpData.h" +#include "Mutex.h" + namespace OCIO_NAMESPACE { diff --git a/src/apps/ociocpuinfo/main.cpp b/src/apps/ociocpuinfo/main.cpp index 7ca16817d..35d235632 100644 --- a/src/apps/ociocpuinfo/main.cpp +++ b/src/apps/ociocpuinfo/main.cpp @@ -3,6 +3,8 @@ #include +#include "OpenColorABI.h" + #include "CPUInfo.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/AVX2_tests.cpp b/tests/cpu/AVX2_tests.cpp index d51840560..64e1430ea 100644 --- a/tests/cpu/AVX2_tests.cpp +++ b/tests/cpu/AVX2_tests.cpp @@ -2,7 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX2 #include diff --git a/tests/cpu/AVX512_tests.cpp b/tests/cpu/AVX512_tests.cpp index a993e4c8d..c35c4b198 100644 --- a/tests/cpu/AVX512_tests.cpp +++ b/tests/cpu/AVX512_tests.cpp @@ -2,7 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX512 #include diff --git a/tests/cpu/AVX_tests.cpp b/tests/cpu/AVX_tests.cpp index 11b5021f0..2867c08f3 100644 --- a/tests/cpu/AVX_tests.cpp +++ b/tests/cpu/AVX_tests.cpp @@ -2,7 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_AVX #include diff --git a/tests/cpu/CPUProcessor_tests.cpp b/tests/cpu/CPUProcessor_tests.cpp index 0611774df..345469879 100644 --- a/tests/cpu/CPUProcessor_tests.cpp +++ b/tests/cpu/CPUProcessor_tests.cpp @@ -8,6 +8,10 @@ #include #include +#include + +#include "BitDepthUtils.h" + #include "CPUProcessor.cpp" #include "testutils/UnitTest.h" diff --git a/tests/cpu/Caching_tests.cpp b/tests/cpu/Caching_tests.cpp index 18865420a..20793744b 100644 --- a/tests/cpu/Caching_tests.cpp +++ b/tests/cpu/Caching_tests.cpp @@ -4,11 +4,15 @@ #include +#include + #include "Caching.cpp" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" #include "Platform.h" +#include "Mutex.h" + namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ConfigUtils_tests.cpp b/tests/cpu/ConfigUtils_tests.cpp index 70f370dad..33c11636e 100644 --- a/tests/cpu/ConfigUtils_tests.cpp +++ b/tests/cpu/ConfigUtils_tests.cpp @@ -5,6 +5,8 @@ #include #include +#include + #include "ConfigUtils.h" #include "testutils/UnitTest.h" diff --git a/tests/cpu/SSE2_tests.cpp b/tests/cpu/SSE2_tests.cpp index 9c876fc86..9c09161d6 100644 --- a/tests/cpu/SSE2_tests.cpp +++ b/tests/cpu/SSE2_tests.cpp @@ -2,7 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. -#include "CPUInfo.h" +#include "CPUInfoConfig.h" + #if OCIO_USE_SSE2 #include diff --git a/tests/cpu/SSE_tests.cpp b/tests/cpu/SSE_tests.cpp index ab6a28bea..e78cdb358 100644 --- a/tests/cpu/SSE_tests.cpp +++ b/tests/cpu/SSE_tests.cpp @@ -1,6 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright Contributors to the OpenColorIO Project. +#include "CPUInfoConfig.h" + #if OCIO_USE_SSE2 diff --git a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp index d6acd4a53..121941af7 100644 --- a/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp +++ b/tests/cpu/apphelpers/MergeConfigsHelpers_tests.cpp @@ -2,14 +2,21 @@ // Copyright Contributors to the OpenColorIO Project. #include +#include #include +#include +#include +#include #include +#include + +#include "apphelpers/mergeconfigs/SectionMerger.h" + #include "apphelpers/mergeconfigs/MergeConfigsHelpers.cpp" #include "UnitTestUtils.h" -#include "ConfigUtils.h" #include "testutils/UnitTest.h" #include "UnitTestLogUtils.h" diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp index 7ff2b65bb..ea153fb9a 100644 --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp @@ -10,6 +10,8 @@ #include +#include + #include "BitDepthUtils.h" #include "fileformats/FileFormatCTF.cpp" #include "ops/fixedfunction/FixedFunctionOp.h" diff --git a/tests/cpu/ops/allocation/AllocationOp_tests.cpp b/tests/cpu/ops/allocation/AllocationOp_tests.cpp index 4c200dd08..22d61ec8a 100644 --- a/tests/cpu/ops/allocation/AllocationOp_tests.cpp +++ b/tests/cpu/ops/allocation/AllocationOp_tests.cpp @@ -7,6 +7,7 @@ #include "ops/allocation/AllocationOp.cpp" #include "testutils/UnitTest.h" +#include "CPUInfoConfig.h" #include "UnitTestUtils.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/cdl/CDLOp_tests.cpp b/tests/cpu/ops/cdl/CDLOp_tests.cpp index 02c734c3d..e280c4d24 100644 --- a/tests/cpu/ops/cdl/CDLOp_tests.cpp +++ b/tests/cpu/ops/cdl/CDLOp_tests.cpp @@ -5,11 +5,16 @@ #include #include +#include + +#include "CPUInfoConfig.h" + #include "ops/cdl/CDLOp.cpp" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" + namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp index 521e3c74b..e2e652b41 100644 --- a/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp +++ b/tests/cpu/ops/exposurecontrast/ExposureContrastOpCPU_tests.cpp @@ -8,6 +8,8 @@ #include #include +#include + #include "ops/exposurecontrast/ExposureContrastOpCPU.cpp" #include "BitDepthUtils.h" diff --git a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp index 0916b93cb..3a862c20c 100644 --- a/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp +++ b/tests/cpu/ops/gamma/GammaOpCPU_tests.cpp @@ -5,8 +5,11 @@ #include #include +#include + #include "ops/gamma/GammaOpCPU.cpp" +#include "CPUInfoConfig.h" #include "MathUtils.h" #include "ops/gamma/GammaOp.h" #include "testutils/UnitTest.h" diff --git a/tests/cpu/ops/gradinghuecurve/GradingHueCurveOp_tests.cpp b/tests/cpu/ops/gradinghuecurve/GradingHueCurveOp_tests.cpp index 1c6e56661..6d97fe633 100644 --- a/tests/cpu/ops/gradinghuecurve/GradingHueCurveOp_tests.cpp +++ b/tests/cpu/ops/gradinghuecurve/GradingHueCurveOp_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpBuilders.h" #include "ops/gradinghuecurve/GradingHueCurveOp.cpp" diff --git a/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp b/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp index 4315729e9..dd112c38a 100644 --- a/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingprimary/GradingPrimaryOpCPU_tests.cpp @@ -4,8 +4,11 @@ #include +#include + #include "ops/gradingprimary/GradingPrimaryOpCPU.cpp" +#include "CPUInfoConfig.h" #include "testutils/UnitTest.h" #include "utils/StringUtils.h" #include "MathUtils.h" diff --git a/tests/cpu/ops/gradingprimary/GradingPrimaryOp_tests.cpp b/tests/cpu/ops/gradingprimary/GradingPrimaryOp_tests.cpp index a513629b4..31eab5dcb 100644 --- a/tests/cpu/ops/gradingprimary/GradingPrimaryOp_tests.cpp +++ b/tests/cpu/ops/gradingprimary/GradingPrimaryOp_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpBuilders.h" #include "ops/gradingprimary/GradingPrimaryOp.cpp" diff --git a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp index 3c65b498c..c4dd98e0a 100644 --- a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOpCPU_tests.cpp @@ -6,8 +6,11 @@ #include #include +#include + #include "ops/gradingrgbcurve/GradingRGBCurveOpCPU.cpp" +#include "CPUInfoConfig.h" #include "testutils/UnitTest.h" #include "utils/StringUtils.h" #include "MathUtils.h" diff --git a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOp_tests.cpp b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOp_tests.cpp index 755a047f2..fba100162 100644 --- a/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOp_tests.cpp +++ b/tests/cpu/ops/gradingrgbcurve/GradingRGBCurveOp_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpBuilders.h" #include "ops/gradingrgbcurve/GradingRGBCurveOp.cpp" diff --git a/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp b/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp index e44494494..fb9d65982 100644 --- a/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp +++ b/tests/cpu/ops/gradingtone/GradingToneOpCPU_tests.cpp @@ -4,8 +4,11 @@ #include #include +#include + #include "ops/gradingtone/GradingToneOpCPU.cpp" +#include "CPUInfoConfig.h" #include "testutils/UnitTest.h" #include "utils/StringUtils.h" diff --git a/tests/cpu/ops/log/LogOpCPU_tests.cpp b/tests/cpu/ops/log/LogOpCPU_tests.cpp index 53ecfbc8f..1a93faf6d 100644 --- a/tests/cpu/ops/log/LogOpCPU_tests.cpp +++ b/tests/cpu/ops/log/LogOpCPU_tests.cpp @@ -7,8 +7,11 @@ #include #include +#include + #include "ops/log/LogOpCPU.cpp" +#include "CPUInfoConfig.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" diff --git a/tests/cpu/ops/log/LogOp_tests.cpp b/tests/cpu/ops/log/LogOp_tests.cpp index 3b9d02553..14e9b84a4 100644 --- a/tests/cpu/ops/log/LogOp_tests.cpp +++ b/tests/cpu/ops/log/LogOp_tests.cpp @@ -2,11 +2,15 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "ops/log/LogOp.cpp" +#include "CPUInfoConfig.h" #include "testutils/UnitTest.h" #include "UnitTestUtils.h" + namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp b/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp index 2f3ccb214..279b66584 100644 --- a/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp +++ b/tests/cpu/ops/lut1d/Lut1DOp_tests.cpp @@ -4,6 +4,8 @@ #include +#include + #include "ops/lut1d/Lut1DOp.cpp" #include "OpBuilders.h" diff --git a/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp b/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp index 36ff8ea38..f1980d797 100644 --- a/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp +++ b/tests/cpu/ops/lut3d/Lut3DOp_tests.cpp @@ -9,6 +9,8 @@ #include #endif +#include + #include "ops/matrix/MatrixOp.h" #include "OpBuilders.h" #include "ops/lut3d/Lut3DOp.cpp" diff --git a/tests/cpu/transforms/CDLTransform_tests.cpp b/tests/cpu/transforms/CDLTransform_tests.cpp index 82da6ca6d..34333a639 100644 --- a/tests/cpu/transforms/CDLTransform_tests.cpp +++ b/tests/cpu/transforms/CDLTransform_tests.cpp @@ -7,6 +7,8 @@ #include #include +#include + #include "ops/exponent/ExponentOp.h" #include "ops/matrix/MatrixOpData.h" #include "transforms/CDLTransform.cpp" diff --git a/tests/cpu/transforms/ExponentTransform_tests.cpp b/tests/cpu/transforms/ExponentTransform_tests.cpp index ca528163a..bc3ba5b33 100644 --- a/tests/cpu/transforms/ExponentTransform_tests.cpp +++ b/tests/cpu/transforms/ExponentTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpBuilders.h" #include "ops/exponent/ExponentOp.h" #include "transforms/ExponentTransform.cpp" diff --git a/tests/cpu/transforms/LogAffineTransform_tests.cpp b/tests/cpu/transforms/LogAffineTransform_tests.cpp index aae13125e..8e3220e3b 100644 --- a/tests/cpu/transforms/LogAffineTransform_tests.cpp +++ b/tests/cpu/transforms/LogAffineTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpBuilders.h" #include "ops/log/LogOp.h" #include "transforms/LogAffineTransform.cpp" diff --git a/tests/cpu/transforms/LogCameraTransform_tests.cpp b/tests/cpu/transforms/LogCameraTransform_tests.cpp index 256be1064..db1f45ec5 100644 --- a/tests/cpu/transforms/LogCameraTransform_tests.cpp +++ b/tests/cpu/transforms/LogCameraTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "OpBuilders.h" #include "ops/log/LogOp.h" #include "transforms/LogCameraTransform.cpp" diff --git a/tests/cpu/transforms/LogTransform_tests.cpp b/tests/cpu/transforms/LogTransform_tests.cpp index e952d5b84..85025b932 100644 --- a/tests/cpu/transforms/LogTransform_tests.cpp +++ b/tests/cpu/transforms/LogTransform_tests.cpp @@ -2,6 +2,8 @@ // Copyright Contributors to the OpenColorIO Project. +#include + #include "transforms/LogTransform.cpp" #include "OpBuilders.h" diff --git a/tests/gpu/FixedFunctionOp_test.cpp b/tests/gpu/FixedFunctionOp_test.cpp index 5a41f7cbd..dea5915b5 100644 --- a/tests/gpu/FixedFunctionOp_test.cpp +++ b/tests/gpu/FixedFunctionOp_test.cpp @@ -2,12 +2,12 @@ // Copyright Contributors to the OpenColorIO Project. - #include #include #include +#include "CPUInfoConfig.h" #include "GPUUnitTest.h" diff --git a/tests/gpu/GPUUnitTest.h b/tests/gpu/GPUUnitTest.h index 5d5711e23..98c815579 100644 --- a/tests/gpu/GPUUnitTest.h +++ b/tests/gpu/GPUUnitTest.h @@ -10,7 +10,8 @@ #include #include -#include "CPUInfoConfig.h" +#include + class OCIOGPUTest; diff --git a/tests/gpu/GammaOp_test.cpp b/tests/gpu/GammaOp_test.cpp index 52dd092f0..1929b08d7 100644 --- a/tests/gpu/GammaOp_test.cpp +++ b/tests/gpu/GammaOp_test.cpp @@ -3,6 +3,7 @@ #include +#include "CPUInfoConfig.h" #include "GPUUnitTest.h" namespace OCIO = OCIO_NAMESPACE; diff --git a/tests/gpu/LogOp_test.cpp b/tests/gpu/LogOp_test.cpp index f2ad49fe7..65d804bdf 100644 --- a/tests/gpu/LogOp_test.cpp +++ b/tests/gpu/LogOp_test.cpp @@ -5,6 +5,7 @@ #include +#include "CPUInfoConfig.h" #include "GPUUnitTest.h" namespace OCIO = OCIO_NAMESPACE; From 1907478050e8846df5bfbb6d50cf50193e8f1589 Mon Sep 17 00:00:00 2001 From: Kevin Wheatley Date: Wed, 28 Jan 2026 14:38:07 +0000 Subject: [PATCH 48/48] Add include for snprintf Signed-off-by: Kevin Wheatley --- src/OpenColorIO/CPUInfo.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/OpenColorIO/CPUInfo.cpp b/src/OpenColorIO/CPUInfo.cpp index 869cc81a7..e573519e4 100644 --- a/src/OpenColorIO/CPUInfo.cpp +++ b/src/OpenColorIO/CPUInfo.cpp @@ -5,6 +5,10 @@ #include "CPUInfo.h" #include +#if defined(__aarch64__) || defined(_M_ARM64) // ARM 64-bit processor (multiple platforms) +#include +#endif + #if _WIN32 #include #include