Skip to content

GitLab

Commit 2dfbf778 authored by Davis King's avatar Davis King
Browse files

merged

parents a05c1914 f080bdec
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
dlib/graph_utils/edge_list_graphs.h
View file @ 2dfbf778
...@@ -286,7 +286,7 @@ namespace dlib ...@@ -286,7 +286,7 @@ namespace dlib
// Hold the length for the longest edge for each node. Initially they are all infinity. // Hold the length for the longest edge for each node. Initially they are all infinity.
std::vector<double> worst_dists(samples.size(), std::numeric_limits<double>::infinity()); std::vector<double> worst_dists(samples.size(), std::numeric_limits<double>::infinity());
std::vector<sample_pair>::iterator begin_i, end_i, begin_j, end_j, itr; std::vector<sample_pair>::iterator begin_i, end_i, begin_j, end_j;
begin_i = edges.begin(); begin_i = edges.begin();
end_i = begin_i + k; end_i = begin_i + k;
......
dlib/image_processing/scan_fhog_pyramid.h
View file @ 2dfbf778
...@@ -1306,7 +1306,6 @@ namespace dlib ...@@ -1306,7 +1306,6 @@ namespace dlib
// Do non-max suppression // Do non-max suppression
dets.clear();
if (detectors.size() > 1) if (detectors.size() > 1)
std::sort(dets_accum.rbegin(), dets_accum.rend()); std::sort(dets_accum.rbegin(), dets_accum.rend());
for (unsigned long i = 0; i < dets_accum.size(); ++i) for (unsigned long i = 0; i < dets_accum.size(); ++i)
......
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