Move NumberUtils to the OCIO namespace

Signed-off-by: L. E. Segovia <[email protected]>
AcademySoftwareFoundation · Nov 11, 2021 · e88bfc0 · e88bfc0
1 parent 9a97690
commit e88bfc0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/OpenColorIO/ParseUtils.cpp b/src/OpenColorIO/ParseUtils.cpp
@@ -555,7 +555,7 @@ bool StringToFloat(float * fval, const char * str)
     if(!str) return false;
 
     float x = NAN;
-    const auto result = NumberUtils::from_chars(str, str + strlen(str), x);
+    const auto result = OCIO_NAMESPACE::from_chars(str, str + strlen(str), x);
     if (result.ec != std::errc())
     {
         return false;
@@ -610,7 +610,7 @@ bool StringVecToFloatVec(std::vector<float> &floatArray, const StringUtils::Stri
     {
         float x = NAN;
         const char *str = lineParts[i].c_str();
-        const auto result = NumberUtils::from_chars(str, str + strlen(str), x);
+        const auto result = OCIO_NAMESPACE::from_chars(str, str + strlen(str), x);
         if (result.ec != std::errc())
         {
             return false;

diff --git a/src/OpenColorIO/fileformats/FileFormatHDL.cpp b/src/OpenColorIO/fileformats/FileFormatHDL.cpp
@@ -184,7 +184,7 @@ readLuts(std::istream& istream,
         else if(inlut)
         {
             float v{};
-            const auto result = NumberUtils::from_chars(word.c_str(), word.c_str() + word.size(), v);
+            const auto result = OCIO_NAMESPACE::from_chars(word.c_str(), word.c_str() + word.size(), v);
 
             if (result.ec == std::errc())
             {

diff --git a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
@@ -419,7 +419,7 @@ class XMLParserHelper
 
             long int size_3d{};
 
-            const auto result = NumberUtils::from_chars(size_clean.c_str(), size_clean.c_str() + size_clean.size(), size_3d);
+            const auto result = OCIO_NAMESPACE::from_chars(size_clean.c_str(), size_clean.c_str() + size_clean.size(), size_3d);
 
             if (result.ec != std::errc())
             {

diff --git a/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp b/src/OpenColorIO/fileformats/FileFormatSpi1D.cpp
@@ -138,8 +138,8 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
                 }
                 else
                 {
-                    const auto fromMinAnswer = NumberUtils::from_chars(fromMinS, fromMinS + 64, from_min);
-                    const auto fromMaxAnswer = NumberUtils::from_chars(fromMaxS, fromMaxS + 64, from_max);
+                    const auto fromMinAnswer = OCIO_NAMESPACE::from_chars(fromMinS, fromMinS + 64, from_min);
+                    const auto fromMaxAnswer = OCIO_NAMESPACE::from_chars(fromMaxS, fromMaxS + 64, from_max);
 
                     if (fromMinAnswer.ec != std::errc() || fromMaxAnswer.ec != std::errc())
                     {
@@ -238,7 +238,7 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
                 for (int i = 0; i < components; i++)
                 {
                     float v = NAN;
-                    const auto result = NumberUtils::from_chars(inputLUT[i], inputLUT[i] + strlen(inputLUT[i]), v);
+                    const auto result = OCIO_NAMESPACE::from_chars(inputLUT[i], inputLUT[i] + strlen(inputLUT[i]), v);
 
                     if (result.ec != std::errc())
                     {

diff --git a/src/OpenColorIO/fileformats/FileFormatSpi3D.cpp b/src/OpenColorIO/fileformats/FileFormatSpi3D.cpp
@@ -159,9 +159,9 @@ CachedFileRcPtr LocalFileFormat::read(std::istream & istream,
             redValueS, greenValueS, blueValueS) == 6)
 #endif
         {
-            const auto redValueAnswer = NumberUtils::from_chars(redValueS, redValueS + 64, redValue);
-            const auto greenValueAnswer = NumberUtils::from_chars(greenValueS, greenValueS + 64, greenValue);
-            const auto blueValueAnswer = NumberUtils::from_chars(blueValueS, blueValueS + 64, blueValue);
+            const auto redValueAnswer = OCIO_NAMESPACE::from_chars(redValueS, redValueS + 64, redValue);
+            const auto greenValueAnswer = OCIO_NAMESPACE::from_chars(greenValueS, greenValueS + 64, greenValue);
+            const auto blueValueAnswer = OCIO_NAMESPACE::from_chars(blueValueS, blueValueS + 64, blueValue);
 
             if (redValueAnswer.ec != std::errc()
                 || greenValueAnswer.ec != std::errc()

diff --git a/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h b/src/OpenColorIO/fileformats/xmlutils/XMLReaderUtils.h
@@ -164,7 +164,7 @@ void ParseNumber(const char * str, size_t startPos, size_t endPos, T & value)
 
     FindSubString(startParse, endPos - startPos, adjustedStartPos, adjustedEndPos);
 
-    const auto result = NumberUtils::from_chars(startParse + adjustedStartPos, startParse + adjustedEndPos, val);
+    const auto result = OCIO_NAMESPACE::from_chars(startParse + adjustedStartPos, startParse + adjustedEndPos, val);
 
     value = (T)val;
 

diff --git a/src/utils/NumberUtils.h b/src/utils/NumberUtils.h
@@ -19,7 +19,7 @@
 #include <system_error>
 #include <type_traits>
 
-namespace NumberUtils
+namespace OCIO_NAMESPACE
 {
 
 struct Locale