From 0599dab33ecb5ef8771b8a5dfe2a245ad5e75706 Mon Sep 17 00:00:00 2001 From: Davis King Date: Thu, 26 Jul 2012 22:54:19 -0400 Subject: [PATCH] A minor change to avoid a compiler error in clang. --- dlib/image_transforms/spatial_filtering.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlib/image_transforms/spatial_filtering.h b/dlib/image_transforms/spatial_filtering.h index 57b66c572..4f1ae2a78 100644 --- a/dlib/image_transforms/spatial_filtering.h +++ b/dlib/image_transforms/spatial_filtering.h @@ -874,7 +874,7 @@ namespace dlib { while (!Q.empty() && img[r][c] >= Q.back().second) 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) @@ -883,7 +883,7 @@ namespace dlib Q.pop_back(); while (!Q.empty() && Q.front().first <= c-width) 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; } @@ -905,7 +905,7 @@ namespace dlib { while (!Q.empty() && img[rr][cc] >= Q.back().second) 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) @@ -914,7 +914,7 @@ namespace dlib Q.pop_back(); while (!Q.empty() && Q.front().first <= rr-height) 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); }