Tidy/unused includes

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";
    }
 
 

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

include/OpenColorIO/OpenColorIO.h

@@ -10,10 +10,10 @@
 #include <limits>
 #include <stdexcept>
 #include <string>
-#include <fstream>
 #include <vector>
 #include <cstdint>
 #include <map>
+#include <functional>
 
 #include "OpenColorABI.h"
 #include "OpenColorTypes.h"
@@ -53,7 +53,7 @@ C++ API
    }
    catch(OCIO::Exception & exception)
    {
-       std::cerr << "OpenColorIO Error: " << exception.what() << std::endl;
+       std::cerr << "OpenColorIO Error: " << exception.what() << "\n";
    }
 
 */

include/OpenColorIO/OpenColorTransforms.h

@@ -6,7 +6,6 @@
 #define INCLUDED_OCIO_OPENCOLORTRANSFORMS_H
 
 #include <initializer_list>
-#include <limits>
 
 #include "OpenColorTypes.h"
 

include/OpenColorIO/OpenColorTypes.h

@@ -12,7 +12,6 @@
 #endif
 
 #include <array>
-#include <limits>
 #include <string>
 #include <functional>
 

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

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 = {

src/OpenColorIO/AVX.h

@@ -6,11 +6,16 @@
 #define INCLUDED_OCIO_AVX_H
 
 #include "CPUInfo.h"
+
 #if OCIO_USE_AVX
 
 #include <immintrin.h>
 
-#include <OpenColorIO/OpenColorIO.h>
+#if OCIO_USE_F16C
+#include <Imath/half.h>
+#endif
+
+#include "OpenColorABI.h"
 #include "BitDepthUtils.h"
 
 // Macros for alignment declarations

src/OpenColorIO/AVX2.h

@@ -10,7 +10,11 @@
 
 #include <immintrin.h>
 
-#include <OpenColorIO/OpenColorIO.h>
+#if OCIO_USE_F16C
+#include <Imath/half.h>
+#endif
+
+#include "OpenColorABI.h"
 #include "BitDepthUtils.h"
 
 // Macros for alignment declarations

src/OpenColorIO/AVX512.h

@@ -10,7 +10,9 @@
 
 #include <immintrin.h>
 
-#include <OpenColorIO/OpenColorIO.h>
+#include <Imath/half.h>
+
+#include "OpenColorABI.h"
 #include "BitDepthUtils.h"
 
 // Macros for alignment declarations

src/OpenColorIO/Baker.cpp

@@ -2,13 +2,15 @@
 // Copyright Contributors to the OpenColorIO Project.
 
 
-#include <iostream>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <exception>
 
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "transforms/FileTransform.h"
 #include "BakingUtils.h"
-#include "MathUtils.h"
 
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/BakingUtils.cpp

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright Contributors to the OpenColorIO Project.
 
+#include <string>
+#include <algorithm>
+
 #include "BakingUtils.h"
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/BitDepthUtils.cpp

@@ -2,6 +2,8 @@
 // Copyright Contributors to the OpenColorIO Project.
 
 
+#include <string>
+
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "BitDepthUtils.h"

src/OpenColorIO/CPUInfo.cpp

@@ -3,15 +3,19 @@
 
 
 #include "CPUInfo.h"
-#include <string.h>
+#include <cstring>
+
+#if defined(__aarch64__) || defined(_M_ARM64) // ARM 64-bit processor (multiple platforms)
+#include <stdio.h>
+#endif
 
 #if _WIN32
 #include <limits.h>
 #include <intrin.h>
 typedef unsigned __int32  uint32_t;
 typedef __int64  int64_t;
 #else
-#include <stdint.h>
+#include <cstdint>
 #endif
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/CPUInfo.h

@@ -5,7 +5,8 @@
 #ifndef CPUInfo_H
 #define CPUInfo_H
 
-#include <OpenColorIO/OpenColorIO.h>
+#include "OpenColorABI.h"
+
 #include "CPUInfoConfig.h"
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/CPUProcessor.cpp

@@ -1,17 +1,18 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright Contributors to the OpenColorIO Project.
 
-#include <string.h>
+#include <cstring>
+#include <sstream>
+#include <memory>
 
 #include <OpenColorIO/OpenColorIO.h>
 
 #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"
+#include "Mutex.h"
 
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/CPUProcessor.h

@@ -9,6 +9,7 @@
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "Op.h"
+#include "Mutex.h"
 
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/ColorSpace.cpp

@@ -3,14 +3,16 @@
 
 #include <cstring>
 #include <sstream>
+#include <ostream>
 #include <vector>
+#include <array>
 #include <map>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
 #include "TokensManager.h"
 #include "Platform.h"
-#include "PrivateTypes.h"
 #include "utils/StringUtils.h"
 
 
@@ -255,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());
         }
 
@@ -273,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());
             }
 
@@ -283,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());
             }
         }

src/OpenColorIO/ColorSpaceSet.cpp

@@ -3,10 +3,10 @@
 
 #include <sstream>
 #include <string>
+#include <vector>
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "PrivateTypes.h"
 #include "utils/StringUtils.h"
 
 

src/OpenColorIO/Config.cpp

@@ -11,12 +11,13 @@
 #include <vector>
 #include <regex>
 #include <functional>
+#include <algorithm>
+#include <exception>
 
 #include <pystring.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "builtinconfigs/BuiltinConfigRegistry.h"
 #include "ConfigUtils.h"
 #include "ContextVariableUtils.h"
 #include "Display.h"
@@ -27,20 +28,18 @@
 #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"
 
+
 namespace OCIO_NAMESPACE
 {
 
@@ -155,15 +154,15 @@ void GetFileReferences(std::set<std::string> & files, const ConstTransformRcPtr
 {
     if(!transform) return;
 
-    if(ConstGroupTransformRcPtr groupTransform = \
+    if(ConstGroupTransformRcPtr groupTransform =
         DynamicPtrCast<const GroupTransform>(transform))
     {
         for(int i=0; i<groupTransform->getNumTransforms(); ++i)
         {
             GetFileReferences(files, groupTransform->getTransform(i));
         }
     }
-    else if(ConstFileTransformRcPtr fileTransform = \
+    else if(ConstFileTransformRcPtr fileTransform =
         DynamicPtrCast<const FileTransform>(transform))
     {
         files.insert(fileTransform->getSrc());
@@ -179,26 +178,26 @@ void GetColorSpaceReferences(std::set<std::string> & colorSpaceNames,
 {
     if(!transform) return;
 
-    if(ConstGroupTransformRcPtr groupTransform = \
+    if(ConstGroupTransformRcPtr groupTransform =
         DynamicPtrCast<const GroupTransform>(transform))
     {
         for(int i=0; i<groupTransform->getNumTransforms(); ++i)
         {
             GetColorSpaceReferences(colorSpaceNames, groupTransform->getTransform(i), context);
         }
     }
-    else if(ConstColorSpaceTransformRcPtr colorSpaceTransform = \
+    else if(ConstColorSpaceTransformRcPtr colorSpaceTransform =
         DynamicPtrCast<const ColorSpaceTransform>(transform))
     {
         colorSpaceNames.insert(context->resolveStringVar(colorSpaceTransform->getSrc()));
         colorSpaceNames.insert(context->resolveStringVar(colorSpaceTransform->getDst()));
     }
-    else if(ConstDisplayViewTransformRcPtr displayViewTransform = \
+    else if(ConstDisplayViewTransformRcPtr displayViewTransform =
         DynamicPtrCast<const DisplayViewTransform>(transform))
     {
         colorSpaceNames.insert(displayViewTransform->getSrc());
     }
-    else if(ConstLookTransformRcPtr lookTransform = \
+    else if(ConstLookTransformRcPtr lookTransform =
         DynamicPtrCast<const LookTransform>(transform))
     {
         colorSpaceNames.insert(lookTransform->getSrc());