Commit dbce1407 authored by Davis King's avatar Davis King

merged

parents 074a3eb5 11a60566
...@@ -669,7 +669,7 @@ namespace dlib ...@@ -669,7 +669,7 @@ namespace dlib
const rectangle area = get_rect(img); const rectangle area = get_rect(img);
// save width to avoid computing them over and over // Save width to avoid computing it over and over.
const long width = rect.width(); const long width = rect.width();
......
...@@ -64,8 +64,8 @@ namespace dlib ...@@ -64,8 +64,8 @@ namespace dlib
max_num_dets = 0; max_num_dets = 0;
for (unsigned long i = 0; i < truth_rects.size(); ++i) for (unsigned long i = 0; i < truth_rects.size(); ++i)
{ {
if (truth_rects.size() > max_num_dets) if (truth_rects[i].size() > max_num_dets)
max_num_dets = truth_rects.size(); max_num_dets = truth_rects[i].size();
scanners[i].copy_configuration(scanner); scanners[i].copy_configuration(scanner);
} }
......
...@@ -11,6 +11,19 @@ ...@@ -11,6 +11,19 @@
<!-- ******************************************************************************* --> <!-- ******************************************************************************* -->
<current> <current>
New Stuff:
Non-Backwards Compatible Changes:
Bug fixes:
Other:
</current>
<!-- ******************************************************************************* -->
<old name="17.47" date="Jun 15, 2012">
New Stuff: New Stuff:
- Improvements to linear algebra tools: - Improvements to linear algebra tools:
- Added the lowerbound() and upperbound() routines for thresholding dense - Added the lowerbound() and upperbound() routines for thresholding dense
...@@ -59,8 +72,7 @@ Other: ...@@ -59,8 +72,7 @@ Other:
- Improved existing documentation: added pictures of the gui widgets, - Improved existing documentation: added pictures of the gui widgets,
added documentation of the dlib::bridge protocol, and other minor added documentation of the dlib::bridge protocol, and other minor
usability improvements. usability improvements.
</old>
</current>
<!-- ******************************************************************************* --> <!-- ******************************************************************************* -->
......
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