From 21bbed7bafd25114ff15d8012f3f8619d258d0c1 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Fri, 27 Feb 2015 14:28:12 +0300 Subject: [PATCH] fix gpu HOG implementation: move hog::set_up_constants from constructor to compute method if user changed CUDA device between constructor and computation, some variables were uninitialized --- modules/gpu/src/hog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gpu/src/hog.cpp b/modules/gpu/src/hog.cpp index b7274d79c2..bff7caac0e 100644 --- a/modules/gpu/src/hog.cpp +++ b/modules/gpu/src/hog.cpp @@ -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); 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 @@ -221,6 +218,9 @@ void cv::gpu::HOGDescriptor::computeGradient(const GpuMat& img, GpuMat& _grad, G 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); size_t block_hist_size = getBlockHistogramSize();