Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RB-2.1 After Effects plug-in updates #1565

Merged
merged 12 commits into from
Dec 16, 2021
Merged

RB-2.1 After Effects plug-in updates #1565

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a5dd2f3
Handle any family separator
fnordware Dec 15, 2021
1d73027
Trim superfluous UI branches
fnordware Dec 15, 2021
603b59b
Remove internal Platform use
fnordware Dec 15, 2021
ebbfff5
Update buildProgram() call
fnordware Dec 15, 2021
b0e6a1d
Update Xcode 9 projects
fnordware Dec 15, 2021
ff288bb
Fix lcms version in Xcode 9
fnordware Dec 15, 2021
e64125c
Bump version to 2.1.1
fnordware Dec 15, 2021
ed6d75b
Update Xcode 12 projects
fnordware Dec 16, 2021
753b2e4
Include <cctype> for std::isdigit() on Windows
fnordware Dec 16, 2021
6e15701
Update Visual Studio projects
fnordware Dec 16, 2021
cd35b56
Add ARM64 architecture
fnordware Dec 16, 2021
0ec5e19
Merge branch 'RB-2.1' into RB-2.1-ae_update
hodoulp Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/OpenColorIO/GpuShaderClassWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "GpuShaderClassWrapper.h"

#include <cctype>
hodoulp marked this conversation as resolved.
Show resolved Hide resolved

namespace OCIO_NAMESPACE
{

Expand Down
4 changes: 2 additions & 2 deletions vendor/aftereffects/OpenColorIO_AE_Context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ bool Path::exists() const
if(path.empty())
return false;

std::ifstream f = Platform::CreateInputFileStream( path.c_str() );
std::ifstream f( path.c_str() );

return !!f;
}
Expand Down Expand Up @@ -869,7 +869,7 @@ void OpenColorIO_AE_Context::UpdateOCIOGLState()
_oglBuilder->allocateAllTextures(1);

// Step 5: Build the fragment shader program
_oglBuilder->buildProgram(g_fragShaderText);
_oglBuilder->buildProgram(g_fragShaderText, true);
}
catch(...)
{
Expand Down
48 changes: 2 additions & 46 deletions vendor/aftereffects/OpenColorIO_AE_UI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,32 +1078,9 @@ static void DoClickMenus(
-1;
}
}
else if(arb_data->action == OCIO_ACTION_CONVERT)
{
assert(FALSE);

menu_items = seq_data->context->getColorSpaces();

if(reg == REGION_MENU1)
{
selected_item = FindInVec(menu_items, arb_data->input);
}
else
{
selected_item = FindInVec(menu_items, arb_data->output);
}
}
else if(arb_data->action == OCIO_ACTION_DISPLAY)
{
if(reg == REGION_MENU1)
{
assert(FALSE);

menu_items = seq_data->context->getColorSpaces();

selected_item = FindInVec(menu_items, arb_data->input);
}
else if(reg == REGION_MENU2)
if(reg == REGION_MENU2)
{
menu_items = seq_data->context->getDisplays();

Expand Down Expand Up @@ -1145,30 +1122,9 @@ static void DoClickMenus(
seq_data->context->setupLUT(arb_data->invert, arb_data->interpolation);
}
}
else if(arb_data->action == OCIO_ACTION_CONVERT)
{
assert(FALSE);

if(reg == REGION_MENU1)
{
nt_strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN+1);
}
else if(reg == REGION_MENU2)
{
nt_strncpy(arb_data->output, color_space.c_str(), ARB_SPACE_LEN+1);
}

seq_data->context->setupConvert(arb_data->input, arb_data->output, arb_data->invert);
}
else if(arb_data->action == OCIO_ACTION_DISPLAY)
{
if(reg == REGION_MENU1)
{
assert(FALSE);

nt_strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN+1);
}
else if(reg == REGION_MENU2)
if(reg == REGION_MENU2)
{
nt_strncpy(arb_data->display, color_space.c_str(), ARB_SPACE_LEN+1);
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/aftereffects/mac/OpenColorIO_AE.plugin-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>NSAppleScriptEnabled</key>
<string>No</string>
<key>NSHumanReadableCopyright</key>
<string>© 2011 OpenColorIO</string>
<string>© 2011-2021 OpenColorIO</string>
<key>LSRequiresCarbon</key>
<true/>
</dict>
Expand Down
6 changes: 4 additions & 2 deletions vendor/aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,11 @@ bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace,

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

[pathComponents addObjectsFromArray:[[NSString stringWithUTF8String:family] pathComponents]];
[pathComponents addObjectsFromArray:[[NSString stringWithUTF8String:family] componentsSeparatedByString:[NSString stringWithUTF8String:separatorString]]];
}

