diff --git a/dlib/svm/structural_object_detection_trainer_abstract.h b/dlib/svm/structural_object_detection_trainer_abstract.h index 4cf351462..3373b4380 100644 --- a/dlib/svm/structural_object_detection_trainer_abstract.h +++ b/dlib/svm/structural_object_detection_trainer_abstract.h @@ -22,6 +22,8 @@ namespace dlib /*! REQUIREMENTS ON image_scanner_type image_scanner_type must be an implementation of + dlib/image_processing/scan_fhog_pyramid_abstract.h or + dlib/image_processing/scan_image_custom_abstract.h or dlib/image_processing/scan_image_pyramid_abstract.h or dlib/image_processing/scan_image_boxes_abstract.h diff --git a/dlib/svm/structural_svm_object_detection_problem_abstract.h b/dlib/svm/structural_svm_object_detection_problem_abstract.h index 6bb6c47a9..b7f8a3e36 100644 --- a/dlib/svm/structural_svm_object_detection_problem_abstract.h +++ b/dlib/svm/structural_svm_object_detection_problem_abstract.h @@ -41,6 +41,8 @@ namespace dlib /*! REQUIREMENTS ON image_scanner_type image_scanner_type must be an implementation of + dlib/image_processing/scan_fhog_pyramid_abstract.h or + dlib/image_processing/scan_image_custom_abstract.h or dlib/image_processing/scan_image_pyramid_abstract.h or dlib/image_processing/scan_image_boxes_abstract.h diff --git a/docs/docs/imaging.xml b/docs/docs/imaging.xml index e365890e1..026fb54d9 100644 --- a/docs/docs/imaging.xml +++ b/docs/docs/imaging.xml @@ -1024,6 +1024,7 @@ fhog_ex.cpp.html + fhog_object_detector_ex.cpp.html @@ -1468,6 +1469,9 @@ boxes. Therefore, this function is useful if you are training and object detector and your objects have a left/right symmetry. + + fhog_object_detector_ex.cpp.html + @@ -1811,6 +1815,9 @@ Since these HOG features have been shown to give superior performance. + + fhog_object_detector_ex.cpp.html + @@ -1935,6 +1942,7 @@

+ fhog_object_detector_ex.cpp.html object_detector_ex.cpp.html object_detector_advanced_ex.cpp.html train_object_detector.cpp.html diff --git a/docs/docs/main_menu.xml b/docs/docs/main_menu.xml index 347fd126e..dfe6176ab 100644 --- a/docs/docs/main_menu.xml +++ b/docs/docs/main_menu.xml @@ -262,6 +262,10 @@ FHOG_Feature_Extraction fhog_ex.cpp.html + + FHOG_Object_Detection + fhog_object_detector_ex.cpp.html + SURF surf_ex.cpp.html diff --git a/docs/docs/ml.xml b/docs/docs/ml.xml index feb3583e3..5e37d1431 100644 --- a/docs/docs/ml.xml +++ b/docs/docs/ml.xml @@ -1926,6 +1926,7 @@ Davis E. King. + fhog_object_detector_ex.cpp.html object_detector_ex.cpp.html object_detector_advanced_ex.cpp.html train_object_detector.cpp.html @@ -2719,7 +2721,8 @@ Davis E. King. dlib/svm/structural_svm_object_detection_problem_abstract.h This object is a tool for learning the parameter vector needed to use - a scan_image_pyramid, + a scan_fhog_pyramid, + scan_image_pyramid, scan_image_boxes, or scan_image_custom object. @@ -2809,6 +2812,7 @@ Davis E. King.