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

fix retrieval of detections count

Browse Source
This commit is contained in:
marina.kolpakova 2012-10-15 17:38:21 +04:00
parent 022a8b9698
commit ca81628a9a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/cuda/isf-sc.cu
View File

@ -313,7 +313,7 @@ namespace icf {
dim3 block(32, 8); dim3 block(32, 8);
dim3 grid(fw, fh / 8, (scale == -1) ? downscales : 1); dim3 grid(fw, fh / 8, (scale == -1) ? downscales : 1);
uint* ctr = (uint*)counter.ptr(); uint* ctr = (uint*)(counter.ptr(0));
Detection* det = (Detection*)objects.ptr(); Detection* det = (Detection*)objects.ptr();
uint max_det = objects.cols / sizeof(Detection); uint max_det = objects.cols / sizeof(Detection);

2
modules/gpu/src/softcascade.cpp
View File

@ -541,7 +541,7 @@ void cv::gpu::SoftCascade::detectMultiScale(const GpuMat& colored, const GpuMat&
flds.detect(specificScale, rois, objects, 0); flds.detect(specificScale, rois, objects, 0);
cv::Mat out(flds.detCounter); cv::Mat out(flds.detCounter);
int ndetections = *(out.data); int ndetections = *(out.ptr<int>(0));
if (! ndetections) if (! ndetections)
objects = GpuMat(); objects = GpuMat();

4
modules/gpu/test/test_softcascade.cpp
View File

@ -257,5 +257,9 @@ TEST(SoftCascadeTest, detect)
cv::gpu::transpose(rois, trois); cv::gpu::transpose(rois, trois);
cascade.detectMultiScale(colored, trois, objectBoxes); cascade.detectMultiScale(colored, trois, objectBoxes);
typedef cv::gpu::SoftCascade::Detection Detection;
cv::Mat detections(objectBoxes);
ASSERT_EQ(detections.cols / sizeof(Detection) ,3670U);
} }
#endif #endif