[pathComponents addObject:[NSString stringWithUTF8String:colorSpaceName]];
Expand Down
6 changes: 3 additions & 3 deletions vendor/aftereffects/vc/vc15/OpenColorABI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
// Makefile configuration options
#define OCIO_NAMESPACE OpenColorIO

#define OCIO_VERSION_STR "2.1.0"
#define OCIO_VERSION_STR "2.1.1"
#define OCIO_VERSION_STATUS_STR ""
#define OCIO_VERSION_FULL_STR "2.1.0"
#define OCIO_VERSION_FULL_STR "2.1.1"

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

#define OCIO_VERSION_MAJOR 2
#define OCIO_VERSION_MINOR 1
Expand Down
18 changes: 10 additions & 8 deletions vendor/aftereffects/vc/vc15/ext/lcms.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsalpha.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmscam02.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmscgats.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmscnvrt.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmserr.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsgamma.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsgmt.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmshalf.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsintrp.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsio0.c" />
<ClCompile Include="..\..\..\..\..\ext\Little-CMS\src\cmsio1.c" />
Expand Down Expand Up @@ -215,7 +217,7 @@

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

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

if exist Little-CMS goto dontbother

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

:dontbother</Command>
<Message>Download Little-CMS</Message>
Expand Down
16 changes: 16 additions & 0 deletions vendor/aftereffects/vc/vc15/utils/Half.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// SPDX-License-Identifier: BSD-3-Clause
// Copyright Contributors to the OpenColorIO Project.


#ifndef INCLUDED_OCIO_IMATH_H
#define INCLUDED_OCIO_IMATH_H

#define OCIO_USE_IMATH_HALF 0

#if OCIO_USE_IMATH_HALF
# include <Imath/half.h>
#else
# include <OpenEXR/half.h>
#endif

#endif
2 changes: 0 additions & 2 deletions vendor/aftereffects/win/OpenColorIO_AE_Dialogs_Win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,6 @@ bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace,

if(family != NULL && family != std::string(""))
{
assert(config->getFamilySeparator() == '/');

tokenize(pathComponents, family, std::string(1, config->getFamilySeparator()));
}

Expand Down
8 changes: 4 additions & 4 deletions vendor/aftereffects/xcode/xcode12/OpenColorABI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
// Makefile configuration options
#define OCIO_NAMESPACE OpenColorIO

#define OCIO_VERSION_STR "2.1.0"
#define OCIO_VERSION_STR "2.1.1"
#define OCIO_VERSION_STATUS_STR ""
#define OCIO_VERSION_FULL_STR "2.1.0"
#define OCIO_VERSION_FULL_STR "2.1.1"

// Deprecated synonym for downstream projects that expect the 1.x name
#define OCIO_VERSION "2.1.0"
#define OCIO_VERSION "2.1.1"

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

