Skip to content

Commit 4261c80

Browse files
KevinJWKevinJW
committed
More continuation character removal
Signed-off-by: Kevin Wheatley <kevin.wheatley@framestore.com>
1 parent 040eed5 commit 4261c80

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎tests/cpu/builtinconfigs/BuiltinConfig_tests.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
3131

3232
OCIO_CHECK_EQUAL(
3333
std::string(registry.getBuiltinConfigUIName(cfgidx)),
34-
std::string("Academy Color Encoding System - CG Config [COLORSPACES v1.0.0] "\
34+
std::string("Academy Color Encoding System - CG Config [COLORSPACES v1.0.0] "
3535
"[ACES v1.3] [OCIO v2.1]")
3636
);
3737

@@ -60,7 +60,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
6060

6161
OCIO_CHECK_EQUAL(
6262
std::string(registry.getBuiltinConfigUIName(cfgidx)),
63-
std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.0.0] "\
63+
std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.0.0] "
6464
"[ACES v1.3] [OCIO v2.3]")
6565
);
6666

@@ -89,7 +89,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
8989

9090
OCIO_CHECK_EQUAL(
9191
std::string(registry.getBuiltinConfigUIName(cfgidx)),
92-
std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.2.0] "\
92+
std::string("Academy Color Encoding System - CG Config [COLORSPACES v2.2.0] "
9393
"[ACES v1.3] [OCIO v2.4]")
9494
);
9595

@@ -118,7 +118,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
118118

119119
OCIO_CHECK_EQUAL(
120120
std::string(registry.getBuiltinConfigUIName(cfgidx)),
121-
std::string("Academy Color Encoding System - CG Config [COLORSPACES v4.0.0] "\
121+
std::string("Academy Color Encoding System - CG Config [COLORSPACES v4.0.0] "
122122
"[ACES v2.0] [OCIO v2.5]")
123123
);
124124

@@ -147,7 +147,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
147147

148148
OCIO_CHECK_EQUAL(
149149
std::string(registry.getBuiltinConfigUIName(cfgidx)),
150-
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v1.0.0] "\
150+
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v1.0.0] "
151151
"[ACES v1.3] [OCIO v2.1]")
152152
);
153153

@@ -176,7 +176,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
176176

177177
OCIO_CHECK_EQUAL(
178178
std::string(registry.getBuiltinConfigUIName(cfgidx)),
179-
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.0.0] "\
179+
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.0.0] "
180180
"[ACES v1.3] [OCIO v2.3]")
181181
);
182182

@@ -205,7 +205,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
205205

206206
OCIO_CHECK_EQUAL(
207207
std::string(registry.getBuiltinConfigUIName(cfgidx)),
208-
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.2.0] "\
208+
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v2.2.0] "
209209
"[ACES v1.3] [OCIO v2.4]")
210210
);
211211

@@ -234,7 +234,7 @@ OCIO_ADD_TEST(BuiltinConfigs, basic)
234234

235235
OCIO_CHECK_EQUAL(
236236
std::string(registry.getBuiltinConfigUIName(cfgidx)),
237-
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v4.0.0] "\
237+
std::string("Academy Color Encoding System - Studio Config [COLORSPACES v4.0.0] "
238238
"[ACES v2.0] [OCIO v2.5]")
239239
);
240240

‎tests/cpu/transforms/GradingPrimaryTransform_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,10 @@ OCIO_ADD_TEST(GradingPrimaryTransform, serialization)
347347
primary->setValue(data);
348348

349349
static constexpr char PRIMARY_STR[]
350-
= "<GradingPrimaryTransform direction=forward, style=log, "\
351-
"values=<brightness=<r=0, g=0, b=0, m=0>, contrast=<r=1, g=1, b=1, m=1>, "\
352-
"gamma=<r=1.1, g=1.2, b=1.3, m=1>, offset=<r=0, g=0, b=0, m=0>, "\
353-
"exposure=<r=0, g=0, b=0, m=0>, lift=<r=0, g=0, b=0, m=0>, "\
350+
= "<GradingPrimaryTransform direction=forward, style=log, "
351+
"values=<brightness=<r=0, g=0, b=0, m=0>, contrast=<r=1, g=1, b=1, m=1>, "
352+
"gamma=<r=1.1, g=1.2, b=1.3, m=1>, offset=<r=0, g=0, b=0, m=0>, "
353+
"exposure=<r=0, g=0, b=0, m=0>, lift=<r=0, g=0, b=0, m=0>, "
354354
"gain=<r=1, g=1, b=1, m=1>, saturation=1, pivot=<contrast=-0.2, black=0, white=1>>>";
355355

