potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9025 from mshabunin:fix-static-3

Browse Source
This commit is contained in:
Alexander Alekhin
2017-06-28 20:50:21 +00:00
parent 20f603a217 a769d69a9d
commit 324851882a
35 changed files with 113 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/calib3d/src/fisheye.cpp
+2 -1
View File
@@ -42,6 +42,7 @@
#include "precomp.hpp"
#include "fisheye.hpp"
#include <limits>
namespace cv { namespace
{
@@ -760,7 +761,7 @@ double cv::fisheye::calibrate(InputArrayOfArrays objectPoints, InputArrayOfArray
//-------------------------------Optimization
for(int iter = 0; ; ++iter)
for(int iter = 0; iter <= std::numeric_limits<int>::max(); ++iter)
{
if ((criteria.type == 1 && iter >= criteria.maxCount) ||
(criteria.type == 2 && change <= criteria.epsilon) ||