Merge pull request #2002 from alicevision/dev/maskProcessing

Update mask processing for single mask broadcasting

Author: servantftransperfect

meshroom/aliceVision/MaskProcessing.py

@@ -43,7 +43,8 @@ class MaskProcessing(desc.AVCommandLineNode):
             ),
             name="inputs",
             label="Input Directories",
-            description="A set of directories containing masks with the same names.",
+            description="A set of directories containing masks with the same names.\n" 
+            "Any entry (except the first one) may be an image path. In this case, this mask will be used as an operand for each entry of the first directory.",
             exposed=True,
         ),
         desc.ChoiceParam(

src/software/utils/main_maskProcessing.cpp

@@ -157,10 +157,19 @@ int aliceVision_main(int argc, char** argv)
             {
                 std::filesystem::path otherPath(directoryNames[otherDirIndex]);
 
-                std::filesystem::path otherMaskPath = otherPath / refpath.filename();
-                if (!std::filesystem::exists(otherMaskPath))
+                std::filesystem::path otherMaskPath;
+                if (std::filesystem::is_directory(otherPath))
                 {
-                    continue;
+                    otherMaskPath = otherPath / refpath.filename();
+                    if (!std::filesystem::exists(otherMaskPath))
+                    {
+                        continue;
+                    }
+                }
+                else 
+                {
+                    //Use the specified file directly
+                    otherMaskPath = otherPath;
                 }
 
                 image::Image<unsigned char> otherImg;