Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist

2013-12-26 00:05:13 +04:00
parent 512ddcc804 9d04a7aba9
commit 1aaeea9941
1 changed files with 1 additions and 1 deletions
--- a/modules/imgproc/src/histogram.cpp
+++ b/modules/imgproc/src/histogram.cpp
@@ -3169,7 +3169,7 @@ static bool ocl_calcHist(InputArray _src, OutputArray _hist)

 static bool ocl_equalizeHist(InputArray _src, OutputArray _dst)
 {
-    size_t wgs = ocl::Device::getDefault().maxWorkGroupSize();
+    size_t wgs = std::min<size_t>(ocl::Device::getDefault().maxWorkGroupSize(), BINS);

    // calculation of histogram
    UMat hist;