NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed code to avoid advancing iterator beyond end since some compilers

Browse Source 
complain about this (and it's technically not allowed in C++).
This commit is contained in:
Davis King 2016-07-28 19:09:07 -04:00
parent edb2790bcc
commit 3a096469ef
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlib/dnn/core.h
View File

@ -2189,10 +2189,15 @@ namespace dlib
{ {
std::vector<label_type> results(std::distance(data.begin(), data.end())); std::vector<label_type> results(std::distance(data.begin(), data.end()));
auto o = results.begin(); auto o = results.begin();
for (auto i = data.begin(); i < data.end(); i+=batch_size, o+=batch_size) auto i = data.begin();
auto num_remaining = results.size();
while(num_remaining != 0)
{ {
auto end = std::min(i+batch_size, data.end()); auto inc = std::min(batch_size, num_remaining);
(*this)(i, end, o); (*this)(i, i+inc, o);
i += inc;
o += inc;
num_remaining -= inc;
} }
return results; return results;
} }