generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1228 from vkocheganov:bug_3191

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-08-06 21:01:40 +04:00 committed by OpenCV Buildbot
commit 04c86f28b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/legacy/src/dpstereo.cpp
View File

@ -76,7 +76,7 @@ typedef struct _CvRightImData
uchar min_val, max_val; uchar min_val, max_val;
} _CvRightImData; } _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))) #define CV_IMIN3(a,b,c) ((temp3 = (a) <= (b) ? (a) : (b)),(temp3 <= (c) ? temp3 : (c)))
static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2, static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
@ -87,7 +87,7 @@ static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
float _param3, float _param4, float _param3, float _param4,
float _param5 ) float _param5 )
{ {
int x, y, i, j, temp3; int x, y, i, j, temp2, temp3;
int d, s; int d, s;
int dispH = maxDisparity + 3; int dispH = maxDisparity + 3;
uchar *dispdata; uchar *dispdata;