mods-with-mask expects B&W masks with image img1_mask.png, where img1…

… is *.jpg file specified in console input
ducha-aiki · Aug 8, 2018 · 8d9df27 · 8d9df27
1 parent 5a9818c
commit 8d9df27
Show file tree

Hide file tree

Showing 4 changed files with 550 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,6 +96,10 @@ TARGET_LINK_LIBRARIES(synth-detection matching mser affinedetectors helpers ${Op
 add_executable(mods  mods.cpp correspondencebank.cpp imagerepresentation.cpp io_mods.cpp)
 TARGET_LINK_LIBRARIES(mods inih matching synth-detection mser affinedetectors ${OpenCV_LIBS} zmq)
 
+add_executable(mods-with-mask  mods-with-mask.cpp correspondencebank.cpp imagerepresentation.cpp io_mods.cpp)
+TARGET_LINK_LIBRARIES(mods-with-mask inih matching synth-detection mser affinedetectors ${OpenCV_LIBS} zmq)
+
+
 add_executable(extract_features extract_features.cpp correspondencebank.cpp imagerepresentation.cpp io_mods.cpp)
 TARGET_LINK_LIBRARIES(extract_features inih matching synth-detection mser affinedetectors ${OpenCV_LIBS} zmq)
 

diff --git a/imagerepresentation.cpp b/imagerepresentation.cpp
@@ -933,7 +933,17 @@ void ImageRepresentation::SynthDetectDescribeKeypoints (IterationViewsynthesisPa
                     }
                   ReprojectRegions(temp_kp1_desc, temp_img1.H, OriginalImg.cols, OriginalImg.rows);
                 }
-
+              if (mask.cols == OriginalImg.cols) {
+                  std::cout << "Mask filtering" << std::endl;
+                  AffineRegionVector temp_kp1_filtered;
+                  for (int kp_id = 0; kp_id < temp_kp1_desc.size(); kp_id++){
+                      if (mask.at<unsigned char>(int(temp_kp1_desc[kp_id].reproj_kp.y),int(temp_kp1_desc[kp_id].reproj_kp.x)) > 0) {
+                          temp_kp1_filtered.push_back(temp_kp1_desc[kp_id]);
+                        }
+                    }
+                  std::cout << temp_kp1_filtered.size() << " out of " << temp_kp1_desc.size() << " left" << std::endl;
+                  temp_kp1_desc = temp_kp1_filtered;
+                }
               ///Description
               ///
               time1 = ((double) (getMilliSecs1() - s_time)) / 1000;

diff --git a/imagerepresentation.h b/imagerepresentation.h
@@ -45,6 +45,7 @@ class ImageRepresentation
                                           DominantOrientationParams &dom_ori_par, double* H,
                                           const int width2, const int height2);
   cv::Mat OriginalImg;
+  cv::Mat mask;
   void SaveRegions(std::string fname, int mode);
   void SaveRegionsAMatrix(std::string fname);
   void SaveRegionsMichal(std::string fname, int mode);