fix python bindings
authormarina.kolpakova <marina.kolpakova@itseez.com>
Wed, 30 Jan 2013 06:54:58 +0000 (10:54 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Fri, 1 Feb 2013 10:36:06 +0000 (14:36 +0400)
modules/python/CMakeLists.txt
modules/softcascade/misc/sft.py

index 4d07221..d36b6d8 100644 (file)
@@ -34,6 +34,7 @@ set(opencv_hdrs
     "${OPENCV_MODULE_opencv_features2d_LOCATION}/include/opencv2/features2d/features2d.hpp"
     "${OPENCV_MODULE_opencv_calib3d_LOCATION}/include/opencv2/calib3d/calib3d.hpp"
     "${OPENCV_MODULE_opencv_objdetect_LOCATION}/include/opencv2/objdetect/objdetect.hpp"
+    "${OPENCV_MODULE_opencv_softcascade_LOCATION}/include/opencv2/softcascade/softcascade.hpp"
     "${OPENCV_MODULE_opencv_contrib_LOCATION}/include/opencv2/contrib/contrib.hpp")
 
 if(HAVE_opencv_nonfree)
index 358c670..019044f 100644 (file)
@@ -23,8 +23,8 @@ def convert2detections(rects, confs, crop_factor = 0.125):
 
 """ Create new instance of soft cascade."""
 def cascade(min_scale, max_scale, nscales, f):
-    # where we use nms cv::SCascade::DOLLAR == 2
-    c = cv2.SCascade(min_scale, max_scale, nscales, 2)
+    # where we use nms cv::SoftCascadeDetector::DOLLAR == 2
+    c = cv2.SoftCascadeDetector(min_scale, max_scale, nscales, 2)
     xml = cv2.FileStorage(f, 0)
     dom = xml.getFirstTopLevelNode()
     assert c.load(dom)