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

minor fix for windows

Browse Source
This commit is contained in:
Andrey Morozov 2010-08-25 15:00:17 +00:00
parent 33bd1da589
commit 6bea9f5ec4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/src/beliefpropagation_gpu.cpp
View File

@ -87,7 +87,7 @@ void cv::gpu::StereoBeliefPropagation::estimateRecopmmendedParams( int width, in
int mm =::max(width, height); int mm =::max(width, height);
iters = mm / 100 + 2; iters = mm / 100 + 2;
levels = cvRound(log((double)mm) + 1) * 4 / 5; levels = (int)(log(static_cast<double>(mm)) + 1) * 4 / 5;
if (levels == 0) levels++; if (levels == 0) levels++;
} }

3
modules/gpu/src/constantspacebp_gpu.cpp
View File

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