From a194a5ed745f8cc8c1fa2778dae8dbf877b837e8 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Fri, 13 Sep 2024 09:43:15 +0200 Subject: [PATCH] remove duplicated ocio init --- src/aliceVision/image/io.cpp | 21 ++----------------- src/aliceVision/image/io.hpp | 4 ---- .../pipeline/main_panoramaPostProcessing.cpp | 7 +------ 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/aliceVision/image/io.cpp b/src/aliceVision/image/io.cpp index 74b4a537b3..f3a20f07c9 100644 --- a/src/aliceVision/image/io.cpp +++ b/src/aliceVision/image/io.cpp @@ -872,13 +872,8 @@ void readImage(const std::string& path, oiio::TypeDesc format, int nchannels, Im else if (EImageColorSpace_isSupportedOIIOEnum(imageReadOptions.workingColorSpace) && EImageColorSpace_isSupportedOIIOEnum(EImageColorSpace_stringToEnum(fromColorSpaceName))) { - const auto colorConfigPath = getAliceVisionOCIOConfig(); - if (colorConfigPath.empty()) - { - throw std::runtime_error("ALICEVISION_ROOT is not defined, OCIO config file cannot be accessed."); - } oiio::ImageBuf colorspaceBuf; - oiio::ColorConfig colorConfig(colorConfigPath); + oiio::ColorConfig& colorConfig(getGlobalColorConfigOCIO()); oiio::ImageBufAlgo::colorconvert(colorspaceBuf, inBuf, fromColorSpaceName, @@ -1103,12 +1098,7 @@ void writeImage(const std::string& path, } else if (EImageColorSpace_isSupportedOIIOEnum(fromColorSpace) && EImageColorSpace_isSupportedOIIOEnum(toColorSpace)) { - const auto colorConfigPath = getAliceVisionOCIOConfig(); - if (colorConfigPath.empty()) - { - throw std::runtime_error("ALICEVISION_ROOT is not defined, OCIO config file cannot be accessed."); - } - oiio::ColorConfig colorConfig(colorConfigPath); + oiio::ColorConfig& colorConfig(getGlobalColorConfigOCIO()); oiio::ImageBufAlgo::colorconvert(colorspaceBuf, *outBuf, EImageColorSpace_enumToOIIOString(fromColorSpace), @@ -1395,13 +1385,6 @@ std::string getAliceVisionRoot() return value ? value : ""; } -std::string getAliceVisionOCIOConfig() -{ - if (!getAliceVisionRoot().empty()) - return getAliceVisionRoot() + "/share/aliceVision/config.ocio"; - return {}; -} - void setAliceVisionRootOverride(const std::string& value) { aliceVisionRootOverride = value; } } // namespace image diff --git a/src/aliceVision/image/io.hpp b/src/aliceVision/image/io.hpp index 12485af069..48c235d2e3 100644 --- a/src/aliceVision/image/io.hpp +++ b/src/aliceVision/image/io.hpp @@ -552,10 +552,6 @@ bool tryLoadMask(Image* mask, // TODO: use std::optional when the C++ standard version is upgraded to C++17 std::string getAliceVisionRoot(); -/// Returns path to OpenColorIO config that is shipped with aliceVision -std::string getAliceVisionOCIOConfig(); - -void setAliceVisionRootOverride(const std::string& value); } // namespace image } // namespace aliceVision diff --git a/src/software/pipeline/main_panoramaPostProcessing.cpp b/src/software/pipeline/main_panoramaPostProcessing.cpp index 7d3baaa523..61912d22e3 100644 --- a/src/software/pipeline/main_panoramaPostProcessing.cpp +++ b/src/software/pipeline/main_panoramaPostProcessing.cpp @@ -223,12 +223,7 @@ void colorSpaceTransform(image::Image& inputImage, } else if (EImageColorSpace_isSupportedOIIOEnum(toColorSpace) && EImageColorSpace_isSupportedOIIOEnum(fromColorSpace)) { - const auto colorConfigPath = image::getAliceVisionOCIOConfig(); - if (colorConfigPath.empty()) - { - throw std::runtime_error("ALICEVISION_ROOT is not defined, OCIO config file cannot be accessed."); - } - oiio::ColorConfig colorConfig(colorConfigPath); + oiio::ColorConfig& colorConfig(image::getGlobalColorConfigOCIO()); oiio::ImageBufAlgo::colorconvert(colorspaceBuf, *outBuf, EImageColorSpace_enumToOIIOString(fromColorSpace),