Merge pull request #2053 from KonstantinMatskevich:ocl_bugfix_eqhist

1aaeea99 · Andrey Pavlenko · OpenCV Buildbot · 512ddcc8 · 9d04a7ab · 1aaeea99
Commit 1aaeea99 authored Dec 25, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Dec 25, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

histogram.cpp modules/imgproc/src/histogram.cpp +1 -1

No files found.
--- 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;