From 7e952e2f101c17aeceedad76534981211069a579 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Tue, 31 Dec 2013 18:52:10 +0400 Subject: [PATCH] removed incorrect and unnecessarily methods from Affine3f --- modules/core/include/opencv2/core/affine.hpp | 21 -------------------- 1 file changed, 21 deletions(-) diff --git a/modules/core/include/opencv2/core/affine.hpp b/modules/core/include/opencv2/core/affine.hpp index fefcef8f12..0aaf57e0a2 100644 --- a/modules/core/include/opencv2/core/affine.hpp +++ b/modules/core/include/opencv2/core/affine.hpp @@ -73,9 +73,6 @@ namespace cv //Combines all contructors above. Supports 4x4, 3x3, 1x3, 3x1 sizes of data matrix explicit Affine3(const cv::Mat& data, const Vec3& t = Vec3::all(0)); - //Euler angles - Affine3(float_type alpha, float_type beta, float_type gamma, const Vec3& t = Vec3::all(0)); - static Affine3 Identity(); //Rotation matrix @@ -87,9 +84,6 @@ namespace cv //Combines rotation methods above. Suports 3x3, 1x3, 3x1 sizes of data matrix; void rotation(const Mat& data); - //Euler angles - void rotation(float_type alpha, float_type beta, float_type gamma); - void linear(const Mat3& L); void translation(const Vec3& t); @@ -186,15 +180,6 @@ cv::Affine3::Affine3(const cv::Mat& data, const Vec3& t) matrix.val[15] = 1; } -template inline -cv::Affine3::Affine3(float_type alpha, float_type beta, float_type gamma, const Vec3& t) -{ - rotation(alpha, beta, gamma); - translation(t); - matrix.val[12] = matrix.val[13] = matrix.val[14] = 0; - matrix.val[15] = 1; -} - template inline cv::Affine3 cv::Affine3::Identity() { @@ -261,12 +246,6 @@ void cv::Affine3::rotation(const cv::Mat& data) CV_Assert(!"Input marix can be 3x3, 1x3 or 3x1"); } -template inline -void cv::Affine3::rotation(float_type alpha, float_type beta, float_type gamma) -{ - rotation(Vec3(alpha, beta, gamma)); -} - template inline void cv::Affine3::linear(const Mat3& L) {