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

added conditional compilation

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-01-29 23:00:33 +04:00
parent faa6074f3d
commit 231bc17de7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/src/histogram.cpp
View File

@ -1399,12 +1399,14 @@ static void calcHist( const Mat* images, int nimages, const int* channels,
} }
} }
#ifdef HAVE_OPENCL
enum enum
{ {
BINS = 256 BINS = 256
}; };
static bool ocl_calcHist1(InputArrayOfArrays _src, OutputArray _hist, int ddepth = CV_32S) static bool ocl_calcHist1(InputArray _src, OutputArray _hist, int ddepth = CV_32S)
{ {
int compunits = ocl::Device::getDefault().maxComputeUnits(); int compunits = ocl::Device::getDefault().maxComputeUnits();
size_t wgs = ocl::Device::getDefault().maxWorkGroupSize(); size_t wgs = ocl::Device::getDefault().maxWorkGroupSize();
@ -1450,6 +1452,8 @@ static bool ocl_calcHist(InputArrayOfArrays images, OutputArray hist)
return ocl_calcHist1(v[0], hist, CV_32F); return ocl_calcHist1(v[0], hist, CV_32F);
} }
#endif
} }
void cv::calcHist( const Mat* images, int nimages, const int* channels, void cv::calcHist( const Mat* images, int nimages, const int* channels,