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

Merge pull request #1432 from SpecLad:unseq

Browse Source
This commit is contained in:
Roman Donchenko 2013-09-11 13:50:35 +04:00 committed by OpenCV Buildbot
commit caf9fdbdc3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,8 @@ 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) (std::max(std::max((a), (b)), (c)))
#define CV_IMIN3(a,b,c) ((temp3 = (a) <= (b) ? (a) : (b)),(temp3 <= (c) ? temp3 : (c))) #define CV_IMIN3(a,b,c) (std::min(std::min((a), (b)), (c)))
static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2, static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
uchar* disparities, uchar* disparities,
@ -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;
int d, s; int d, s;
int dispH = maxDisparity + 3; int dispH = maxDisparity + 3;
uchar *dispdata; uchar *dispdata;