mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20150 from rogday:svm_detector_test

Browse Source
This commit is contained in:
Alexander Alekhin 2021-06-01 13:31:12 +00:00
commit bb3bbd192b
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/objdetect/src/hog.cpp
View File

@ -122,6 +122,12 @@ void HOGDescriptor::setSVMDetector(InputArray _svmDetector)
_svmDetector.getMat().convertTo(svmDetector, CV_32F); _svmDetector.getMat().convertTo(svmDetector, CV_32F);
CV_Assert(checkDetectorSize()); CV_Assert(checkDetectorSize());
if (_svmDetector.empty())
{
oclSvmDetector = UMat();
return;
}
Mat detector_reordered(1, (int)svmDetector.size(), CV_32FC1); Mat detector_reordered(1, (int)svmDetector.size(), CV_32FC1);
size_t block_hist_size = getBlockHistogramSize(blockSize, cellSize, nbins); size_t block_hist_size = getBlockHistogramSize(blockSize, cellSize, nbins);

19
modules/objdetect/test/opencl/test_hogdetector.cpp
View File

@ -93,6 +93,25 @@ OCL_TEST_P(HOG, GetDescriptors)
EXPECT_MAT_SIMILAR(cpu_desc, gpu_desc, 1e-1); EXPECT_MAT_SIMILAR(cpu_desc, gpu_desc, 1e-1);
} }
OCL_TEST_P(HOG, SVMDetector)
{
HOGDescriptor hog_first, hog_second;
// empty -> empty
hog_first.copyTo(hog_second);
// first -> both
hog_first.setSVMDetector(hog_first.getDefaultPeopleDetector());
hog_first.copyTo(hog_second);
// both -> both
hog_first.copyTo(hog_second);
// second -> empty
hog_first.setSVMDetector(cv::noArray());
hog_first.copyTo(hog_second);
}
OCL_TEST_P(HOG, Detect) OCL_TEST_P(HOG, Detect)
{ {
HOGDescriptor hog; HOGDescriptor hog;