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

Fix regression in cccid handling when no value is supplied #1855

Merged
merged 2 commits into from
Sep 27, 2023
Merged

Fix regression in cccid handling when no value is supplied #1855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
803c453
Fix regression in cccid handling when no value is supplied
KevinJW Sep 13, 2023
5aa41ba
Merge branch 'main' into 1854-v2xx-regressionbug-with-cccid-handling-…
doug-walker Sep 26, 2023
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: 1 addition & 1 deletion src/OpenColorIO/fileformats/FileFormatCCC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
{
// Use 0 for empty string.
int cccindex=0;
if (StringToInt(&cccindex, cccid.c_str(), true))
if (cccid.empty() || StringToInt(&cccindex, cccid.c_str(), true))
{
int maxindex = ((int)cachedFile->m_transformVec.size())-1;
if (cccindex<0 || cccindex>maxindex)
Expand Down
4 changes: 2 additions & 2 deletions src/OpenColorIO/fileformats/FileFormatCDL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
{
// Use 0 for empty string.
int cccindex=0;
if (StringToInt(&cccindex, cccid.c_str(), true))
if (cccid.empty() || StringToInt(&cccindex, cccid.c_str(), true))
{
int maxindex = ((int)cachedFile->m_transformVec.size())-1;
if (cccindex<0 || cccindex>maxindex)
Expand All @@ -274,7 +274,7 @@ LocalFileFormat::buildFileOps(OpRcPtrVec & ops,
if (!success)
{
std::ostringstream os;
os << "You must specify a valid cccid to load from the ccc file";
os << "You must specify a valid cccid to load from the cdl file";
os << " (either by name or index). id='" << cccid << "' ";
os << "is not found in the file, and is not parsable as an ";
os << "integer index.";
Expand Down
71 changes: 71 additions & 0 deletions tests/cpu/transforms/FileTransform_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,3 +484,74 @@ OCIO_ADD_TEST(FileTransform, context_variables)
OCIO_CHECK_EQUAL(std::string("01"), usedContextVars->getStringVarByIndex(1));
}
}

OCIO_ADD_TEST(FileTransform, cc_file_with_different_file_extension)
{
static const std::string BASE_CONFIG =
"ocio_profile_version: 1\n"
"description: Minimal\n"
"search_path: " + OCIO::GetTestFilesDir() + "\n"
"\n"
"roles:\n"
" default: basic\n"
" scene_linear: basic\n"
" data: basic\n"
" reference: basic\n"
" compositing_log: basic\n"
" color_timing: basic\n"
" color_picking: basic\n"
" texture_paint: basic\n"
" matte_paint: basic\n"
" rendering: basic\n"
" aces_interchange: basic\n"
" cie_xyz_d65_interchange: basic\n"
"\n"
"displays:\n"
" display:\n"
" - !<View> {name: basic, colorspace: basic }\n"
" - !<View> {name: cdl, colorspace: basic_cdl }\n"
"\n"
"colorspaces:\n"
" - !<ColorSpace>\n"
" name: basic\n"
"\n"
" - !<ColorSpace>\n"
" name: basic_cdl\n";

{
static const std::string CONFIG = BASE_CONFIG +
" from_reference: !<FileTransform> { src: cdl_test_cc_file_with_extension.cdl }\n";
std::istringstream iss;
iss.str(CONFIG);

OCIO::ConstConfigRcPtr cfg;
OCIO_CHECK_NO_THROW(cfg = OCIO::Config::CreateFromStream(iss));
OCIO_CHECK_NO_THROW(cfg->validate());


OCIO::ConstTransformRcPtr tr1 = cfg->getColorSpace("basic_cdl")->getTransform(
OCIO::COLORSPACE_DIR_FROM_REFERENCE
);
OCIO::ConstFileTransformRcPtr fTr1 = OCIO::DynamicPtrCast<const OCIO::FileTransform>(tr1);
OCIO_CHECK_ASSERT(fTr1);
OCIO_CHECK_NO_THROW(cfg->getProcessor(tr1));
}
{
static const std::string CONFIG = BASE_CONFIG +
" from_reference: !<FileTransform> { src: cdl_test_cc_file_with_extension.ccc }\n";
std::istringstream iss;
iss.str(CONFIG);

OCIO::ConstConfigRcPtr cfg;
OCIO_CHECK_NO_THROW(cfg = OCIO::Config::CreateFromStream(iss));
OCIO_CHECK_NO_THROW(cfg->validate());


OCIO::ConstTransformRcPtr tr2 = cfg->getColorSpace("basic_cdl")->getTransform(
OCIO::COLORSPACE_DIR_FROM_REFERENCE
);
OCIO::ConstFileTransformRcPtr fTr2 = OCIO::DynamicPtrCast<const OCIO::FileTransform>(tr2);
OCIO_CHECK_ASSERT(fTr2);
OCIO_CHECK_NO_THROW(cfg->getProcessor(tr2));
}
}
12 changes: 12 additions & 0 deletions tests/data/files/cdl_test_cc_file_with_extension.ccc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ColorCorrection>
<SOPNode>
<Description>No Op CDL</Description>
<Slope>1.00000 1.00000 1.00000</Slope>
<Offset>0.00000 0.00000 0.00000</Offset>
<Power>1.00000 1.00000 1.00000</Power>
</SOPNode>
<SatNode>
<Saturation>1.00000</Saturation>
</SatNode>
</ColorCorrection>
12 changes: 12 additions & 0 deletions tests/data/files/cdl_test_cc_file_with_extension.cdl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ColorCorrection>
<SOPNode>
<Description>No Op CDL</Description>
<Slope>1.00000 1.00000 1.00000</Slope>
<Offset>0.00000 0.00000 0.00000</Offset>
<Power>1.00000 1.00000 1.00000</Power>
</SOPNode>
<SatNode>
<Saturation>1.00000</Saturation>
</SatNode>
</ColorCorrection>