Commit 51ed1873 authored by Roman Donchenko's avatar Roman Donchenko

Eliminated unsequenced assignments to temp3 from dpstereo.cpp.

They're unsequenced if CV_IMIN3 or CV_IMAX3 are invoked more than once
in a single expression.
parent 531471b0
......@@ -76,8 +76,8 @@ typedef struct _CvRightImData
uchar min_val, max_val;
} _CvRightImData;
#define CV_IMAX3(a,b,c) ((temp3 = (a) >= (b) ? (a) : (b)),(temp3 >= (c) ? temp3 : (c)))
#define CV_IMIN3(a,b,c) ((temp3 = (a) <= (b) ? (a) : (b)),(temp3 <= (c) ? temp3 : (c)))
#define CV_IMAX3(a,b,c) (std::max(std::max((a), (b)), (c)))
#define CV_IMIN3(a,b,c) (std::min(std::min((a), (b)), (c)))
static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
uchar* disparities,
......@@ -87,7 +87,7 @@ static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
float _param3, float _param4,
float _param5 )
{
int x, y, i, j, temp3;
int x, y, i, j;
int d, s;
int dispH = maxDisparity + 3;
uchar *dispdata;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment