Reduce dependency on BitDepthUtils.h , prefer cmath over math.h

Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>

Author: KevinJW

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

@@ -11,7 +11,7 @@
 typedef unsigned __int32  uint32_t;
 typedef __int64  int64_t;
 #else
-#include <stdint.h>
+#include <cstdint>
 #endif
 
 namespace OCIO_NAMESPACE

src/OpenColorIO/CPUProcessor.cpp

@@ -3,6 +3,7 @@
 
 #include <cstring>
 #include <sstream>
+#include <memory>
 
 #include <OpenColorIO/OpenColorIO.h>
 

src/OpenColorIO/GpuShaderUtils.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright Contributors to the OpenColorIO Project.
 
-#include <math.h>
+#include <cmath>
 #include <limits>
 #include <sstream>
 

src/OpenColorIO/ImageDesc.cpp

@@ -2,7 +2,8 @@
 // Copyright Contributors to the OpenColorIO Project.
 
 #include <cstdlib>
-#include <math.h>
+#include <cmath>
+#include <string>
 #include <ostream>
 
 #include <OpenColorIO/OpenColorIO.h>

src/OpenColorIO/ImagePacking.cpp

@@ -4,7 +4,8 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "BitDepthUtils.h"
+#include <IMath/half.h>
+
 #include "ImagePacking.h"
 
 

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

src/OpenColorIO/fileformats/FileFormat3DL.cpp

@@ -4,7 +4,10 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
+#include <string>
 #include <sstream>
+#include <iostream>
+#include <memory>
 
 #include <OpenColorIO/OpenColorIO.h>
 

src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp

@@ -4,8 +4,10 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
+#include <string>
 #include <sstream>
 #include <istream>
+#include <memory>
 
 #include <pystring.h>
 

src/OpenColorIO/ops/OpTools.cpp

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 // Copyright Contributors to the OpenColorIO Project.
 
+#include <vector>
+
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "BitDepthUtils.h"
 #include "ops/OpTools.h"
 
 namespace OCIO_NAMESPACE