From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue, 10 Sep 2013 14:05:23 +0000 (+0400)
Subject: Eliminated unsequenced assignments to temp3 from dpstereo.cpp.
X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~493^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51ed1873de25ffd32abb6912429e259b8d6e8b51;p=profile%2Fivi%2Fopencv.git

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.
---

diff --git a/modules/legacy/src/dpstereo.cpp b/modules/legacy/src/dpstereo.cpp
index c920462..7b7ebd6 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;