Skip to content

fix(int): OpenColorIO exception safety improvements #5428

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

Merged
lgritz merged 1 commit into from
Aug 27, 2026
+38 −35
Merged

fix(int): OpenColorIO exception safety improvements #5428

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 38 additions & 35 deletions src/libOpenImageIO/color_ocio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ ColorConfig::Impl::inventory()
scene_linear_alias = lin->getName();
return; // If any non-"raw" spaces were defined, we're done
}
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in inventory: {}", e.what());
}
}
Expand Down Expand Up @@ -738,7 +738,7 @@ ColorConfig::Impl::classify_by_conversions(CSInfo& cs)
cs.setflag(CSInfo::is_data);
DBG("Classifying {} as data isData() [2]\n", cs.name);
}
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in classify_by_conversions: {}", e.what());
}
}
Expand Down Expand Up @@ -850,7 +850,7 @@ ColorConfig::Impl::IdentifyBuiltinColorSpace(const char* name) const
try {
return OCIO::Config::IdentifyBuiltinColorSpace(config_, builtinconfig_,
name);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in IdentifyBuiltinColorSpace: {}", e.what());
}
return nullptr;
Expand Down Expand Up @@ -932,7 +932,7 @@ ColorConfig::Impl::init(string_view filename)
OIIO_CONTRACT_ASSERT(cfg);
builtinconfig_ = cfg->createEditableCopy();
fix_config_file_rules(builtinconfig_);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
error("Error making OCIO built-in config: {}", e.what());
}

