1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00

Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-01-25 16:30:36 +04:00
105 changed files with 4821 additions and 2883 deletions
+1 -1
View File
@@ -339,7 +339,7 @@ static double evalEps(double expected, double actual, double _eps, ERROR_TYPE er
if (err == ERROR_ABSOLUTE)
return _eps;
else if (err == ERROR_RELATIVE)
return std::max(std::abs(expected), std::abs(actual)) * err;
return std::max(std::abs(expected), std::abs(actual)) * _eps;
return 0;
}