exported cv::undistort & cv::getDefaultNewCameraMatrix

git-svn-id: https://code.ros.org/svn/opencv/trunk@1681 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cv.hpp b/opencv/include/opencv/cv.hpp
index 5100bf2a17df374271f2527b0f8d6332bb5a1ac0..2f8c8b4d143b7375b6d78874b87020cebac23a0a 100644 (file)
--- a/opencv/include/opencv/cv.hpp
+++ b/opencv/include/opencv/cv.hpp
@@ -324,6 +324,11 @@ CV_EXPORTS void pyrDown( const Mat& src, Mat& dst, const Size& dstsize=Size());
 CV_EXPORTS void pyrUp( const Mat& src, Mat& dst, const Size& dstsize=Size());\r
 CV_EXPORTS void buildPyramid( const Mat& src, Vector<Mat>& dst, int maxlevel );\r
 \r
+\r
+CV_EXPORTS void undistort( const Mat& src, Mat& dst, const Mat& cameraMatrix,
+                           const Mat& distCoeffs, const Mat& newCameraMatrix=Mat() );
+CV_EXPORTS Mat_<double> getDefaultNewCameraMatrix( const Mat_<double>& A, Size imgsize );\r
+\r
 }\r
 \r
 //////////////////////////////////////////////////////////////////////////////////////////\r

diff --git a/opencv/src/cv/cvundistort.cpp b/opencv/src/cv/cvundistort.cpp
index c7c0f3f141c74add33da257be050977c45c0cf6a..fc24866191e0814d494bfe808d5f7a9162820242 100644 (file)
--- a/opencv/src/cv/cvundistort.cpp
+++ b/opencv/src/cv/cvundistort.cpp
@@ -45,7 +45,7 @@
 namespace cv
 {
 
-static Mat_<double> getDefaultNewCameraMatrix( const Mat_<double>& A, Size imgsize )
+Mat_<double> getDefaultNewCameraMatrix( const Mat_<double>& A, Size imgsize )
 {
     Mat_<double> Ar(3, 3);
     Ar << A(0,0), 0., (imgsize.width-1)*0.5,