Skip to content

Commit 0f66f01

Browse files
authored
Merge pull request #1728 from alicevision/bugfix/colorspaceDetection
[image] Fix erroneous color space detection for images that contain "raw" in their filepath
2 parents 12d60e2 + 517cdbf commit 0f66f01

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/aliceVision/image/io.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ std::string getImageColorSpace(const OIIO::ImageSpec& oiioSpec, const std::strin
8888
std::string colorSpaceFromFileName = "";
8989
if (!imagePath.empty())
9090
{
91-
colorSpaceFromFileName = getGlobalColorConfigOCIO().getColorSpaceFromFilepath(imagePath);
91+
// Use only filename for color space infering
92+
const std::string filename = fs::path(imagePath).filename().string();
93+
colorSpaceFromFileName = getGlobalColorConfigOCIO().getColorSpaceFromFilepath(filename);
94+
boost::algorithm::to_lower(colorSpaceFromFileName);
9295
}
9396

9497
std::map<std::string, std::string> mapColorSpaces;
@@ -121,7 +124,7 @@ std::string getImageColorSpace(const OIIO::ImageSpec& oiioSpec, const std::strin
121124
{
122125
colorSpace = mapColorSpaces.at("workPlateColourSpace");
123126
}
124-
else if (!colorSpaceFromFileName.empty())
127+
else if (!colorSpaceFromFileName.empty() && colorSpaceFromFileName != "raw")
125128
{
126129
colorSpace = colorSpaceFromFileName;
127130
}

0 commit comments

Comments
 (0)