[apps] Feature masking openMVG#513

- use the following predicate: we keep points if (mask(pointposition)!=0)
Lancelot899 · Apr 22, 2016 · beb0aba · beb0aba
1 parent e9212e3
commit beb0aba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/docs/sphinx/rst/software/SfM/ComputeFeatures.rst b/docs/sphinx/rst/software/SfM/ComputeFeatures.rst
@@ -63,7 +63,7 @@ Arguments description:
   - You want to speed up the computation by reducing the number features/regions and thus the number of tie points.
 
   For this kind of needs you can use a mask. A mask is simply a binary image having the same size (width and height) than the target image.
-  The black areas on a mask denote the "bad parts", *i.e.* the areas to be masked and for which descriptors are not computed.
+  The black areas on a mask denote the "bad parts", *i.e.* the areas to be masked and for which descriptors are not computed. A point is kept if the mask value at the point position is different than 0.
   In openMVG_main_ComputeFeatures, the association of a mask and an image is implicit. It uses the following conventions:
 
   - It tries to load a global mask.png file from directory where the the SfM container file (sfm_data.*) is stored.

diff --git a/src/nonFree/sift/SIFT_describer.hpp b/src/nonFree/sift/SIFT_describer.hpp
@@ -164,7 +164,7 @@ class SIFT_Image_describer : public Image_describer
         if (mask)
         {
           const image::Image<unsigned char> & maskIma = *mask;
-          if (maskIma(keys[i].y, keys[i].x) < 255)
+          if (maskIma(keys[i].y, keys[i].x) == 0)
             continue;
         }
 

diff --git a/src/openMVG/features/image_describer_akaze.hpp b/src/openMVG/features/image_describer_akaze.hpp
@@ -57,7 +57,7 @@ class AKAZE_Image_describer : public Image_describer
   ):Image_describer(), params_(params), bOrientation_(bOrientation) {}
 
 
-  bool Set_configuration_preset(EDESCRIBER_PRESET preset) override 
+  bool Set_configuration_preset(EDESCRIBER_PRESET preset) override
   {
     switch(preset)
     {
@@ -85,7 +85,7 @@ class AKAZE_Image_describer : public Image_describer
   */
   bool Describe(const image::Image<unsigned char>& image,
     std::unique_ptr<Regions> &regions,
-    const image::Image<unsigned char> * mask = nullptr ) override 
+    const image::Image<unsigned char> * mask = nullptr ) override
   {
     params_.options_.fDesc_factor =
       (params_.eAkazeDescriptor_ == AKAZE_MSURF ||
@@ -121,7 +121,7 @@ class AKAZE_Image_describer : public Image_describer
           if (mask)
           {
             const image::Image<unsigned char> & maskIma = *mask;
-            if (maskIma(ptAkaze.y, ptAkaze.x) < 255)
+            if (maskIma(ptAkaze.y, ptAkaze.x) == 0)
               continue;
           }