From c6f790ce12966850b0a40c8ba73f547afeae7bfe Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 26 Jul 2016 23:29:05 -0300 Subject: [PATCH] Fixed using local variable instead of global var. - Still need to change SSE_2 --- modules/calib3d/src/stereobm.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/calib3d/src/stereobm.cpp b/modules/calib3d/src/stereobm.cpp index 98a4d69393..58de587727 100644 --- a/modules/calib3d/src/stereobm.cpp +++ b/modules/calib3d/src/stereobm.cpp @@ -338,7 +338,7 @@ static void findStereoCorrespondenceBM_SSE2( const Mat& left, const Mat& right, int ftzero = state.preFilterCap; int textureThreshold = state.textureThreshold; int uniquenessRatio = state.uniquenessRatio; - short FILTERED = (short)((mindisp - 1) << DISPARITY_SHIFT); + short FILTERED = (short)((mindisp - 1) << DISPARITY_SHIFT_16S); ushort *sad, *hsad0, *hsad, *hsad_sub; int *htext; @@ -1096,7 +1096,14 @@ public: if( params.uniquenessRatio < 0 ) CV_Error( Error::StsOutOfRange, "uniqueness ratio must be non-negative" ); - int FILTERED = (params.minDisparity - 1) << DISPARITY_SHIFT; + int disp_shift; + if (dtype == CV_16SC1) + disp_shift = DISPARITY_SHIFT_16S; + else + disp_shift = DISPARITY_SHIFT_32S; + + + int FILTERED = (params.minDisparity - 1) << disp_shift; #ifdef HAVE_OPENCL if(ocl::useOpenCL() && disparr.isUMat() && params.textureThreshold == 0) @@ -1109,7 +1116,7 @@ public: if( params.speckleRange >= 0 && params.speckleWindowSize > 0 ) filterSpeckles(disparr.getMat(), FILTERED, params.speckleWindowSize, params.speckleRange, slidingSumBuf); if (dtype == CV_32F) - disparr.getUMat().convertTo(disparr, CV_32FC1, 1./(1 << DISPARITY_SHIFT), 0); + disparr.getUMat().convertTo(disparr, CV_32FC1, 1./(1 << disp_shift), 0); CV_IMPL_ADD(CV_IMPL_OCL); return; } @@ -1138,7 +1145,7 @@ public: if( lofs >= width || rofs >= width || width1 < 1 ) { - disp0 = Scalar::all( FILTERED * ( disp0.type() < CV_32F ? 1 : 1./(1 << DISPARITY_SHIFT) ) ); + disp0 = Scalar::all( FILTERED * ( disp0.type() < CV_32F ? 1 : 1./(1 << disp_shift) ) ); return; } @@ -1194,7 +1201,7 @@ public: filterSpeckles(disp, FILTERED, params.speckleWindowSize, params.speckleRange, slidingSumBuf); if (disp0.data != disp.data) - disp.convertTo(disp0, disp0.type(), 1./(1 << DISPARITY_SHIFT), 0); + disp.convertTo(disp0, disp0.type(), 1./(1 << disp_shift), 0); } int getMinDisparity() const { return params.minDisparity; }