some changes;

Author: Dinar Ahmatnurov

modules/latentsvm/include/opencv2/latentsvm/latentsvm.hpp renamed to modules/latentsvm/include/opencv2/latentsvm.hpp

@@ -43,18 +43,14 @@
 #define __OPENCV_OBJDETECT_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/core_c.h"
+//#include "opencv2/core/core_c.h"
 
-#ifdef __cplusplus
 #include <map>
 #include <vector>
 #include <string>
-#endif
 
 extern "C" {
 
-
-
 /****************************************************************************************\
 *                         Latent SVM Object Detection functions                          *
 \****************************************************************************************/
@@ -63,6 +59,7 @@ extern "C" {
 // Structure describes the position of the filter in the feature pyramid
 // l - level in the feature pyramid
 // (x, y) - coordinate in level l
+
 typedef struct CvLSVMFilterPosition
 {
     int x;
@@ -84,6 +81,7 @@ typedef struct CvLSVMFilterPosition
 //                   used formula H[(j * sizeX + i) * p + k], where
 //                   k - component of feature vector in cell (i, j)
 // END OF FILTER DESCRIPTION
+
 typedef struct CvLSVMFilterObjectCaskade{
     CvLSVMFilterPosition V;
     float fineFunction[4];
@@ -106,6 +104,7 @@ typedef struct CvLSVMFilterObjectCaskade{
 // filters				- root and part filters for all model components
 // b					- biases for all model components
 // score_threshold		- confidence level threshold
+
 typedef struct CvLatentSvmDetectorCaskade
 {
     int num_filters;
@@ -118,77 +117,7 @@ typedef struct CvLatentSvmDetectorCaskade
     int pca_size;
 } CvLatentSvmDetectorCaskade;
 
-// data type: STRUCT CvObjectDetection
-// structure contains the bounding box and confidence level for detected object
-// rect					- bounding box for a detected object
-// score				- confidence level
-typedef struct CvObjectDetection
-{
-    CvRect rect;
-    float score;
-} CvObjectDetection;
-}
-//////////////// Object Detection using Latent SVM //////////////
-
-
-/*
-// load trained detector from a file
-//
-// API
-// CvLatentSvmDetector* cvLoadLatentSvmDetector(const char* filename);
-// INPUT
-// filename				- path to the file containing the parameters of
-                        - trained Latent SVM detector
-// OUTPUT
-// trained Latent SVM detector in internal representation
-*/
-namespace cv
-{
-namespace lsvmc
-{
-CVAPI(CvLatentSvmDetectorCaskade*) cvLoadLatentSvmDetectorCaskade(const char* filename);
-
-/*
-// release memory allocated for CvLatentSvmDetector structure
-//
-// API
-// void cvReleaseLatentSvmDetector(CvLatentSvmDetector** detector);
-// INPUT
-// detector				- CvLatentSvmDetector structure to be released
-// OUTPUT
-*/
-CVAPI(void) cvReleaseLatentSvmDetectorCaskade(CvLatentSvmDetectorCaskade** detector);
-/*
-// find rectangular regions in the given image that are likely
-// to contain objects and corresponding confidence levels
-//
-// API
-// CvSeq* cvLatentSvmDetectObjects(const IplImage* image,
-//									CvLatentSvmDetector* detector,
-//									CvMemStorage* storage,
-//									float overlap_threshold = 0.5f,
-//                                  int numThreads = -1);
-// INPUT
-// image				- image to detect objects in
-// detector				- Latent SVM detector in internal representation
-// storage				- memory storage to store the resultant sequence
-//							of the object candidate rectangles
-// overlap_threshold	- threshold for the non-maximum suppression algorithm
-                           = 0.5f [P. Felzenszwalb, R. Girshick, D. McAllester Cascade
-//						   Object Detection with Deformable Part Models 
-//            IEEE Conference on Computer Vision and Pattern Recognition (CVPR), 2010]
-// OUTPUT
-// sequence of detected objects (bounding boxes and confidence levels stored in CvObjectDetection structures)
-*/
-CVAPI(CvSeq*) cvLatentSvmDetectObjectsCaskade(IplImage* image,
-                                CvLatentSvmDetectorCaskade* detector,
-                                CvMemStorage* storage,
-                                float overlap_threshold CV_DEFAULT(0.5f));
-}
 }
-#ifdef __cplusplus
-
-
 
 namespace cv
 {
@@ -224,8 +153,8 @@ class CV_EXPORTS LatentSvmDetector
     virtual bool empty() const;
     bool load( const std::vector<std::string>& filenames, const std::vector<std::string>& classNames=std::vector<std::string>() );
 
-    virtual void detect( const Mat& image,
-                         std::vector<ObjectDetection>& objectDetections,
+    virtual void detect(const Mat& image,
+                         CV_OUT std::vector<ObjectDetection>& objects,
                          float overlapThreshold=0.5f);
 
     const std::vector<std::string>& getClassNames() const;
@@ -239,5 +168,3 @@ class CV_EXPORTS LatentSvmDetector
 } // namespace cv
 
 #endif
-
-#endif

modules/latentsvm/src/lsvmc_latentsvmdetector.cpp

@@ -47,6 +47,17 @@ namespace cv
 namespace lsvmc
 {
 
+// data type: STRUCT CvObjectDetection
+// structure contains the bounding box and confidence level for detected object
+// rect					- bounding box for a detected object
+// score				- confidence level
+
+typedef struct CvObjectDetection
+{
+    cv::Rect rect;
+    float score;
+} CvObjectDetection;
+
 std::string extractModelName( const std::string& filename );
 
 const int pca_size = 31;
@@ -99,7 +110,7 @@ CvLatentSvmDetectorCaskade* cvLoadLatentSvmDetectorCaskade(const char* filename)
 // detector             - CvLatentSvmDetectorCaskade structure to be released
 // OUTPUT
 */
-CVAPI(void) cvReleaseLatentSvmDetectorCaskade(CvLatentSvmDetectorCaskade** detector)
+void cvReleaseLatentSvmDetectorCaskade(CvLatentSvmDetectorCaskade** detector)
 {
     free((*detector)->b);
     free((*detector)->num_part_filters);

modules/latentsvm/src/precomp.hpp

@@ -51,7 +51,7 @@
 #include <deque>
 #endif
 
-#include "opencv2/latentsvm/latentsvm.hpp"
+#include "opencv2/latentsvm.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/core_c.h"

modules/latentsvm/test/test_latentsvmdetector_caskade.cpp

@@ -43,7 +43,7 @@
 #include "test_precomp.hpp"
 
 #include <string>
-#include "opencv2/highgui/highgui_c.h"
+//#include "opencv2/highgui/highgui_c.h"
 
 #ifdef HAVE_CVCONFIG_H
 #include "cvconfig.h"
@@ -55,85 +55,8 @@
 
 using namespace cv;
 
-const int num_detections = 1;
-const float true_scores[] = {-0.83f};
 const float score_thr = 0.05f;
-const CvRect true_bounding_boxes[] = {cvRect(0, 0, 340, 485)};
 
-class CV_LatentSVMDetectorCaskadeTest : public cvtest::BaseTest
-{
-protected:
-    void run(int);
-    bool isEqual(CvRect r1, CvRect r2, int eps);
-};
-
-bool CV_LatentSVMDetectorCaskadeTest::isEqual(CvRect r1, CvRect r2, int eps)
-{
-    return (std::abs(r1.x - r2.x) <= eps
-            && std::abs(r1.y - r2.y) <= eps
-            && std::abs(r1.width - r2.width) <= eps
-            && std::abs(r1.height - r2.height) <= eps);
-}
-
-void CV_LatentSVMDetectorCaskadeTest::run( int /* start_from */)
-{
-    std::string img_path = std::string(ts->get_data_path()) + "cat.png";
-    std::string model_path = std::string(ts->get_data_path()) + "models_VOC2007_caskade/cat.xml";
-
-#ifdef HAVE_TBB
-    int numThreads = 2;
-    tbb::task_scheduler_init init(tbb::task_scheduler_init::deferred);
-    init.initialize(numThreads);
-#endif
-
-    IplImage* image = cvLoadImage(img_path.c_str());
-    if (!image)
-    {
-        ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
-        return;
-    }
-
-    CvLatentSvmDetectorCaskade* detector;
-    detector = cv::lsvmc::cvLoadLatentSvmDetectorCaskade(model_path.c_str());
-    if (!detector)
-    {
-        ts->set_failed_test_info( cvtest::TS::FAIL_INVALID_TEST_DATA );
-        cvReleaseImage(&image);
-        return;
-    }
-
-    CvMemStorage* storage = cvCreateMemStorage(0);
-    CvSeq* detections = 0;
-    detections = cv::lsvmc::cvLatentSvmDetectObjectsCaskade(image, detector, storage, 0.5f);
-
-    if (detections->total != num_detections)
-    {
-        ts->set_failed_test_info( cvtest::TS::FAIL_MISMATCH );
-    }
-    else
-    {
-        ts->set_failed_test_info(cvtest::TS::OK);
-        for (int i = 0; i < detections->total; i++)
-        {
-            CvObjectDetection detection = *(CvObjectDetection*)cvGetSeqElem( detections, i );
-            CvRect bounding_box = detection.rect;
-            float score = detection.score;
-            if ((!isEqual(bounding_box, true_bounding_boxes[i], 1)) || (fabs(score - true_scores[i]) > score_thr))
-            {
-                ts->set_failed_test_info( cvtest::TS::FAIL_MISMATCH );
-                break;
-            }
-        }
-    }
-#ifdef HAVE_TBB
-    init.terminate();
-#endif
-    cvReleaseMemStorage( &storage );
-    cv::lsvmc::cvReleaseLatentSvmDetectorCaskade( &detector );
-    cvReleaseImage( &image );
-}
-
-// Test for c++ version of Latent SVM
 
 class LatentSVMDetectorCaskadeTest : public cvtest::BaseTest
 {
@@ -307,5 +230,4 @@ void LatentSVMDetectorCaskadeTest::run( int /* start_from */)
     ts->set_failed_test_info( cvtest::TS::OK);
 }
 
-TEST(Objdetect_LatentSVMDetectorCaskade_c, regression) { CV_LatentSVMDetectorCaskadeTest test; test.safe_run(); }
 TEST(Objdetect_LatentSVMDetectorCaskade_cpp, regression) { LatentSVMDetectorCaskadeTest test; test.safe_run(); }

modules/latentsvm/test/test_precomp.hpp

@@ -10,7 +10,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/latentsvm/latentsvm.hpp"
+#include "opencv2/latentsvm.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"