Replace $PWD in ALICEVISION_ROOT definition in continuous-integration…

….yml
alicevision · Sep 9, 2022 · cb3c321 · cb3c321
1 parent 38366cc
commit cb3c321
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -25,7 +25,7 @@ jobs:
       DEPS_INSTALL_DIR: /opt/AliceVision_install
       BUILD_TYPE: Release
       CTEST_OUTPUT_ON_FAILURE: 1
-      ALICEVISION_ROOT: $PWD/../AV_install
+      ALICEVISION_ROOT: ${{ github.workspace }}/../AV_install
     steps:
       - uses: actions/checkout@v1
 

diff --git a/src/aliceVision/image/io.cpp b/src/aliceVision/image/io.cpp
@@ -784,12 +784,12 @@ bool tryLoadMask(Image<unsigned char>* mask, const std::vector<std::string>& mas
 
             if (fs::exists(idMaskPath))
             {
-                readImage(idMaskPath.string(), *mask, EImageColorSpace::LINEAR);
+                readImage(idMaskPath.string(), *mask, EImageColorSpace::SRGB_LINEAR);
                 return true;
             }
             else if (fs::exists(nameMaskPath))
             {
-                readImage(nameMaskPath.string(), *mask, EImageColorSpace::LINEAR);
+                readImage(nameMaskPath.string(), *mask, EImageColorSpace::SRGB_LINEAR);
                 return true;
             }
         }

diff --git a/src/aliceVision/sfmDataIO/compatibilityData/scene_v1.2.3.abc b/src/aliceVision/sfmDataIO/compatibilityData/scene_v1.2.3.abc