Merge pull request #8416 from berak:patch-2

pull/8404/head
Alexander Alekhin 8 years ago
commit 741e51396b
  1. 10
      modules/imgproc/src/undistort.cpp

@ -476,8 +476,6 @@ static Point2f mapPointSpherical(const Point2f& p, float alpha, Vec4d* J, int pr
static Point2f invMapPointSpherical(Point2f _p, float alpha, int projType) static Point2f invMapPointSpherical(Point2f _p, float alpha, int projType)
{ {
static int avgiter = 0, avgn = 0;
double eps = 1e-12; double eps = 1e-12;
Vec2d p(_p.x, _p.y), q(_p.x, _p.y), err; Vec2d p(_p.x, _p.y), q(_p.x, _p.y), err;
Vec4d J; Vec4d J;
@ -502,14 +500,6 @@ static Point2f invMapPointSpherical(Point2f _p, float alpha, int projType)
//q -= Vec2d((J.t()*J).inv()*(J.t()*err)); //q -= Vec2d((J.t()*J).inv()*(J.t()*err));
} }
if( i < maxiter )
{
avgiter += i;
avgn++;
if( avgn == 1500 )
printf("avg iters = %g\n", (double)avgiter/avgn);
}
return i < maxiter ? Point2f((float)q[0], (float)q[1]) : Point2f(-FLT_MAX, -FLT_MAX); return i < maxiter ? Point2f((float)q[0], (float)q[1]) : Point2f(-FLT_MAX, -FLT_MAX);
} }

Loading…
Cancel
Save