merged

dlib/cmake_utils/add_python_module

@@ -68,6 +68,7 @@ if (PYTHON3)
     if (NOT Boost_FOUND)
         FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)
     endif()
+    set(Python_ADDITIONAL_VERSIONS 3.5)
     FIND_PACKAGE(PythonLibs 3.4 REQUIRED)
 else()
     FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)

dlib/test/cca.cpp

@@ -139,7 +139,7 @@ namespace
             dlog << LINFO << "correlation error: "<< corr_error;
             DLIB_TEST_MSG(corr_error < 1e-13, Ltrans << "\n\n" << Rtrans);
 
-            DLIB_TEST(trans_error < 1e-9);
+            DLIB_TEST(trans_error < 2e-9);
         }
 
         dlog << LINFO << "*****************************************************";

tools/python/src/object_detection.cpp

@@ -325,9 +325,7 @@ ensures \n\
     - This function runs the object detector on the input image and returns \n\
       a list of detections.   \n\
     - Upsamples the image upsample_num_times before running the basic \n\
-      detector.  If you don't know how many times you want to upsample then \n\
-      don't provide a value for upsample_num_times and an appropriate \n\
-      default will be used.")
+      detector.")
         .def("run", run_rect_detector, (arg("image"), arg("upsample_num_times")=0, arg("adjust_threshold")=0.0),
 "requires \n\
     - image is a numpy ndarray containing either an 8bit grayscale or RGB \n\
@@ -337,9 +335,7 @@ ensures \n\
     - This function runs the object detector on the input image and returns \n\
       a tuple of (list of detections, list of scores, list of weight_indices).   \n\
     - Upsamples the image upsample_num_times before running the basic \n\
-      detector.  If you don't know how many times you want to upsample then \n\
-      don't provide a value for upsample_num_times and an appropriate \n\
-      default will be used.")
+      detector.")
         .def("run_multiple", run_multiple_rect_detectors,(arg("detectors"),  arg("image"), arg("upsample_num_times")=0, arg("adjust_threshold")=0.0),
 "requires \n\
     - detectors is a list of detectors. \n\
@@ -350,9 +346,7 @@ ensures \n\
     - This function runs the list of object detectors at once on the input image and returns \n\
       a tuple of (list of detections, list of scores, list of weight_indices).   \n\
     - Upsamples the image upsample_num_times before running the basic \n\
-      detector.  If you don't know how many times you want to upsample then \n\
-      don't provide a value for upsample_num_times and an appropriate \n\
-      default will be used.")
+      detector.")
         .staticmethod("run_multiple")
         .def("save", save_simple_object_detector, (arg("detector_output_filename")), "Save a simple_object_detector to the provided path.")
         .def_pickle(serialize_pickle<type>());