[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50716] trunk/blender/extern/libmv: Libmv: fixed wrong function prototypes

[Sergey Sharybin]

Revision: 50716
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50716
Author:   nazgul
Date:     2012-09-18 07:09:07 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Libmv: fixed wrong function prototypes

Also mark non-public functions as static.

Modified Paths:
--------------
    trunk/blender/extern/libmv/libmv-capi.cpp
    trunk/blender/extern/libmv/libmv-capi.h

Modified: trunk/blender/extern/libmv/libmv-capi.cpp
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.cpp	2012-09-18 07:03:23 UTC (rev 50715)
+++ trunk/blender/extern/libmv/libmv-capi.cpp	2012-09-18 07:09:07 UTC (rev 50716)
@@ -523,7 +523,7 @@
 	                       LIBMV_REFINE_RADIAL_DISTORTION_K1));
 }
 
-void libmv_solveRefineIntrinsics(libmv::Tracks *tracks, libmv::CameraIntrinsics *intrinsics,
+static void libmv_solveRefineIntrinsics(libmv::Tracks *tracks, libmv::CameraIntrinsics *intrinsics,
 			libmv::EuclideanReconstruction *reconstruction, int refine_intrinsics,
 			reconstruct_progress_update_cb progress_update_callback, void *callback_customdata)
 {
@@ -1027,7 +1027,7 @@
 
 /* ************ point clouds ************ */
 
-void libmvTransformToMat4(libmv::Mat3 &R, libmv::Vec3 &S, libmv::Vec3 &t, double M[4][4])
+static void libmvTransformToMat4(libmv::Mat3 &R, libmv::Vec3 &S, libmv::Vec3 &t, double M[4][4])
 {
 	for (int j = 0; j < 3; ++j)
 		for (int k = 0; k < 3; ++k)

Modified: trunk/blender/extern/libmv/libmv-capi.h
===================================================================
--- trunk/blender/extern/libmv/libmv-capi.h	2012-09-18 07:03:23 UTC (rev 50715)
+++ trunk/blender/extern/libmv/libmv-capi.h	2012-09-18 07:09:07 UTC (rev 50716)
@@ -147,14 +147,14 @@
 
 /* dsitortion */
 void libmv_undistortByte(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
-			unsigned char *src, unsigned char *dst, int width, int height, int channels);
+			unsigned char *src, unsigned char *dst, int width, int height, float overscan, int channels);
 void libmv_undistortFloat(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
-			float *src, float *dst, int width, int height, int channels);
+			float *src, float *dst, int width, int height, float overscan, int channels);
 
 void libmv_distortByte(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
-			unsigned char *src, unsigned char *dst, int width, int height, int channels);
+			unsigned char *src, unsigned char *dst, int width, int height, float overscan, int channels);
 void libmv_distortFloat(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
-			float *src, float *dst, int width, int height, int channels);
+			float *src, float *dst, int width, int height, float overscan, int channels);
 
 /* utils */
 void libmv_applyCameraIntrinsics(double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,