A little fix in haar cascade

diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
index ed60a1b..cc0e85c 100644 (file)
--- a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+++ b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
@@ -125,13 +125,14 @@ CVAPI(void) cvReleaseHaarClassifierCascade( CvHaarClassifierCascade** cascade );
 #define CV_HAAR_FIND_BIGGEST_OBJECT 4
 #define CV_HAAR_DO_ROUGH_SEARCH     8
 
-CVAPI(CvSeq*) cvHaarDetectObjectsForROC( const CvArr* image,
-                     CvHaarClassifierCascade* cascade, CvMemStorage* storage,
-                     std::vector<int>& rejectLevels, std::vector<double>& levelWeightds,
-                     double scale_factor CV_DEFAULT(1.1),
-                     int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0),
-                     CvSize min_size CV_DEFAULT(cvSize(0,0)), CvSize max_size CV_DEFAULT(cvSize(0,0)),
-                     bool outputRejectLevels = false );
+//CVAPI(CvSeq*) cvHaarDetectObjectsForROC( const CvArr* image,
+//                     CvHaarClassifierCascade* cascade, CvMemStorage* storage,
+//                     CvSeq** rejectLevels, CvSeq** levelWeightds,
+//                     double scale_factor CV_DEFAULT(1.1),
+//                     int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0),
+//                     CvSize min_size CV_DEFAULT(cvSize(0,0)), CvSize max_size CV_DEFAULT(cvSize(0,0)),
+//                     bool outputRejectLevels = false );
+
 
 CVAPI(CvSeq*) cvHaarDetectObjects( const CvArr* image,
                      CvHaarClassifierCascade* cascade, CvMemStorage* storage, 
@@ -276,6 +277,14 @@ CVAPI(CvSeq*) cvLatentSvmDetectObjects(IplImage* image,
 #ifdef __cplusplus
 }
 
+CV_EXPORTS CvSeq* cvHaarDetectObjectsForROC( const CvArr* image,
+                     CvHaarClassifierCascade* cascade, CvMemStorage* storage,
+                     std::vector<int>& rejectLevels, std::vector<double>& levelWeightds,
+                     double scale_factor CV_DEFAULT(1.1),
+                     int min_neighbors CV_DEFAULT(3), int flags CV_DEFAULT(0),
+                     CvSize min_size CV_DEFAULT(cvSize(0,0)), CvSize max_size CV_DEFAULT(cvSize(0,0)),
+                     bool outputRejectLevels = false );
+
 namespace cv
 {
        

diff --git a/modules/objdetect/src/haar.cpp b/modules/objdetect/src/haar.cpp
index d0ec2cf..80a1722 100644 (file)
--- a/modules/objdetect/src/haar.cpp
+++ b/modules/objdetect/src/haar.cpp
@@ -1011,7 +1011,7 @@ struct HaarDetectObjects_ScaleCascade_Invoker
 }
     
 
-CV_IMPL CvSeq*
+CvSeq*
 cvHaarDetectObjectsForROC( const CvArr* _img, 
                      CvHaarClassifierCascade* cascade, CvMemStorage* storage,
                      std::vector<int>& rejectLevels, std::vector<double>& levelWeights,