1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
--- a/share/cmake/modules/Findpystring.cmake
+++ b/share/cmake/modules/Findpystring.cmake
@@ -29,7 +29,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
# Find include directory
find_path(pystring_INCLUDE_DIR
NAMES
- pystring/pystring.h
+ pystring.h
HINTS
${pystring_ROOT}
PATH_SUFFIXES
--- a/src/OpenColorIO/Context.cpp
+++ b/src/OpenColorIO/Context.cpp
@@ -14,7 +14,7 @@
#include "Mutex.h"
#include "PathUtils.h"
#include "PrivateTypes.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "utils/StringUtils.h"
--- a/src/OpenColorIO/OCIOYaml.cpp
+++ b/src/OpenColorIO/OCIOYaml.cpp
@@ -19,7 +19,7 @@
#include "ParseUtils.h"
#include "PathUtils.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "utils/StringUtils.h"
#include "ViewingRules.h"
#include "yaml-cpp/yaml.h"
--- a/src/OpenColorIO/Op.cpp
+++ b/src/OpenColorIO/Op.cpp
@@ -20,7 +20,7 @@
#include "ops/lut1d/Lut1DOp.h"
#include "ops/lut3d/Lut3DOp.h"
#include "ops/range/RangeOp.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
namespace OCIO_NAMESPACE
{
--- a/src/OpenColorIO/PathUtils.cpp
+++ b/src/OpenColorIO/PathUtils.cpp
@@ -10,7 +10,7 @@
#include "Mutex.h"
#include "PathUtils.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "utils/StringUtils.h"
#if !defined(_WIN32)
--- a/src/OpenColorIO/fileformats/FileFormatCTF.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatCTF.cpp
@@ -22,7 +22,7 @@
#include "OpBuilders.h"
#include "ops/noop/NoOps.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "TransformBuilder.h"
#include "transforms/FileTransform.h"
#include "utils/StringUtils.h"
--- a/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp
@@ -16,7 +16,7 @@
#include "ops/lut1d/Lut1DOp.h"
#include "ops/lut3d/Lut3DOp.h"
#include "ParseUtils.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "Platform.h"
#include "transforms/FileTransform.h"
#include "utils/StringUtils.h"
--- a/src/OpenColorIO/fileformats/FileFormatICC.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatICC.cpp
@@ -12,7 +12,7 @@
#include "ops/gamma/GammaOp.h"
#include "ops/lut1d/Lut1DOp.h"
#include "ops/matrix/MatrixOp.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "transforms/FileTransform.h"
--- a/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
+++ b/src/OpenColorIO/fileformats/FileFormatIridasLook.cpp
@@ -13,7 +13,7 @@
#include "ops/lut3d/Lut3DOp.h"
#include "ParseUtils.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "transforms/FileTransform.h"
#include "utils/StringUtils.h"
#include "utils/NumberUtils.h"
--- a/src/OpenColorIO/transforms/FileTransform.cpp
+++ b/src/OpenColorIO/transforms/FileTransform.cpp
@@ -17,7 +17,7 @@
#include "ops/noop/NoOps.h"
#include "PathUtils.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "utils/StringUtils.h"
--- a/tests/cpu/Config_tests.cpp
+++ b/tests/cpu/Config_tests.cpp
@@ -7,7 +7,7 @@
#include "Config.cpp"
#include "utils/StringUtils.h"
-#include <pystring/pystring.h>
+#include <pystring.h>
#include "testutils/UnitTest.h"
#include "UnitTestLogUtils.h"
#include "UnitTestUtils.h"
--- a/tests/cpu/Context_tests.cpp
+++ b/tests/cpu/Context_tests.cpp
@@ -8,7 +8,7 @@
#include "PathUtils.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
#include "testutils/UnitTest.h"
namespace OCIO = OCIO_NAMESPACE;
--- a/tests/cpu/UnitTestUtils.h
+++ b/tests/cpu/UnitTestUtils.h
@@ -12,7 +12,7 @@
#include "MathUtils.h"
#include "Op.h"
#include "Platform.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
namespace OCIO_NAMESPACE
{
--- a/vendor/openfx/OCIOUtils.cpp
+++ b/vendor/openfx/OCIOUtils.cpp
@@ -9,7 +9,7 @@ namespace OCIO = OCIO_NAMESPACE;
#include <vector>
#include "ofxsLog.h"
-#include "pystring/pystring.h"
+#include "pystring.h"
namespace
{
|
