From 277c112abc3373dcd39cc838e83a802430f6c7ef Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Wed, 1 Jan 2014 19:48:48 -0500
Subject: [PATCH 1/3] updated docs

---
 docs/docs/imaging.xml   | 8 ++++++++
 docs/docs/main_menu.xml | 4 ++++
 docs/docs/ml.xml        | 3 +++
 3 files changed, 15 insertions(+)

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 @@
          </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>
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 @@
                   <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>
diff --git a/docs/docs/ml.xml b/docs/docs/ml.xml
index feb3583e3..7363c71d2 100644
--- a/docs/docs/ml.xml
+++ b/docs/docs/ml.xml
@@ -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>
@@ -2809,6 +2811,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>

From c7c6da6f91d2074f104cff7e0c90bc5799cfb428 Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Wed, 1 Jan 2014 22:58:02 -0500
Subject: [PATCH 2/3] updated specs

---
 dlib/svm/structural_object_detection_trainer_abstract.h     | 2 ++
 dlib/svm/structural_svm_object_detection_problem_abstract.h | 2 ++
 2 files changed, 4 insertions(+)

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
 

From c23ee947a2ef51bdc6274c3b504bc54a67c99d6c Mon Sep 17 00:00:00 2001
From: Davis King <davis@dlib.net>
Date: Wed, 1 Jan 2014 23:00:20 -0500
Subject: [PATCH 3/3] updated docs

---
 docs/docs/ml.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/docs/ml.xml b/docs/docs/ml.xml
index 7363c71d2..5e37d1431 100644
--- a/docs/docs/ml.xml
+++ b/docs/docs/ml.xml
@@ -2721,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.