Skip to content

Make camera make/model string comparison case-insensitive in DCPDatabase #2085

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

Open
Copilot wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Make camera make/model string comparison case-insensitive in DCPDatabase #2085

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1cac95
Initial plan
Copilot Mar 18, 2026
a52ed7e
Make string comparison case-insensitive in retrieveDcpForCamera
Copilot Mar 18, 2026
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
12 changes: 8 additions & 4 deletions src/aliceVision/image/dcp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2406,7 +2406,9 @@ void DCPDatabase::clear()

bool DCPDatabase::retrieveDcpForCamera(const std::string& make, const std::string& model, DCPProfile& dcpProf)
{
const std::string dcpKey = make + "_" + model;
const std::string makeLower = boost::algorithm::to_lower_copy(make);
const std::string modelLower = boost::algorithm::to_lower_copy(model);
const std::string dcpKey = makeLower + "_" + modelLower;

{
// Retrieve preloaded DCPProfile
Expand All @@ -2421,8 +2423,8 @@ bool DCPDatabase::retrieveDcpForCamera(const std::string& make, const std::strin
{
// Load DCPProfile from disk
const std::vector<std::string>::iterator it =
std::find_if(dcpFilenamesList.begin(), dcpFilenamesList.end(), [make, model](const std::string& s) {
return (s.find(make) != std::string::npos) && (s.find(model) != std::string::npos);
std::find_if(dcpFilenamesList.begin(), dcpFilenamesList.end(), [makeLower, modelLower](const std::string& s) {
return boost::algorithm::icontains(s, makeLower) && boost::algorithm::icontains(s, modelLower);
});

if (it != dcpFilenamesList.end())
Expand All @@ -2438,7 +2440,9 @@ bool DCPDatabase::retrieveDcpForCamera(const std::string& make, const std::strin

void DCPDatabase::add_or_replace(DCPProfile& dcpProf, const std::string& make, const std::string& model)
{
const std::string dcpKey = make + "_" + model;
const std::string makeLower = boost::algorithm::to_lower_copy(make);
const std::string modelLower = boost::algorithm::to_lower_copy(model);
const std::string dcpKey = makeLower + "_" + modelLower;

std::map<std::string, image::DCPProfile>::iterator it = dcpStore.find(dcpKey);
if (it != dcpStore.end())
Expand Down
Loading