Skip to content

GitLab

"vscode:/vscode.git/clone" did not exist on "0a5d62d85cfacc3cc77a99a21cc4518f79febef3"
Commit 5bde5c52 authored by Davis King's avatar Davis King
Browse files

Made the index outputs of run_multiple_rect_detectors be integers rather than doubles.

parent 1ec5a945
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
tools/python/src/simple_object_detector_py.h
View file @ 5bde5c52
......@@ -18,7 +18,7 @@ namespace dlib
std::vector<rect_detection>& rect_detections,
std::vector<rectangle>& rectangles,
std::vector<double>& detection_confidences,
std::vector<double>& weight_indices
std::vector<unsigned long>& weight_indices
)
{
rectangles.clear();
......@@ -40,7 +40,7 @@ namespace dlib
const unsigned int upsampling_amount,
const double adjust_threshold,
std::vector<double>& detection_confidences,
std::vector<double>& weight_indices
std::vector<unsigned long>& weight_indices
)
{
pyramid_down<2> pyr;
......@@ -120,7 +120,7 @@ namespace dlib
const unsigned int upsampling_amount,
const double adjust_threshold,
std::vector<double>& detection_confidences,
std::vector<double>& weight_indices
std::vector<unsigned long>& weight_indices
)
{
pyramid_down<2> pyr;
......@@ -202,7 +202,7 @@ namespace dlib
)
{
std::vector<double> detection_confidences;
std::vector<double> weight_indices;
std::vector<unsigned long> weight_indices;
const double adjust_threshold = 0.0;
return run_detector_with_upscale1(detector, img, upsampling_amount,
......@@ -219,7 +219,7 @@ namespace dlib
py::tuple t;
std::vector<double> detection_confidences;
std::vector<double> weight_indices;
std::vector<unsigned long> weight_indices;
std::vector<rectangle> rectangles;
rectangles = run_detector_with_upscale1(detector, img, upsampling_amount,
......@@ -227,7 +227,8 @@ namespace dlib
detection_confidences, weight_indices);
return py::make_tuple(rectangles,
detection_confidences, weight_indices);
vector_to_python_list(detection_confidences),
vector_to_python_list(weight_indices));
}
inline py::tuple run_multiple_rect_detectors (
......@@ -247,7 +248,7 @@ namespace dlib
}
std::vector<double> detection_confidences;
std::vector<double> weight_indices;
std::vector<unsigned long> weight_indices;
std::vector<rectangle> rectangles;
rectangles = run_detectors_with_upscale1(vector_detectors, img, upsampling_amount,
......@@ -255,7 +256,8 @@ namespace dlib
detection_confidences, weight_indices);
return py::make_tuple(rectangles,
detection_confidences, weight_indices);
vector_to_python_list(detection_confidences),
vector_to_python_list(weight_indices));
}
......
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