356356
{

‎tests/cpu/transforms/GradingRGBCurveTransform_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ OCIO_ADD_TEST(GradingRGBCurveTransform, serialization)
244244
curve->setValue(data);
245245

246246
static constexpr char CURVE_STR[]
247-
= "<GradingRGBCurveTransform direction=forward, style=log, "\
248-
"values=<red=<control_points=[<x=0, y=0><x=0.2, y=0.2><x=0.5, y=0.7><x=1, y=1>]>, "\
249-
"green=<control_points=[<x=0, y=0.5><x=0.3, y=0.7><x=0.5, y=1.1><x=1, y=1.5>]>, "\
250-
"blue=<control_points=[<x=0, y=-0.5><x=0.2, y=-0.4><x=0.3, y=0.1><x=0.5, y=0.4><x=0.7, y=0.9><x=1, y=1.1>]>, "\
247+
= "<GradingRGBCurveTransform direction=forward, style=log, "
248+
"values=<red=<control_points=[<x=0, y=0><x=0.2, y=0.2><x=0.5, y=0.7><x=1, y=1>]>, "
249+
"green=<control_points=[<x=0, y=0.5><x=0.3, y=0.7><x=0.5, y=1.1><x=1, y=1.5>]>, "
250+
"blue=<control_points=[<x=0, y=-0.5><x=0.2, y=-0.4><x=0.3, y=0.1><x=0.5, y=0.4><x=0.7, y=0.9><x=1, y=1.1>]>, "
251251
"master=<control_points=[<x=0, y=0><x=1, y=1>]>>>";
252252

253253
{

‎tests/cpu/transforms/GradingToneTransform_tests.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ OCIO_ADD_TEST(GradingToneTransform, serialization)
6666
tone->setValue(data);
6767

6868
static constexpr char TONE_STR[]
69-
= "<GradingToneTransform direction=forward, style=linear, values=<"\
70-
"blacks=<red=1.321 green=1 blue=1 master=1 start=0.1 width=4> "\
71-
"shadows=<red=1 green=1 blue=1 master=1 start=2 width=-7> "\
72-
"midtones=<red=1 green=1 blue=1 master=1 start=0 width=8> "\
73-
"highlights=<red=1 green=1 blue=1 master=1 start=-2 width=9> "\
69+
= "<GradingToneTransform direction=forward, style=linear, values=<"
70+
"blacks=<red=1.321 green=1 blue=1 master=1 start=0.1 width=4> "
71+
"shadows=<red=1 green=1 blue=1 master=1 start=2 width=-7> "
72+
"midtones=<red=1 green=1 blue=1 master=1 start=0 width=8> "
73+
"highlights=<red=1 green=1 blue=1 master=1 start=-2 width=9> "
7474
"whites=<red=1 green=1 blue=1 master=1 start=0 width=8> s_contrast=1.123>>";
7575

7676
{

‎tests/cpu/transforms/builtins/BuiltinTransformRegistry_tests.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ active_views: []
264264

265265
OCIO_CHECK_THROW_WHAT(OCIO::Config::CreateFromStream(iss),
266266
OCIO::Exception,
267-
"Only config version 2.1 (or higher) can have BuiltinTransform style "\
267+
"Only config version 2.1 (or higher) can have BuiltinTransform style "
268268
"'ACES-LMT - ACES 1.3 Reference Gamut Compression'.");
269269
}
270270

@@ -308,7 +308,7 @@ active_views: []
308308

309309
OCIO_CHECK_THROW_WHAT(OCIO::Config::CreateFromStream(iss),
310310
OCIO::Exception,
311-
"Only config version 2.2 (or higher) can have BuiltinTransform style "\
311+
"Only config version 2.2 (or higher) can have BuiltinTransform style "
312312
"'ARRI_LOGC4_to_ACES2065-1'.");
313313
}
314314

‎tests/gpu/Config_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ OCIO_ADD_GPU_TEST(Config, arbitrary_generic_shader)
123123
" - !<FileTransform> {src: lut1d_1.spi1d, interpolation: linear}\n"
124124
" - !<FileTransform> {src: lut1d_2.spi1d, interpolation: linear}\n"
125125
" - !<LogTransform> {base: 10}\n"
126-
" - !<MatrixTransform> {matrix: [0.075573, 0.022197, 0.00223, 0, "\
127-
"0.005901, 0.096928, -0.002829, 0, "\
128-
"0.016134, 0.007406, 0.07646, 0, "\
126+
" - !<MatrixTransform> {matrix: [0.075573, 0.022197, 0.00223, 0, "
127+
"0.005901, 0.096928, -0.002829, 0, "
128+
"0.016134, 0.007406, 0.07646, 0, "
129129
"0, 0, 0, 1]}\n";
130130

131131
std::istringstream is;
@@ -194,9 +194,9 @@ OCIO_ADD_GPU_TEST(Config, with_underscores)
194194
" allocationvars: [0, 1]\n"
195195
" from_reference: !<GroupTransform>\n"
196196
" children:\n"
197-
" - !<MatrixTransform> {matrix: [0.075573, 0.022197, 0.00223, 0, "\
198-
"0.005901, 0.096928, -0.002829, 0, "\
199-
"0.016134, 0.007406, 0.07646, 0, "\
197+
" - !<MatrixTransform> {matrix: [0.075573, 0.022197, 0.00223, 0, "
198+
"0.005901, 0.096928, -0.002829, 0, "
199+
"0.016134, 0.007406, 0.07646, 0, "
200200
"0, 0, 0, 1]}\n"
201201
" - !<FileTransform> {src: lut1d_3.spi1d, interpolation: linear}\n";
202202

‎vendor/nuke/OCIOCDLTransform/OCIOCDLTransform.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ const char* OCIOCDLTransform::displayName() const
365365
const char* OCIOCDLTransform::node_help() const
366366
{
367367
// TODO more detailed help text
368-
return "Use OpenColorIO to apply an ASC CDL grade. Applied using:\n\n"\
369-
"out = (i * s + o)^p\n\nWhere i is the input value, s is slope, "\
368+
return "Use OpenColorIO to apply an ASC CDL grade. Applied using:\n\n"
369+
"out = (i * s + o)^p\n\nWhere i is the input value, s is slope, "
370370
"o is offset and p is power";
371371
}
372372

0 commit comments

Comments
 (0)