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

fixed build warnings on Windows

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-08-31 14:56:28 +04:00
parent 1686b0d9d3
commit e5f9f97954
3 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/video/test/test_simpleflow.cpp
View File

@@ -87,7 +87,7 @@ static bool readOpticalFlowFromFile(FILE* file, cv::Mat& flow) {
}
static bool isFlowCorrect(float u) {
return !isnan(u) && (fabs(u) < 1e9);
return !cvIsNaN(u) && (fabs(u) < 1e9);
}
static float calc_rmse(cv::Mat flow1, cv::Mat flow2) {
@@ -112,11 +112,11 @@ static float calc_rmse(cv::Mat flow1, cv::Mat flow2) {
}
}
}
return sqrt(sum / (1e-9 + counter));
return (float)sqrt(sum / (1e-9 + counter));
}
void CV_SimpleFlowTest::run(int) {
const float MAX_RMSE = 0.6;
const float MAX_RMSE = 0.6f;
const string frame1_path = ts->get_data_path() + "optflow/RubberWhale1.png";
const string frame2_path = ts->get_data_path() + "optflow/RubberWhale2.png";
const string gt_flow_path = ts->get_data_path() + "optflow/RubberWhale.flo";