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

fix gpu HOG implementation:

Browse Source 
move hog::set_up_constants from constructor to compute method

if user changed CUDA device between constructor and computation,
some variables were uninitialized
This commit is contained in:
Vladislav Vinogradov 2015-02-27 14:28:12 +03:00
parent 2c9547e314
commit 21bbed7baf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,9 +127,6 @@ cv::gpu::HOGDescriptor::HOGDescriptor(Size win_size_, Size block_size_, Size blo
Size cells_per_block = Size(block_size.width / cell_size.width, block_size.height / cell_size.height); Size cells_per_block = Size(block_size.width / cell_size.width, block_size.height / cell_size.height);
CV_Assert(cells_per_block == Size(2, 2)); CV_Assert(cells_per_block == Size(2, 2));
cv::Size blocks_per_win = numPartsWithin(win_size, block_size, block_stride);
hog::set_up_constants(nbins, block_stride.width, block_stride.height, blocks_per_win.width, blocks_per_win.height);
} }
size_t cv::gpu::HOGDescriptor::getDescriptorSize() const size_t cv::gpu::HOGDescriptor::getDescriptorSize() const
@ -221,6 +218,9 @@ void cv::gpu::HOGDescriptor::computeGradient(const GpuMat& img, GpuMat& _grad, G
void cv::gpu::HOGDescriptor::computeBlockHistograms(const GpuMat& img) void cv::gpu::HOGDescriptor::computeBlockHistograms(const GpuMat& img)
{ {
cv::Size blocks_per_win = numPartsWithin(win_size, block_size, block_stride);
hog::set_up_constants(nbins, block_stride.width, block_stride.height, blocks_per_win.width, blocks_per_win.height);
computeGradient(img, grad, qangle); computeGradient(img, grad, qangle);
size_t block_hist_size = getBlockHistogramSize(); size_t block_hist_size = getBlockHistogramSize();