OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

A minor change to avoid a compiler error in clang.

This commit is contained in:
Davis King 2012-07-26 22:54:19 -04:00
parent afb6f2186c
commit 0599dab33e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlib/image_transforms/spatial_filtering.h
View File

@ -874,7 +874,7 @@ namespace dlib
{ {
while (!Q.empty() && img[r][c] >= Q.back().second) while (!Q.empty() && img[r][c] >= Q.back().second)
Q.pop_back(); Q.pop_back();
Q.push_back(make_pair(c,img[r][c])); Q.push_back(std::make_pair(c,img[r][c]));
} }
for (long c = (width-1)/2; c < img.nc(); ++c) for (long c = (width-1)/2; c < img.nc(); ++c)
@ -883,7 +883,7 @@ namespace dlib
Q.pop_back(); Q.pop_back();
while (!Q.empty() && Q.front().first <= c-width) while (!Q.empty() && Q.front().first <= c-width)
Q.pop_front(); Q.pop_front();
Q.push_back(make_pair(c,img[r][c])); Q.push_back(std::make_pair(c,img[r][c]));
img[r][c-((width-1)/2)] = Q.front().second; img[r][c-((width-1)/2)] = Q.front().second;
} }
@ -905,7 +905,7 @@ namespace dlib
{ {
while (!Q.empty() && img[rr][cc] >= Q.back().second) while (!Q.empty() && img[rr][cc] >= Q.back().second)
Q.pop_back(); Q.pop_back();
Q.push_back(make_pair(rr,img[rr][cc])); Q.push_back(std::make_pair(rr,img[rr][cc]));
} }
for (long rr = (height-1)/2; rr < img.nr(); ++rr) for (long rr = (height-1)/2; rr < img.nr(); ++rr)
@ -914,7 +914,7 @@ namespace dlib
Q.pop_back(); Q.pop_back();
while (!Q.empty() && Q.front().first <= rr-height) while (!Q.empty() && Q.front().first <= rr-height)
Q.pop_front(); Q.pop_front();
Q.push_back(make_pair(rr,img[rr][cc])); Q.push_back(std::make_pair(rr,img[rr][cc]));
out[rr-((height-1)/2)][cc] += std::max(Q.front().second, thresh); out[rr-((height-1)/2)][cc] += std::max(Q.front().second, thresh);
} }