potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

clean code; fix problems in documentation

Browse Source
This commit is contained in:
marina.kolpakova
2012-11-26 18:50:08 +04:00
parent bd3179bda8
commit 05cd88ae42
7 changed files with 9 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gpu/perf/perf_softcascade.cpp
-35
View File
@@ -33,18 +33,6 @@ namespace {
else if (a.w != b.w) return a.w < b.w;
else return a.h < b.h;
}
// bool operator()(const cv::SoftCascade::Detection& a,
// const cv::SoftCascade::Detection& b) const
// {
// const cv::Rect& ra = a.rect;
// const cv::Rect& rb = b.rect;
// if (ra.x != rb.x) return ra.x < rb.x;
// else if (ra.y != rb.y) return ra.y < rb.y;
// else if (ra.width != rb.width) return ra.width < rb.width;
// else return ra.height < rb.height;
// }
};
cv::Mat sortDetections(cv::gpu::GpuMat& objects)
@@ -99,29 +87,6 @@ RUN_GPU(SCascadeTest, detect)
NO_CPU(SCascadeTest, detect)
// RUN_CPU(SCascadeTest, detect)
// {
// cv::Mat colored = readImage(GET_PARAM(1));
// ASSERT_FALSE(colored.empty());
// cv::SCascade cascade;
// ASSERT_TRUE(cascade.load(getDataPath(GET_PARAM(0))));
// std::vector<cv::Rect> rois;
// typedef cv::SCascade::Detection Detection;
// std::vector<Detection>objects;
// cascade.detectMultiScale(colored, rois, objects);
// TEST_CYCLE()
// {
// cascade.detectMultiScale(colored, rois, objects);
// }
// std::sort(objects.begin(), objects.end(), DetectionLess());
// SANITY_CHECK(objects);
// }
static cv::Rect getFromTable(int idx)
{
static const cv::Rect rois[] =