From 51ed1873de25ffd32abb6912429e259b8d6e8b51 Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue, 10 Sep 2013 18:05:23 +0400
Subject: [PATCH] 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.
---
modules/legacy/src/dpstereo.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/legacy/src/dpstereo.cpp b/modules/legacy/src/dpstereo.cpp
index c920462aa..7b7ebd6d3 100644
--- a/modules/legacy/src/dpstereo.cpp
+++ b/modules/legacy/src/dpstereo.cpp
@@ -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;