compilation errors under win32

This commit is contained in:
Anatoly Baksheev 2010-08-25 14:39:34 +00:00
parent 199ffc632d
commit 33bd1da589
2 changed files with 6 additions and 4 deletions

View File

@ -81,12 +81,13 @@ namespace
void cv::gpu::StereoBeliefPropagation::estimateRecopmmendedParams( int width, int height, int & ndisp, int & iters, int & levels)
{
ndisp = width / 4;
if (ndisp & 1 != 0) ndisp++;
if ((ndisp & 1) != 0)
ndisp++;
int mm =::max(width, height);
iters = mm / 100 + 2;
levels = (int)(log(mm) + 1) * 4 / 5;
levels = cvRound(log((double)mm) + 1) * 4 / 5;
if (levels == 0) levels++;
}

View File

@ -108,12 +108,13 @@ namespace
void cv::gpu::StereoConstantSpaceBP::estimateRecopmmendedParams( int width, int height, int & ndisp, int & iters, int & levels, int &nr_plane)
{
ndisp = (int) ((float) width / 3.14f);
if (ndisp & 1 != 0) ndisp++;
if ((ndisp & 1) != 0)
ndisp++;
int mm = ::max(width, height);
iters = mm / 100 + ((mm > 1200)? - 4 : 4);
levels = (int)log(mm) * 2 / 3;
levels = cvRound(log((double)mm)) * 2 / 3;
if (levels == 0) levels++;
nr_plane = (int) ((float) ndisp / pow(2.0, levels + 1));