Merge pull request #311 from cuda-geek:soft-cascade-refactoring-and-fixes

modules/objdetect/include/opencv2/objdetect/objdetect.hpp

@@ -561,7 +561,7 @@ public:
     virtual void detect(InputArray image, InputArray rois, std::vector<Detection>& objects) const;
     // Param rects is an output array of bounding rectangles for detected objects.
     // Param confs is an output array of confidence for detected objects. i-th bounding rectangle corresponds i-th configence.
-    CV_WRAP virtual void detect(InputArray image, InputArray rois, OutputArray rects, OutputArray confs) const;
+    CV_WRAP virtual void detect(InputArray image, InputArray rois, CV_OUT OutputArray rects, CV_OUT OutputArray confs) const;
 
 private:
     void detectNoRoi(const Mat& image, std::vector<Detection>& objects) const;

modules/objdetect/perf/perf_cascadeclassifier.cpp

@@ -54,19 +54,20 @@ typedef perf::TestBaseWithParam<fixture> detect;
 
 
 namespace {
-  typedef cv::SCascade::Detection detection_t;
+typedef cv::SCascade::Detection detection_t;
 
-  void extractRacts(std::vector<detection_t> objectBoxes, vector<Rect> rects)
-  {
+void extractRacts(std::vector<detection_t> objectBoxes, vector<Rect>& rects)
+{
     rects.clear();
     for (int i = 0; i < (int)objectBoxes.size(); ++i)
-      rects.push_back(objectBoxes[i].bb);
-  }
+        rects.push_back(objectBoxes[i].bb);
+}
+
 }
 
 PERF_TEST_P(detect, SCascade,
-    testing::Combine(testing::Values(std::string("cv/cascadeandhog/sc_cvpr_2012_to_opencv.xml")),
-    testing::Values(std::string("cv/cascadeandhog/bahnhof/image_00000000_0.png"))))
+    testing::Combine(testing::Values(std::string("cv/cascadeandhog/cascades/inria_caltech-17.01.2013.xml")),
+    testing::Values(std::string("cv/cascadeandhog/images/image_00000000_0.png"))))
 {
     typedef cv::SCascade::Detection Detection;
     cv::Mat colored = imread(getDataPath(get<1>(GetParam())));
@@ -89,4 +90,4 @@ PERF_TEST_P(detect, SCascade,
     extractRacts(objectBoxes, rects);
     std::sort(rects.begin(), rects.end(), comparators::RectLess());
     SANITY_CHECK(rects);
-}
+}
\ No newline at end of file

modules/objdetect/test/test_softcascade.cpp

@@ -40,61 +40,63 @@
 //
 //M*/
 
+#include <string>
+#include <fstream>
+
 #include "test_precomp.hpp"
 
 TEST(SCascade, readCascade)
 {
-    std::string xml = cvtest::TS::ptr()->get_data_path() + "cascadeandhog/icf-template.xml";
+    std::string xml = cvtest::TS::ptr()->get_data_path() + "cascadeandhog/cascades/inria_caltech-17.01.2013.xml";
     cv::SCascade cascade;
     cv::FileStorage fs(xml, cv::FileStorage::READ);
     ASSERT_TRUE(fs.isOpened());
     ASSERT_TRUE(cascade.load(fs.getFirstTopLevelNode()));
-
 }
 
 TEST(SCascade, detect)
 {
     typedef cv::SCascade::Detection Detection;
-    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/sc_cvpr_2012_to_opencv.xml";
+    std::string xml =  cvtest::TS::ptr()->get_data_path()+ "cascadeandhog/cascades/inria_caltech-17.01.2013.xml";
     cv::SCascade cascade;
     cv::FileStorage fs(xml, cv::FileStorage::READ);
     ASSERT_TRUE(cascade.load(fs.getFirstTopLevelNode()));
 
-    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/bahnhof/image_00000000_0.png");
+    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path()  + "cascadeandhog/images/image_00000000_0.png");
     ASSERT_FALSE(colored.empty());
 
     std::vector<Detection> objects;
-
     cascade.detect(colored, cv::noArray(), objects);
-    ASSERT_EQ(1459, (int)objects.size());
+
+    ASSERT_EQ(719, (int)objects.size());
 }
 
 TEST(SCascade, detectSeparate)
 {
     typedef cv::SCascade::Detection Detection;
-    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/sc_cvpr_2012_to_opencv.xml";
+    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/cascades/inria_caltech-17.01.2013.xml";
     cv::SCascade cascade;
     cv::FileStorage fs(xml, cv::FileStorage::READ);
     ASSERT_TRUE(cascade.load(fs.getFirstTopLevelNode()));
 
-    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/bahnhof/image_00000000_0.png");
+    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/images/image_00000000_0.png");
     ASSERT_FALSE(colored.empty());
 
     cv::Mat rects, confs;
 
     cascade.detect(colored, cv::noArray(), rects, confs);
-    ASSERT_EQ(1459, confs.cols);
+    ASSERT_EQ(719, confs.cols);
 }
 
 TEST(SCascade, detectRoi)
 {
     typedef cv::SCascade::Detection Detection;
-    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/sc_cvpr_2012_to_opencv.xml";
+    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/cascades/inria_caltech-17.01.2013.xml";
     cv::SCascade cascade;
     cv::FileStorage fs(xml, cv::FileStorage::READ);
     ASSERT_TRUE(cascade.load(fs.getFirstTopLevelNode()));
 
-    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/bahnhof/image_00000000_0.png");
+    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/images/image_00000000_0.png");
     ASSERT_FALSE(colored.empty());
 
     std::vector<Detection> objects;
@@ -102,18 +104,18 @@ TEST(SCascade, detectRoi)
     rois.push_back(cv::Rect(0, 0, 640, 480));
 
     cascade.detect(colored, rois, objects);
-    ASSERT_EQ(1459, (int)objects.size());
+    ASSERT_EQ(719, (int)objects.size());
 }
 
 TEST(SCascade, detectNoRoi)
 {
     typedef cv::SCascade::Detection Detection;
-    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/sc_cvpr_2012_to_opencv.xml";
+    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/cascades/inria_caltech-17.01.2013.xml";
     cv::SCascade cascade;
     cv::FileStorage fs(xml, cv::FileStorage::READ);
     ASSERT_TRUE(cascade.load(fs.getFirstTopLevelNode()));
 
-    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/bahnhof/image_00000000_0.png");
+    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/images/image_00000000_0.png");
     ASSERT_FALSE(colored.empty());
 
     std::vector<Detection> objects;
@@ -121,5 +123,22 @@ TEST(SCascade, detectNoRoi)
 
     cascade.detect(colored, rois, objects);
 
+    ASSERT_EQ(719, (int)objects.size());
+}
+
+TEST(SCascade, detectEmptyRoi)
+{
+    typedef cv::SCascade::Detection Detection;
+    std::string xml =  cvtest::TS::ptr()->get_data_path() + "cascadeandhog/cascades/inria_caltech-17.01.2013.xml";
+    cv::SCascade cascade;
+    cv::FileStorage fs(xml, cv::FileStorage::READ);
+    ASSERT_TRUE(cascade.load(fs.getFirstTopLevelNode()));
+
+    cv::Mat colored = cv::imread(cvtest::TS::ptr()->get_data_path() + "cascadeandhog/images/image_00000000_0.png");
+    ASSERT_FALSE(colored.empty());
+
+    std::vector<Detection> objects;
+    cascade.detect(colored, cv::Mat::zeros(colored.size(), CV_8UC1), objects);
+
     ASSERT_EQ(0, (int)objects.size());
 }
\ No newline at end of file