Commit 5e141254 authored by Davis King's avatar Davis King

merged

parents f56043b7 c23ee947
......@@ -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
......
......@@ -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
......
......@@ -1024,6 +1024,7 @@
</description>
<examples>
<example>fhog_ex.cpp.html</example>
<example>fhog_object_detector_ex.cpp.html</example>
</examples>
</component>
......@@ -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.
</description>
<examples>
<example>fhog_object_detector_ex.cpp.html</example>
</examples>
</component>
<!-- ************************************************************************* -->
......@@ -1811,6 +1815,9 @@
</blockquote>
Since these HOG features have been shown to give superior performance.
</description>
<examples>
<example>fhog_object_detector_ex.cpp.html</example>
</examples>
</component>
......@@ -1935,6 +1942,7 @@
</p>
</description>
<examples>
<example>fhog_object_detector_ex.cpp.html</example>
<example>object_detector_ex.cpp.html</example>
<example>object_detector_advanced_ex.cpp.html</example>
<example>train_object_detector.cpp.html</example>
......
......@@ -262,6 +262,10 @@
<name>FHOG_Feature_Extraction</name>
<link>fhog_ex.cpp.html</link>
</item>
<item>
<name>FHOG_Object_Detection</name>
<link>fhog_object_detector_ex.cpp.html</link>
</item>
<item>
<name>SURF</name>
<link>surf_ex.cpp.html</link>
......
......@@ -1926,6 +1926,7 @@ Davis E. King. <a href="http://jmlr.csail.mit.edu/papers/volume10/king09a/king09
a little more convenient.
</description>
<examples>
<example>fhog_object_detector_ex.cpp.html</example>
<example>train_object_detector.cpp.html</example>
</examples>
......@@ -2618,6 +2619,7 @@ Davis E. King. <a href="http://jmlr.csail.mit.edu/papers/volume10/king09a/king09
and returns the precision and recall.
</description>
<examples>
<example>fhog_object_detector_ex.cpp.html</example>
<example>object_detector_ex.cpp.html</example>
<example>object_detector_advanced_ex.cpp.html</example>
<example>train_object_detector.cpp.html</example>
......@@ -2719,7 +2721,8 @@ Davis E. King. <a href="http://jmlr.csail.mit.edu/papers/volume10/king09a/king09
<spec_file link="true">dlib/svm/structural_svm_object_detection_problem_abstract.h</spec_file>
<description>
This object is a tool for learning the parameter vector needed to use
a <a href="imaging.html#scan_image_pyramid">scan_image_pyramid</a>,
a <a href="imaging.html#scan_fhog_pyramid">scan_fhog_pyramid</a>,
<a href="imaging.html#scan_image_pyramid">scan_image_pyramid</a>,
<a href="imaging.html#scan_image_boxes">scan_image_boxes</a>, or
<a href="imaging.html#scan_image_custom">scan_image_custom</a> object.
......@@ -2809,6 +2812,7 @@ Davis E. King. <a href="http://jmlr.csail.mit.edu/papers/volume10/king09a/king09
</p>
</description>
<examples>
<example>fhog_object_detector_ex.cpp.html</example>
<example>object_detector_ex.cpp.html</example>
<example>object_detector_advanced_ex.cpp.html</example>
<example>train_object_detector.cpp.html</example>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment