Merge pull request #3418 from tstellarAMD:2.4-hog-crash-fix

This commit is contained in:
Alexander Alekhin 2014-11-13 01:49:06 +00:00
commit d2f19a3a0d
2 changed files with 3 additions and 1 deletions

View File

@ -1092,6 +1092,9 @@ namespace cv
oclMat image_scale;
// effect size of input image (might be different from original size after scaling)
Size effect_size;
private:
oclMat gauss_w_lut;
};

View File

@ -55,7 +55,6 @@ using namespace cv::ocl;
#define CELLS_PER_BLOCK_Y 2
#define NTHREADS 256
static oclMat gauss_w_lut;
static bool hog_device_cpu;
namespace cv