Skip to content

Commit

Permalink
[panorama] some merge error fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
servantftechnicolor committed Dec 2, 2022
1 parent cac6b4f commit b763784
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/software/pipeline/main_panoramaCompositing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,14 @@ bool processImage(const PanoramaMap & panoramaMap, const sfmData::SfMData & sfmD
bool hasFailed = false;

// Load metadata to get image color space
std::string colorSpace;
const std::string firstImagePath = (fs::path(warpingFolder) / (std::to_string(overlappingViews[0]) + ".exr")).string();
oiio::ParamValueList srcMetadata = image::readImageMetadata(firstImagePath);
colorSpace = srcMetadata.get_string("AliceVision:ColorSpace", "Linear");
std::string colorSpace = "Linear";
if (overlappingViews.size() > 0)
{
const std::string warpedPath = sfmData.getViews().at(overlappingViews[0])->getMetadata().at("AliceVision:warpedPath");
const std::string firstImagePath = (fs::path(warpingFolder) / (warpedPath + ".exr")).string();
oiio::ParamValueList srcMetadata = image::readImageMetadata(firstImagePath);
colorSpace = srcMetadata.get_string("AliceVision:ColorSpace", "Linear");
}

#pragma omp parallel for
for (int posCurrent = 0; posCurrent < overlappingViews.size(); posCurrent++)
Expand Down

0 comments on commit b763784

Please sign in to comment.