third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move C API of opencv_objdetect to separate file

Browse Source 
Also move cv::linemod to own header
This commit is contained in:
Andrey Kamaev
2013-04-12 12:11:11 +04:00
parent e5a33723fc
commit 5e048d1fa5
32 changed files with 881 additions and 775 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/gpu/cascadeclassifier.cpp
+2 -2
View File
@@ -228,8 +228,8 @@ int main(int argc, const char *argv[])
Size minSize = cascade_gpu.getClassifierSize();
cascade_cpu.detectMultiScale(resized_cpu, facesBuf_cpu, 1.2,
(filterRects || findLargestObject) ? 4 : 0,
(findLargestObject ? CV_HAAR_FIND_BIGGEST_OBJECT : 0)
| CV_HAAR_SCALE_IMAGE,
(findLargestObject ? CASCADE_FIND_BIGGEST_OBJECT : 0)
| CASCADE_SCALE_IMAGE,
minSize);
detections_num = (int)facesBuf_cpu.size();
}
samples/gpu/hog.cpp
+1 -1
View File
@@ -326,7 +326,7 @@ void App::run()
for (size_t i = 0; i < found.size(); i++)
{
Rect r = found[i];
rectangle(img_to_show, r.tl(), r.br(), CV_RGB(0, 255, 0), 3);
rectangle(img_to_show, r.tl(), r.br(), Scalar(0, 255, 0), 3);
}
if (use_gpu)
samples/gpu/houghlines.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ int main(int argc, const char* argv[])
for (size_t i = 0; i < lines_cpu.size(); ++i)
{
Vec4i l = lines_cpu[i];
line(dst_cpu, Point(l[0], l[1]), Point(l[2], l[3]), Scalar(0, 0, 255), 3, CV_AA);
line(dst_cpu, Point(l[0], l[1]), Point(l[2], l[3]), Scalar(0, 0, 255), 3, LINE_AA);
}
GpuMat d_src(mask);
@@ -77,7 +77,7 @@ int main(int argc, const char* argv[])
for (size_t i = 0; i < lines_gpu.size(); ++i)
{
Vec4i l = lines_gpu[i];
line(dst_gpu, Point(l[0], l[1]), Point(l[2], l[3]), Scalar(0, 0, 255), 3, CV_AA);
line(dst_gpu, Point(l[0], l[1]), Point(l[2], l[3]), Scalar(0, 0, 255), 3, LINE_AA);
}
imshow("source", src);
samples/gpu/performance/performance.cpp
+1 -1
View File
@@ -144,7 +144,7 @@ string abspath(const string& relpath)
}
static int CV_CDECL cvErrorCallback(int /*status*/, const char* /*func_name*/,
static int cvErrorCallback(int /*status*/, const char* /*func_name*/,
const char* err_msg, const char* /*file_name*/,
int /*line*/, void* /*userdata*/)
{