[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60781] trunk/blender/extern/libmv/libmv/ multiview: Code cleanup: move function prototype to header file

[Sergey Sharybin]

Revision: 60781
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60781
Author:   nazgul
Date:     2013-10-15 15:21:44 +0000 (Tue, 15 Oct 2013)
Log Message:
-----------
Code cleanup: move function prototype to header file

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc
    trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.h

Modified: trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc	2013-10-15 15:21:41 UTC (rev 60780)
+++ trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.cc	2013-10-15 15:21:44 UTC (rev 60781)
@@ -34,10 +34,6 @@
 namespace euclidean_resection {
 
 typedef unsigned int uint;
-  
-bool EuclideanResectionPPnP(const Mat2X &x_camera,
-                            const Mat3X &X_world,
-                            Mat3 *R, Vec3 *t);
 
 bool EuclideanResection(const Mat2X &x_camera,
                         const Mat3X &X_world,

Modified: trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.h
===================================================================
--- trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.h	2013-10-15 15:21:41 UTC (rev 60780)
+++ trunk/blender/extern/libmv/libmv/multiview/euclidean_resection.h	2013-10-15 15:21:44 UTC (rev 60781)
@@ -124,6 +124,23 @@
                             const Mat3X &X_world,
                             Mat3 *R, Vec3 *t);
 
+/**
+ * Computes the extrinsic parameters, R and t for a calibrated camera from 4 or
+ * more 3D points and their images.
+ *
+ * \param x_camera Image points in normalized camera coordinates,
+ *                 e.g. x_camera = inv(K) * x_image
+ * \param X_world 3D points in the world coordinate system
+ * \param R       Solution for the camera rotation matrix
+ * \param t       Solution for the camera translation vector
+ *
+ * Straight from the paper:
+ * http://www.diegm.uniud.it/fusiello/papers/3dimpvt12-b.pdf
+ */
+bool EuclideanResectionPPnP(const Mat2X &x_camera,
+                            const Mat3X &X_world,
+                            Mat3 *R, Vec3 *t);
+
 }  // namespace euclidean_resection
 }  // namespace libmv