mirror of
https://github.com/davisking/dlib.git
synced 2024-11-01 10:14:53 +08:00
merged
This commit is contained in:
commit
dbce1407f8
@ -669,7 +669,7 @@ namespace dlib
|
||||
|
||||
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();
|
||||
|
||||
|
||||
|
@ -64,8 +64,8 @@ namespace dlib
|
||||
max_num_dets = 0;
|
||||
for (unsigned long i = 0; i < truth_rects.size(); ++i)
|
||||
{
|
||||
if (truth_rects.size() > max_num_dets)
|
||||
max_num_dets = truth_rects.size();
|
||||
if (truth_rects[i].size() > max_num_dets)
|
||||
max_num_dets = truth_rects[i].size();
|
||||
|
||||
scanners[i].copy_configuration(scanner);
|
||||
}
|
||||
|
@ -11,6 +11,19 @@
|
||||
<!-- ******************************************************************************* -->
|
||||
|
||||
<current>
|
||||
New Stuff:
|
||||
|
||||
Non-Backwards Compatible Changes:
|
||||
|
||||
Bug fixes:
|
||||
|
||||
Other:
|
||||
|
||||
</current>
|
||||
|
||||
<!-- ******************************************************************************* -->
|
||||
|
||||
<old name="17.47" date="Jun 15, 2012">
|
||||
New Stuff:
|
||||
- Improvements to linear algebra tools:
|
||||
- Added the lowerbound() and upperbound() routines for thresholding dense
|
||||
@ -59,8 +72,7 @@ Other:
|
||||
- Improved existing documentation: added pictures of the gui widgets,
|
||||
added documentation of the dlib::bridge protocol, and other minor
|
||||
usability improvements.
|
||||
|
||||
</current>
|
||||
</old>
|
||||
|
||||
<!-- ******************************************************************************* -->
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user