Merge pull request #1228 from vkocheganov:bug_3191

11 years ago · 04c86f28b1
parent ab4fe8dd2c e9b9a6fc03
commit 04c86f28b1
1 changed files with 2 additions and 2 deletions
--- a/modules/legacy/src/dpstereo.cpp
+++ b/modules/legacy/src/dpstereo.cpp
@ -76,7 +76,7 @@ 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_IMAX3(a,b,c) ((temp2 = (a) >= (b) ? (a) : (b)),(temp2 >= (c) ? temp2 : (c)))
 #define CV_IMIN3(a,b,c) ((temp3 = (a) <= (b) ? (a) : (b)),(temp3 <= (c) ? temp3 : (c)))

 static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
@ -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, temp2, temp3;
    int     d, s;
    int     dispH =  maxDisparity + 3;
    uchar  *dispdata;