#define OCIO_VERSION_MAJOR 2
#define OCIO_VERSION_MINOR 1
Expand Down
8 changes: 8 additions & 0 deletions vendor/aftereffects/xcode/xcode12/OpenColorIO.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@
2A41D756254B85B400893EFF /* ViewTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A41D635254B85B400893EFF /* ViewTransform.cpp */; };
2A41D77B254B860800893EFF /* glsl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A41D768254B860800893EFF /* glsl.cpp */; };
2A41D77C254B860800893EFF /* glsl.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A41D769254B860800893EFF /* glsl.h */; };
2A5E5F3A276ABA9B00CEE8CE /* GpuShaderClassWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A5E5F36276ABA9B00CEE8CE /* GpuShaderClassWrapper.cpp */; };
2A5E5F3B276ABA9B00CEE8CE /* GpuShaderClassWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A5E5F39276ABA9B00CEE8CE /* GpuShaderClassWrapper.h */; };
2AC80FA525A7E2050084CE7D /* CategoryHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC80F9C25A7E2050084CE7D /* CategoryHelpers.cpp */; };
2AC80FA625A7E2050084CE7D /* CategoryHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC80F9D25A7E2050084CE7D /* CategoryHelpers.h */; };
2AC80FA725A7E2050084CE7D /* ColorSpaceHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC80F9E25A7E2050084CE7D /* ColorSpaceHelpers.cpp */; };
Expand Down Expand Up @@ -683,6 +685,8 @@
2A41D635254B85B400893EFF /* ViewTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewTransform.cpp; sourceTree = "<group>"; };
2A41D768254B860800893EFF /* glsl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glsl.cpp; sourceTree = "<group>"; };
2A41D769254B860800893EFF /* glsl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = glsl.h; sourceTree = "<group>"; };
2A5E5F36276ABA9B00CEE8CE /* GpuShaderClassWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GpuShaderClassWrapper.cpp; sourceTree = "<group>"; };
2A5E5F39276ABA9B00CEE8CE /* GpuShaderClassWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GpuShaderClassWrapper.h; sourceTree = "<group>"; };
2AB2C901234D0F6600F62DB3 /* ilmbasehalf.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ilmbasehalf.xcodeproj; path = ext/ilmbasehalf.xcodeproj; sourceTree = "<group>"; };
2AB2C92C234D1A7500F62DB3 /* yaml.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = yaml.xcodeproj; path = ext/yaml.xcodeproj; sourceTree = "<group>"; };
2AB2C934234D1A7600F62DB3 /* pystring.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pystring.xcodeproj; path = ext/pystring.xcodeproj; sourceTree = "<group>"; };
Expand Down Expand Up @@ -768,6 +772,8 @@
2A41D53C254B85B300893EFF /* GPUProcessor.h */,
2A41D53D254B85B300893EFF /* GpuShader.cpp */,
2A41D53E254B85B300893EFF /* GpuShader.h */,
2A5E5F36276ABA9B00CEE8CE /* GpuShaderClassWrapper.cpp */,
2A5E5F39276ABA9B00CEE8CE /* GpuShaderClassWrapper.h */,
2A41D53F254B85B300893EFF /* GpuShaderDesc.cpp */,
2A41D540254B85B300893EFF /* GpuShaderUtils.cpp */,
2A41D541254B85B300893EFF /* GpuShaderUtils.h */,
Expand Down Expand Up @@ -1438,6 +1444,7 @@
2A41D689254B85B400893EFF /* md5.h in Headers */,
2A41D6E0254B85B400893EFF /* LogUtils.h in Headers */,
2A41D652254B85B400893EFF /* CTFTransform.h in Headers */,
2A5E5F3B276ABA9B00CEE8CE /* GpuShaderClassWrapper.h in Headers */,
2A41D712254B85B400893EFF /* ScanlineHelper.h in Headers */,
2A41D6BE254B85B400893EFF /* GradingPrimaryOpData.h in Headers */,
2A41D753254B85B400893EFF /* RangeTransform.h in Headers */,
Expand Down Expand Up @@ -1638,6 +1645,7 @@
2A41D711254B85B400893EFF /* ScanlineHelper.cpp in Sources */,
2A41D660254B85B400893EFF /* FileFormatIridasItx.cpp in Sources */,
2AC80FAA25A7E2050084CE7D /* LegacyViewingPipeline.cpp in Sources */,
2A5E5F3A276ABA9B00CEE8CE /* GpuShaderClassWrapper.cpp in Sources */,
2A41D726254B85B400893EFF /* OpHelpers.cpp in Sources */,
2A41D6A9254B85B400893EFF /* FixedFunctionOpData.cpp in Sources */,
2A41D671254B85B400893EFF /* XMLWriterUtils.cpp in Sources */,
Expand Down
10 changes: 9 additions & 1 deletion vendor/aftereffects/xcode/xcode12/ext/lcms.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
2A41D874254B873200893EFF /* cmswtpnt.c in Sources */ = {isa = PBXBuildFile; fileRef = 2A41D80B254B873200893EFF /* cmswtpnt.c */; };
2A41D875254B873200893EFF /* cmsxform.c in Sources */ = {isa = PBXBuildFile; fileRef = 2A41D80C254B873200893EFF /* cmsxform.c */; };
2A41D876254B873200893EFF /* lcms2_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A41D80E254B873200893EFF /* lcms2_internal.h */; };
2A5E5F34276ABA7400CEE8CE /* cmshalf.c in Sources */ = {isa = PBXBuildFile; fileRef = 2A5E5F32276ABA7400CEE8CE /* cmshalf.c */; };
2A5E5F35276ABA7400CEE8CE /* cmsalpha.c in Sources */ = {isa = PBXBuildFile; fileRef = 2A5E5F33276ABA7400CEE8CE /* cmsalpha.c */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -64,6 +66,8 @@
2A41D80B254B873200893EFF /* cmswtpnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmswtpnt.c; sourceTree = "<group>"; };
2A41D80C254B873200893EFF /* cmsxform.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmsxform.c; sourceTree = "<group>"; };
2A41D80E254B873200893EFF /* lcms2_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lcms2_internal.h; sourceTree = "<group>"; };
2A5E5F32276ABA7400CEE8CE /* cmshalf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmshalf.c; sourceTree = "<group>"; };
2A5E5F33276ABA7400CEE8CE /* cmsalpha.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmsalpha.c; sourceTree = "<group>"; };
2ACF9E56147824F500991ED5 /* liblcms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblcms.a; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -117,12 +121,14 @@
2A41D7F4254B873200893EFF /* src */ = {
isa = PBXGroup;
children = (
2A5E5F33276ABA7400CEE8CE /* cmsalpha.c */,
2A41D7F5254B873200893EFF /* cmscam02.c */,
2A41D7F6254B873200893EFF /* cmscgats.c */,
2A41D7F7254B873200893EFF /* cmscnvrt.c */,
2A41D7F8254B873200893EFF /* cmserr.c */,
2A41D7F9254B873200893EFF /* cmsgamma.c */,
2A41D7FA254B873200893EFF /* cmsgmt.c */,
2A5E5F32276ABA7400CEE8CE /* cmshalf.c */,
2A41D7FB254B873200893EFF /* cmsintrp.c */,
2A41D7FC254B873200893EFF /* cmsio0.c */,
2A41D7FD254B873200893EFF /* cmsio1.c */,
Expand Down Expand Up @@ -221,7 +227,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "cd $SRCROOT/../../../../../ext\n\nif [ ! -d Little-CMS ]\nthen\n\tgit clone https://github.com/mm2/Little-CMS -b lcms2.2\nfi\n";
shellScript = "cd $SRCROOT/../../../../../ext\n\nif [ ! -d Little-CMS ]\nthen\n\tgit clone https://github.com/mm2/Little-CMS -b lcms2.12\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand All @@ -230,9 +236,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2A5E5F35276ABA7400CEE8CE /* cmsalpha.c in Sources */,
2A41D869254B873200893EFF /* cmsmtrx.c in Sources */,
2A41D85F254B873200893EFF /* cmscgats.c in Sources */,
2A41D875254B873200893EFF /* cmsxform.c in Sources */,
2A5E5F34276ABA7400CEE8CE /* cmshalf.c in Sources */,
2A41D86D254B873200893EFF /* cmspcs.c in Sources */,
2A41D866254B873200893EFF /* cmsio1.c in Sources */,
2A41D872254B873200893EFF /* cmstypes.c in Sources */,
Expand Down
16 changes: 16 additions & 0 deletions vendor/aftereffects/xcode/xcode12/utils/Half.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// SPDX-License-Identifier: BSD-3-Clause
// Copyright Contributors to the OpenColorIO Project.


#ifndef INCLUDED_OCIO_IMATH_H
#define INCLUDED_OCIO_IMATH_H

#define OCIO_USE_IMATH_HALF 0

#if OCIO_USE_IMATH_HALF
# include <Imath/half.h>
#else
# include <OpenEXR/half.h>
#endif

#endif
Loading