Skip to content

Commit 3f2bcfb

Browse files
fnordwarehodoulp
fnordware
and
hodoulp
authored
RB-2.1 After Effects plug-in updates (#1565)
* Handle any family separator Signed-off-by: Brendan Bolles <[email protected]> * Trim superfluous UI branches Signed-off-by: Brendan Bolles <[email protected]> * Remove internal Platform use Signed-off-by: Brendan Bolles <[email protected]> * Update buildProgram() call Signed-off-by: Brendan Bolles <[email protected]> * Update Xcode 9 projects Signed-off-by: Brendan Bolles <[email protected]> * Fix lcms version in Xcode 9 Signed-off-by: Brendan Bolles <[email protected]> * Bump version to 2.1.1 Signed-off-by: Brendan Bolles <[email protected]> * Update Xcode 12 projects Signed-off-by: Brendan Bolles <[email protected]> * Include <cctype> for std::isdigit() on Windows Signed-off-by: Brendan Bolles <[email protected]> * Update Visual Studio projects Signed-off-by: Brendan Bolles <[email protected]> * Add ARM64 architecture Signed-off-by: Brendan Bolles <[email protected]> Co-authored-by: Patrick Hodoul <[email protected]>
1 parent 05f5bee commit 3f2bcfb

File tree

20 files changed

+130
-91
lines changed

20 files changed

+130
-91
lines changed

‎src/OpenColorIO/GpuShaderClassWrapper.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include "GpuShaderClassWrapper.h"
77

8+
#include <cctype>
9+
810
namespace OCIO_NAMESPACE
911
{
1012

‎vendor/aftereffects/OpenColorIO_AE_Context.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ bool Path::exists() const
153153
if(path.empty())
154154
return false;
155155

156-
std::ifstream f = Platform::CreateInputFileStream( path.c_str() );
156+
std::ifstream f( path.c_str() );
157157

158158
return !!f;
159159
}
@@ -869,7 +869,7 @@ void OpenColorIO_AE_Context::UpdateOCIOGLState()
869869
_oglBuilder->allocateAllTextures(1);
870870

871871
// Step 5: Build the fragment shader program
872-
_oglBuilder->buildProgram(g_fragShaderText);
872+
_oglBuilder->buildProgram(g_fragShaderText, true);
873873
}
874874
catch(...)
875875
{

‎vendor/aftereffects/OpenColorIO_AE_PiPL.r‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,17 @@ resource 'PiPL' (16000) {
2525
},
2626

2727
#ifdef AE_OS_WIN
28-
#ifdef AE_PROC_INTELx64
29-
CodeWin64X86 {"PluginMain"},
30-
#else
31-
CodeWin32X86 {"PluginMain"},
32-
#endif
28+
#ifdef AE_PROC_INTELx64
29+
CodeWin64X86 { "PluginMain" },
30+
#endif
3331
#else
34-
#ifdef AE_PROC_INTELx64
35-
CodeMacIntel64 {"PluginMain"},
36-
#else
37-
CodeMachOPowerPC {"PluginMain"},
38-
CodeMacIntel32 {"PluginMain"},
39-
#endif
40-
#endif /* [6] */
32+
#ifdef __x86_64__
33+
CodeMacIntel64 { "PluginMain" },
34+
#endif
35+
#ifdef __arm64__
36+
CodeMacARM64 { "PluginMain" },
37+
#endif
38+
#endif /* [6] */
4139
AE_PiPL_Version {
4240
2,
4341
0

‎vendor/aftereffects/OpenColorIO_AE_UI.cpp‎

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,32 +1078,9 @@ static void DoClickMenus(
10781078
-1;
10791079
}
10801080
}
1081-
else if(arb_data->action == OCIO_ACTION_CONVERT)
1082-
{
1083-
assert(FALSE);
1084-
1085-
menu_items = seq_data->context->getColorSpaces();
1086-
1087-
if(reg == REGION_MENU1)
1088-
{
1089-
selected_item = FindInVec(menu_items, arb_data->input);
1090-
}
1091-
else
1092-
{
1093-
selected_item = FindInVec(menu_items, arb_data->output);
1094-
}
1095-
}
10961081
else if(arb_data->action == OCIO_ACTION_DISPLAY)
10971082
{
1098-
if(reg == REGION_MENU1)
1099-
{
1100-
assert(FALSE);
1101-
1102-
menu_items = seq_data->context->getColorSpaces();
1103-
1104-
selected_item = FindInVec(menu_items, arb_data->input);
1105-
}
1106-
else if(reg == REGION_MENU2)
1083+
if(reg == REGION_MENU2)
11071084
{
11081085
menu_items = seq_data->context->getDisplays();
11091086

@@ -1145,30 +1122,9 @@ static void DoClickMenus(
11451122
seq_data->context->setupLUT(arb_data->invert, arb_data->interpolation);
11461123
}
11471124
}
1148-
else if(arb_data->action == OCIO_ACTION_CONVERT)
1149-
{
1150-
assert(FALSE);
1151-
1152-
if(reg == REGION_MENU1)
1153-
{
1154-
nt_strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN+1);
1155-
}
1156-
else if(reg == REGION_MENU2)
1157-
{
1158-
nt_strncpy(arb_data->output, color_space.c_str(), ARB_SPACE_LEN+1);
1159-
}
1160-
1161-
seq_data->context->setupConvert(arb_data->input, arb_data->output, arb_data->invert);
1162-
}
11631125
else if(arb_data->action == OCIO_ACTION_DISPLAY)
11641126
{
1165-
if(reg == REGION_MENU1)
1166-
{
1167-
assert(FALSE);
1168-
1169-
nt_strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN+1);
1170-
}
1171-
else if(reg == REGION_MENU2)
1127+
if(reg == REGION_MENU2)
11721128
{
11731129
nt_strncpy(arb_data->display, color_space.c_str(), ARB_SPACE_LEN+1);
11741130
}

‎vendor/aftereffects/mac/OpenColorIO_AE.plugin-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>NSAppleScriptEnabled</key>
1818
<string>No</string>
1919
<key>NSHumanReadableCopyright</key>
20-
<string>© 2011 OpenColorIO</string>
20+
<string>© 2011-2021 OpenColorIO</string>
2121
<key>LSRequiresCarbon</key>
2222
<true/>
2323
</dict>

‎vendor/aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,11 @@ bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace,
227227

228228
if(family != NULL && family != std::string(""))
229229
{
230-
assert(config->getFamilySeparator() == '/');
230+
char separatorString[2];
231+
separatorString[0] = config->getFamilySeparator();
232+
separatorString[1] = '\0';
231233

232-
[pathComponents addObjectsFromArray:[[NSString stringWithUTF8String:family] pathComponents]];
234+
[pathComponents addObjectsFromArray:[[NSString stringWithUTF8String:family] componentsSeparatedByString:[NSString stringWithUTF8String:separatorString]]];
233235
}
234236

235237
[pathComponents addObject:[NSString stringWithUTF8String:colorSpaceName]];

‎vendor/aftereffects/vc/vc15/OpenColorABI.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// Makefile configuration options
88
#define OCIO_NAMESPACE OpenColorIO
99

10-
#define OCIO_VERSION_STR "2.1.0"
10+
#define OCIO_VERSION_STR "2.1.1"
1111
#define OCIO_VERSION_STATUS_STR ""
12-
#define OCIO_VERSION_FULL_STR "2.1.0"
12+
#define OCIO_VERSION_FULL_STR "2.1.1"
1313

1414
/* Version as a single 4-byte hex number, e.g. 0x01050200 == 1.5.2
1515
Use this for numeric comparisons, e.g. #if OCIO_VERSION_HEX >= ...
@@ -18,7 +18,7 @@
1818
*/
1919
#define OCIO_VERSION_HEX ((2 << 24) | \
2020
(1 << 16) | \
21-
(0 << 8))
21+
(1 << 8))
2222

