Skip to content

Commit 1a082f1

Browse files
committed
Experiment additional Processor metadata
1 parent 2a8b59e commit 1a082f1

24 files changed

+75
-37
lines changed

share/cmake/modules/FindExtPackages.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ocio_handle_dependency( Imath REQUIRED ALLOW_INSTALL
101101
# See https://nvd.nist.gov/vuln/detail/CVE-2022-37434
102102
# See https://github.com/madler/zlib/releases/tag/v1.2.13
103103
ocio_handle_dependency( ZLIB REQUIRED ALLOW_INSTALL
104-
MIN_VERSION 1.2.13 # CVE fixes
104+
MIN_VERSION 1.2.12 # CVE fixes
105105
RECOMMENDED_VERSION 1.3.1
106106
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO"
107107
VERSION_VARS ZLIB_VERSION_STRING ZLIB_VERSION )

src/OpenColorIO/fileformats/FileFormat3DL.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,8 +602,8 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
602602
const auto fileInterp = fileTransform.getInterpolation();
603603

604604
bool fileInterpUsed = false;
605-
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed);
606-
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed);
605+
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed, untypedCachedFile);
606+
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed, untypedCachedFile);
607607

608608
if (!fileInterpUsed)
609609
{

src/OpenColorIO/fileformats/FileFormatCDL.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
239239

240240
success = true;
241241
BuildCDLOp(ops, config, *cdl, newDir);
242+
243+
// TODO: Inject src attribute here?
242244
}
243245

244246
// Try to parse the cccid as an integer index

src/OpenColorIO/fileformats/FileFormatCSP.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -865,9 +865,9 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
865865
const auto fileInterp = fileTransform.getInterpolation();
866866

867867
bool fileInterpUsed = false;
868-
auto prelut = HandleLUT1D(cachedFile->prelut, fileInterp, fileInterpUsed);
869-
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed);
870-
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed);
868+
auto prelut = HandleLUT1D(cachedFile->prelut, fileInterp, fileInterpUsed, untypedCachedFile);
869+
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed, untypedCachedFile);
870+
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed, untypedCachedFile);
871871

872872
if (!fileInterpUsed)
873873
{

src/OpenColorIO/fileformats/FileFormatDiscreet1DL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
755755
const auto fileInterp = fileTransform.getInterpolation();
756756

757757
bool fileInterpUsed = false;
758-
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed);
758+
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed, untypedCachedFile);
759759

760760
if (!fileInterpUsed)
761761
{

src/OpenColorIO/fileformats/FileFormatHDL.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,8 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
820820
const auto fileInterp = fileTransform.getInterpolation();
821821

822822
bool fileInterpUsed = false;
823-
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed);
824-
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed);
823+
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed, untypedCachedFile);
824+
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed, untypedCachedFile);
825825

826826
if (!fileInterpUsed)
827827
{

src/OpenColorIO/fileformats/FileFormatICC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
785785
if (cachedFile->lut)
786786
{
787787
bool fileInterpUsed = false;
788-
lut = HandleLUT1D(cachedFile->lut, fileInterp, fileInterpUsed);
788+
lut = HandleLUT1D(cachedFile->lut, fileInterp, fileInterpUsed, untypedCachedFile);
789789

790790
if (!fileInterpUsed)
791791
{

src/OpenColorIO/fileformats/FileFormatIridasCube.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,8 +515,8 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
515515
const auto fileInterp = fileTransform.getInterpolation();
516516

517517
bool fileInterpUsed = false;
518-
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed);
519-
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed);
518+
auto lut1D = HandleLUT1D(cachedFile->lut1D, fileInterp, fileInterpUsed, untypedCachedFile);
519+
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed, untypedCachedFile);
520520

521521
if (!fileInterpUsed)
522522
{

src/OpenColorIO/fileformats/FileFormatIridasItx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
306306
const auto fileInterp = fileTransform.getInterpolation();
307307

308308
bool fileInterpUsed = false;
309-
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed);
309+
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed, untypedCachedFile);
310310

311311
if (!fileInterpUsed)
312312
{

src/OpenColorIO/fileformats/FileFormatIridasLook.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
563563
const auto fileInterp = fileTransform.getInterpolation();
564564

565565
bool fileInterpUsed = false;
566-
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed);
566+
auto lut3D = HandleLUT3D(cachedFile->lut3D, fileInterp, fileInterpUsed, untypedCachedFile);
567567

568568
if (!fileInterpUsed)
569569
{

0 commit comments

Comments
 (0)