Expand All @@ -954,7 +954,7 @@ ColorConfig::Impl::init(string_view filename)
config_ = cfg->createEditableCopy();
if (config_ && Strutil::istarts_with(filename, "ocio://"))
fix_config_file_rules(config_);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
error("Error reading OCIO config \"{}\": {}", filename, e.what());
} catch (...) {
error("Error reading OCIO config \"{}\"", filename);
Expand Down Expand Up @@ -1080,7 +1080,7 @@ ColorConfig::getColorSpaceFamilyByName(string_view name) const
std::string(name).c_str());
if (c)
return c->getFamily();
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getColorSpaceFamilyByName: {}", e.what());
}
}
Expand Down Expand Up @@ -1114,7 +1114,7 @@ ColorConfig::getRoleByIndex(int index) const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getRoleName(index);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getRoleByIndex: {}", e.what());
}
return nullptr;
Expand All @@ -1138,7 +1138,7 @@ ColorConfig::getNumLooks() const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getNumLooks();
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getNumLooks: {}", e.what());
}
return 0;
Expand All @@ -1152,7 +1152,7 @@ ColorConfig::getLookNameByIndex(int index) const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getLookNameByIndex(index);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getLookNameByIndex: {}", e.what());
}
return nullptr;
Expand Down Expand Up @@ -1276,7 +1276,7 @@ ColorConfig::getColorSpaceNameByRole(string_view role) const
// role);
return c->getName();
}
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getColorSpaceNameByRole: {}", e.what());
}
}
Expand Down Expand Up @@ -1322,7 +1322,7 @@ ColorConfig::getColorSpaceDataType(string_view name, int* bits) const
case OCIO::BIT_DEPTH_F32: *bits = 32; return TypeDesc::FLOAT;
}
}
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getColorSpaceDataType: {}", e.what());
}
}
Expand All @@ -1337,7 +1337,7 @@ ColorConfig::getNumDisplays() const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getNumDisplays();
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getNumDisplays: {}", e.what());
}
return 0;
Expand All @@ -1351,7 +1351,7 @@ ColorConfig::getDisplayNameByIndex(int index) const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getDisplay(index);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getDisplayNameByIndex: {}", e.what());
}
return nullptr;
Expand Down Expand Up @@ -1379,7 +1379,7 @@ ColorConfig::getNumViews(string_view display) const
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getNumViews(
std::string(display).c_str());
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getNumViews: {}", e.what());
}
return 0;
Expand All @@ -1396,7 +1396,7 @@ ColorConfig::getViewNameByIndex(string_view display, int index) const
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getView(std::string(display).c_str(),
index);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getViewNameByIndex: {}", e.what());
}
return nullptr;
Expand All @@ -1423,7 +1423,7 @@ ColorConfig::getDefaultDisplayName() const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getDefaultDisplay();
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getDefaultDisplayName: {}", e.what());
}
return nullptr;
Expand All @@ -1439,7 +1439,7 @@ ColorConfig::getDefaultViewName(string_view display) const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getDefaultView(c_str(display));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getDefaultViewName: {}", e.what());
}
return nullptr;
Expand All @@ -1459,7 +1459,7 @@ ColorConfig::getDefaultViewName(string_view display,
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getDefaultView(c_str(display),
c_str(inputColorSpace));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getDefaultViewName: {}", e.what());
}
return nullptr;
Expand All @@ -1478,7 +1478,7 @@ ColorConfig::getDisplayViewColorSpaceName(const std::string& display,
if (strcmp(c_str(name), "<USE_DISPLAY_NAME>") == 0)
name = display;
return c_str(name);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getDisplayViewColorSpaceName: {}", e.what());
}
}
Expand All @@ -1495,7 +1495,7 @@ ColorConfig::getDisplayViewLooks(const std::string& display,
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getDisplayViewLooks(display.c_str(),
view.c_str());
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getDisplayViewLooks: {}", e.what());
}
return nullptr;
Expand All @@ -1509,7 +1509,7 @@ ColorConfig::getNumNamedTransforms() const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getNumNamedTransforms();
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getNumNamedTransforms: {}", e.what());
}
return 0;
Expand All @@ -1523,7 +1523,7 @@ ColorConfig::getNamedTransformNameByIndex(int index) const
try {
if (getImpl()->config_ && !disable_ocio)
return getImpl()->config_->getNamedTransformNameByIndex(index);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getNamedTransformNameByIndex: {}", e.what());
}
return nullptr;
Expand Down Expand Up @@ -1586,7 +1586,7 @@ ColorConfig::Impl::resolve(string_view name) const
OCIO::ConstColorSpaceRcPtr cs = config->getColorSpace(c_str(name));
if (cs)
return cs->getName();
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in resolve: {}", e.what());
}
}
Expand Down Expand Up @@ -1716,7 +1716,7 @@ class ColorProcessor_OCIO final : public ColorProcessor {
OCIO::BIT_DEPTH_F32, // For now, only float
chanstride, xstride, ystride);
m_cpuproc->apply(pid);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
OIIO::errorfmt("OCIO error in apply: {}\n", e.what());
// FIXME -- some day, we should make ColorProcessor::apply return
// a status, and we should indicate here that it failed.
Expand Down Expand Up @@ -1848,7 +1848,7 @@ ColorConfig::createColorProcessor(ustring inputColorSpace,
getImpl()->clear_error();
// DBG("Created OCIO processor '{}' -> '{}'\n",
// inputColorSpace, outputColorSpace);
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
// Don't quit yet, remember the error and see if any of our
// built-in knowledge of some generic spaces will save us.
p.reset();
Expand All @@ -1867,7 +1867,7 @@ ColorConfig::createColorProcessor(ustring inputColorSpace,
// chance below to recognize it as a special case.
try {
handle = ColorProcessorHandle(new ColorProcessor_OCIO(p));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
getImpl()->error("Exception from OCIO: {}", e.what());
}
// DBG("OCIO processor '{}' -> '{}' is NOT NoOp, handle = {}\n",
Expand All @@ -1880,7 +1880,7 @@ ColorConfig::createColorProcessor(ustring inputColorSpace,
// still don't have a better idea, return it.
try {
handle = ColorProcessorHandle(new ColorProcessor_OCIO(p));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
getImpl()->error("Exception from OCIO: {}", e.what());
}
}
Expand Down Expand Up @@ -1959,8 +1959,8 @@ ColorConfig::createLookTransform(ustring looks, ustring inputColorSpace,
p = getImpl()->config_->getProcessor(context, transform, dir);
getImpl()->clear_error();
handle = ColorProcessorHandle(new ColorProcessor_OCIO(p));
} catch (OCIO::Exception& e) {
getImpl()->error(e.what());
} catch (std::exception& e) {
getImpl()->error("Exception from OCIO: {}", e.what());
} catch (...) {
getImpl()->error(
"An unknown error occurred in OpenColorIO, getProcessor");
Expand Down Expand Up @@ -2042,7 +2042,7 @@ ColorConfig::createDisplayTransform(ustring display, ustring view,
getImpl()->clear_error();
handle = ColorProcessorHandle(new ColorProcessor_OCIO(p));
} catch (OCIO::Exception& e) {
getImpl()->error(e.what());
getImpl()->error("Exception from OCIO: {}", e.what());
} catch (...) {
getImpl()->error(
"An unknown error occurred in OpenColorIO, getProcessor");
Expand Down Expand Up @@ -2098,7 +2098,7 @@ ColorConfig::createFileTransform(ustring name, bool inverse) const
p = config->getProcessor(context, transform, dir);
getImpl()->clear_error();
handle = ColorProcessorHandle(new ColorProcessor_OCIO(p));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
getImpl()->error(e.what());
} catch (...) {
getImpl()->error(
Expand Down Expand Up @@ -2161,7 +2161,7 @@ ColorConfig::createNamedTransform(ustring name, bool inverse,
p = config->getProcessor(context, transform, dir);
getImpl()->clear_error();
handle = ColorProcessorHandle(new ColorProcessor_OCIO(p));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
getImpl()->error(e.what());
} catch (...) {
getImpl()->error(
Expand Down Expand Up @@ -2192,7 +2192,7 @@ ColorConfig::getColorSpaceFromFilepath(string_view str) const
string_view r = getImpl()->config_->getColorSpaceFromFilepath(
s.c_str());
return r;
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getColorSpaceFromFilepath: {}", e.what());
}
}
Expand All @@ -2211,7 +2211,7 @@ ColorConfig::getColorSpaceFromFilepath(string_view str, string_view default_cs,
s.c_str());
if (!getImpl()->config_->filepathOnlyMatchesDefaultRule(s.c_str()))
return r;
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in getColorSpaceFromFilepath: {}", e.what());
}
}
Expand All @@ -2228,7 +2228,7 @@ ColorConfig::filepathOnlyMatchesDefaultRule(string_view str) const
{
try {
return getImpl()->config_->filepathOnlyMatchesDefaultRule(c_str(str));
} catch (OCIO::Exception& e) {
} catch (std::exception& e) {
DBG("OCIO exception in filepathOnlyMatchesDefaultRule: {}", e.what());
}
return false;
Expand Down Expand Up @@ -2421,6 +2421,9 @@ ColorConfig::get_color_interop_id(string_view colorspace) const
std::string(resolve(colorspace)).c_str());
if (c)
interop_id = c->getInteropID();
} catch (std::exception& e) {
getImpl()->error("Exception from OCIO: {}", e.what());
interop_id = nullptr;
} catch (...) {
interop_id = nullptr;
}
Expand Down
Loading