generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

warning fixed

Browse Source
This commit is contained in:
Anatoly Baksheev 2011-01-21 09:00:19 +00:00
parent 1327789d72
commit e3f3de84db
2 changed files with 33 additions and 33 deletions

62
modules/gpu/src/cascadeclassifier.cpp

@ -294,38 +294,38 @@ int cv::gpu::CascadeClassifier_GPU::detectMultiScale( const GpuMat& image, GpuMa
return numDetections; return numDetections;
} }
struct RectConvert struct RectConvert
{ {
Rect operator()(const NcvRect32u& nr) const { return Rect(nr.x, nr.y, nr.width, nr.height); } Rect operator()(const NcvRect32u& nr) const { return Rect(nr.x, nr.y, nr.width, nr.height); }
NcvRect32u operator()(const Rect& nr) const NcvRect32u operator()(const Rect& nr) const
{ {
NcvRect32u rect; NcvRect32u rect;
rect.x = nr.x; rect.x = nr.x;
rect.y = nr.y; rect.y = nr.y;
rect.width = nr.width; rect.width = nr.width;
rect.height = nr.height; rect.height = nr.height;
return rect; return rect;
}
};
void groupRectangles(std::vector<NcvRect32u> &hypotheses, int groupThreshold, double eps, std::vector<Ncv32u> *weights)
{
vector<Rect> rects(hypotheses.size());
std::transform(hypotheses.begin(), hypotheses.end(), rects.begin(), RectConvert());
if (weights)
{
vector<int> weights_int;
weights_int.assign(weights->begin(), weights->end());
cv::groupRectangles(rects, weights_int, groupThreshold, eps);
}
else
{
cv::groupRectangles(rects, groupThreshold, eps);
}
std::transform(rects.begin(), rects.end(), hypotheses.begin(), RectConvert());
hypotheses.resize(rects.size());
} }
};
void groupRectangles(std::vector<NcvRect32u> &hypotheses, int groupThreshold, double eps, std::vector<Ncv32u> *weights)
{
vector<Rect> rects(hypotheses.size());
std::transform(hypotheses.begin(), hypotheses.end(), rects.begin(), RectConvert());
if (weights)
{
vector<int> weights_int;
weights_int.assign(weights->begin(), weights->end());
cv::groupRectangles(rects, weights_int, groupThreshold, eps);
}
else
{
cv::groupRectangles(rects, groupThreshold, eps);
}
std::transform(rects.begin(), rects.end(), hypotheses.begin(), RectConvert());
hypotheses.resize(rects.size());
}
#if 1 /* loadFromXML implementation switch */ #if 1 /* loadFromXML implementation switch */

4
samples/gpu/cascadeclassifier.cpp

@ -190,8 +190,8 @@ int main( int argc, const char** argv )
case '3': font_scale*=1.05; printf("Fond scale = %g\n", font_scale); break; case '3': font_scale*=1.05; printf("Fond scale = %g\n", font_scale); break;
case 'e': case 'E':font_scale/=1.05; printf("Fond scale = %g\n", font_scale); break; case 'e': case 'E':font_scale/=1.05; printf("Fond scale = %g\n", font_scale); break;
case '2': ++minNeighbors; printf("Min Neighbors = %g\n", minNeighbors); break; case '2': ++minNeighbors; printf("Min Neighbors = %d\n", minNeighbors); break;
case 'w': case 'W':minNeighbors = max(minNeighbors-1, 0); printf("Min Neighbors = %g\n", minNeighbors); break; case 'w': case 'W':minNeighbors = max(minNeighbors-1, 0); printf("Min Neighbors = %d\n", minNeighbors); break;
} }
} }