diff --git a/Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h b/Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h index c21d33422a..a2893c1d78 100644 --- a/Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h +++ b/Modules/CameraCalibration/mitkVnlMatrixFromCvMat.h @@ -1,64 +1,63 @@ #ifndef mitkVnlMatrixFromCvMat_h #define mitkVnlMatrixFromCvMat_h #include #include -#include #include #include #include namespace mitk { /// /// create a vnl_matrix from a cv mat /// template class VnlMatrixFromCvMat: virtual public Algorithm { public: /// /// init default values and save references /// VnlMatrixFromCvMat( const cv::Mat* _CvMat, vnl_matrix* _VnlMatrix): m_CvMat(_CvMat), m_VnlMatrix(_VnlMatrix) { } /// /// cv mat to vnl matrix with known cv type /// template void ToVnlMatrix( vnl_matrix& vnlMat, const cv::Mat& mat ) { vnlMat.set_size( mat.rows, mat.cols ); for(int i=0; i( mat.at(i,j) ); } /// /// executes the Algorithm /// void Update() { endoAccessCvMat( ToVnlMatrix, T, (*m_VnlMatrix), (*m_CvMat) ); } private: /// /// VnlMatrixFromCvMat input member variable /// const cv::Mat* m_CvMat; /// /// VnlMatrixFromCvMat output member variable /// vnl_matrix* m_VnlMatrix; }; } // namespace mitk #endif // mitkVnlMatrixFromCvMat_h diff --git a/Modules/CameraCalibration/mitkVnlVectorCaster.h b/Modules/CameraCalibration/mitkVnlVectorCaster.h index 85f946c919..2e620ec000 100644 --- a/Modules/CameraCalibration/mitkVnlVectorCaster.h +++ b/Modules/CameraCalibration/mitkVnlVectorCaster.h @@ -1,51 +1,50 @@ #ifndef mitkVnlVectorCaster_h #define mitkVnlVectorCaster_h #include -#include #include #include namespace mitk { /// /// class for casting vnl vectors to another basic type /// by means of static cast /// template class VnlVectorCaster: virtual public Algorithm { public: /// /// init default values and save references /// VnlVectorCaster( const vnl_vector_fixed* _InputVector, vnl_vector_fixed* _OutputVector): m_InputVector(_InputVector), m_OutputVector(_OutputVector) { } /// /// executes the Algorithm /// void Update() { for( size_t i=0; isize(); ++i ) (*m_OutputVector)[i] = static_cast( (*m_InputVector)[i] ); } private: /// /// VnlVectorCaster input member variable /// const vnl_vector_fixed* m_InputVector; /// /// VnlVectorCaster output member variable /// vnl_vector_fixed* m_OutputVector; }; } // namespace mitk #endif // mitkVnlVectorCaster_h