2323
#define OCIO_VERSION_MAJOR 2
2424
#define OCIO_VERSION_MINOR 1

‎vendor/aftereffects/vc/vc15/ext/lcms.vcxproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@
3535
</ProjectConfiguration>
3636
</ItemGroup>
3737
<ItemGroup>
38+
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsalpha.c" />
3839
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmscam02.c" />
3940
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmscgats.c" />
4041
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmscnvrt.c" />
4142
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmserr.c" />
4243
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsgamma.c" />
4344
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsgmt.c" />
45+
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmshalf.c" />
4446
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsintrp.c" />
4547
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsio0.c" />
4648
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsio1.c" />
@@ -215,7 +217,7 @@
215217

216218
if exist Little-CMS goto dontbother
217219

218-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
220+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
219221

220222
:dontbother</Command>
221223
<Message>Download Little-CMS</Message>
@@ -241,7 +243,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
241243

242244
if exist Little-CMS goto dontbother
243245

244-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
246+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
245247

246248
:dontbother</Command>
247249
<Message>Download Little-CMS</Message>
@@ -266,7 +268,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
266268

267269
if exist Little-CMS goto dontbother
268270

269-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
271+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
270272

271273
:dontbother</Command>
272274
<Message>Download Little-CMS</Message>
@@ -291,7 +293,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
291293

292294
if exist Little-CMS goto dontbother
293295

294-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
296+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
295297

296298
:dontbother</Command>
297299
<Message>Download Little-CMS</Message>
@@ -320,7 +322,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
320322

321323
if exist Little-CMS goto dontbother
322324

323-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
325+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
324326

325327
:dontbother</Command>
326328
<Message>Download Little-CMS</Message>
@@ -349,7 +351,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
349351

350352
if exist Little-CMS goto dontbother
351353

352-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
354+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
353355

354356
:dontbother</Command>
355357
<Message>Download Little-CMS</Message>
@@ -378,7 +380,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
378380

379381
if exist Little-CMS goto dontbother
380382

381-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
383+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
382384

383385
:dontbother</Command>
384386
<Message>Download Little-CMS</Message>
@@ -408,7 +410,7 @@ git clone https://github.com/mm2/Little-CMS -b lcms2.2
408410

409411
if exist Little-CMS goto dontbother
410412

411-
git clone https://github.com/mm2/Little-CMS -b lcms2.2
413+
git clone https://github.com/mm2/Little-CMS -b lcms2.12
412414

413415
:dontbother</Command>
414416
<Message>Download Little-CMS</Message>

‎vendor/aftereffects/vc/vc15/utils/Half.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// SPDX-License-Identifier: BSD-3-Clause
2+
// Copyright Contributors to the OpenColorIO Project.
3+
4+
5+
#ifndef INCLUDED_OCIO_IMATH_H
6+
#define INCLUDED_OCIO_IMATH_H
7+
8+
#define OCIO_USE_IMATH_HALF 0
9+
10+
#if OCIO_USE_IMATH_HALF
11+
# include <Imath/half.h>
12+
#else
13+
# include <OpenEXR/half.h>
14+
#endif
15+
16+
#endif

‎vendor/aftereffects/win/OpenColorIO_AE_Dialogs_Win.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,6 @@ bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace,
575575

576576
if(family != NULL && family != std::string(""))
577577
{
578-
assert(config->getFamilySeparator() == '/');
579-
580578
tokenize(pathComponents, family, std::string(1, config->getFamilySeparator()));
581579
}
582580

0 commit comments

Comments
 (0)