diff --git a/modules/imgproc/src/histogram.cpp b/modules/imgproc/src/histogram.cpp index da39ca9b33..18ff3436c1 100644 --- a/modules/imgproc/src/histogram.cpp +++ b/modules/imgproc/src/histogram.cpp @@ -777,8 +777,7 @@ calcHist_( vector& _ptrs, const vector& _deltas, #ifdef HAVE_TBB calcHist1D_Invoker body(_ptrs, _deltas, hist, _uniranges, size[0], dims, imsize); parallel_for(BlockedRange(0, imsize.height), body); - return; -#endif +#else double a = uniranges[0], b = uniranges[1]; int sz = size[0], d0 = deltas[0], step0 = deltas[1]; const T* p0 = (const T*)ptrs[0]; @@ -801,14 +800,15 @@ calcHist_( vector& _ptrs, const vector& _deltas, ((int*)H)[idx]++; } } +#endif //HAVE_TBB + return; } else if( dims == 2 ) { #ifdef HAVE_TBB calcHist2D_Invoker body(_ptrs, _deltas, hist, _uniranges, size, dims, imsize, hstep); parallel_for(BlockedRange(0, imsize.height), body); - return; -#endif +#else double a0 = uniranges[0], b0 = uniranges[1], a1 = uniranges[2], b1 = uniranges[3]; int sz0 = size[0], sz1 = size[1]; int d0 = deltas[0], step0 = deltas[1], @@ -837,6 +837,8 @@ calcHist_( vector& _ptrs, const vector& _deltas, ((int*)(H + hstep0*idx0))[idx1]++; } } +#endif //HAVE_TBB + return; } else if( dims == 3 ) {