GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 11:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
Benoit Jacob 2010-08-16 11:11:43 -04:00
parent b37551f62a
commit 19d9c835e0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Eigen/src/Geometry/Transform.h
View File

@ -243,7 +243,7 @@ public:
template<int OtherMode> template<int OtherMode>
inline Transform(const Transform<Scalar,Dim,OtherMode>& other) inline Transform(const Transform<Scalar,Dim,OtherMode>& other)
{ {
ei_assert(OtherMode!=Projective && "You cannot directly assign a projective transform to an affine one."); ei_assert(OtherMode!=int(Projective) && "You cannot directly assign a projective transform to an affine one.");
typedef typename Transform<Scalar,Dim,OtherMode>::MatrixType OtherMatrixType; typedef typename Transform<Scalar,Dim,OtherMode>::MatrixType OtherMatrixType;
ei_transform_construct_from_matrix<OtherMatrixType,Mode,Dim,HDim>::run(this, other.matrix()); ei_transform_construct_from_matrix<OtherMatrixType,Mode,Dim,HDim>::run(this, other.matrix());
} }
@ -618,7 +618,7 @@ Transform<Scalar,Dim,Mode>&
Transform<Scalar,Dim,Mode>::scale(const MatrixBase<OtherDerived> &other) Transform<Scalar,Dim,Mode>::scale(const MatrixBase<OtherDerived> &other)
{ {
EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(OtherDerived,int(Dim)) EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(OtherDerived,int(Dim))
EIGEN_STATIC_ASSERT(Mode!=Isometry, THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS) EIGEN_STATIC_ASSERT(Mode!=int(Isometry), THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS)
linearExt().noalias() = (linearExt() * other.asDiagonal()); linearExt().noalias() = (linearExt() * other.asDiagonal());
return *this; return *this;
} }
@ -630,7 +630,7 @@ Transform<Scalar,Dim,Mode>::scale(const MatrixBase<OtherDerived> &other)
template<typename Scalar, int Dim, int Mode> template<typename Scalar, int Dim, int Mode>
inline Transform<Scalar,Dim,Mode>& Transform<Scalar,Dim,Mode>::scale(Scalar s) inline Transform<Scalar,Dim,Mode>& Transform<Scalar,Dim,Mode>::scale(Scalar s)
{ {
EIGEN_STATIC_ASSERT(Mode!=Isometry, THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS) EIGEN_STATIC_ASSERT(Mode!=int(Isometry), THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS)
linearExt() *= s; linearExt() *= s;
return *this; return *this;
} }
@ -645,7 +645,7 @@ Transform<Scalar,Dim,Mode>&
Transform<Scalar,Dim,Mode>::prescale(const MatrixBase<OtherDerived> &other) Transform<Scalar,Dim,Mode>::prescale(const MatrixBase<OtherDerived> &other)
{ {
EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(OtherDerived,int(Dim)) EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(OtherDerived,int(Dim))
EIGEN_STATIC_ASSERT(Mode!=Isometry, THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS) EIGEN_STATIC_ASSERT(Mode!=int(Isometry), THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS)
m_matrix.template block<Dim,HDim>(0,0).noalias() = (other.asDiagonal() * m_matrix.template block<Dim,HDim>(0,0)); m_matrix.template block<Dim,HDim>(0,0).noalias() = (other.asDiagonal() * m_matrix.template block<Dim,HDim>(0,0));
return *this; return *this;
} }
@ -657,7 +657,7 @@ Transform<Scalar,Dim,Mode>::prescale(const MatrixBase<OtherDerived> &other)
template<typename Scalar, int Dim, int Mode> template<typename Scalar, int Dim, int Mode>
inline Transform<Scalar,Dim,Mode>& Transform<Scalar,Dim,Mode>::prescale(Scalar s) inline Transform<Scalar,Dim,Mode>& Transform<Scalar,Dim,Mode>::prescale(Scalar s)
{ {
EIGEN_STATIC_ASSERT(Mode!=Isometry, THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS) EIGEN_STATIC_ASSERT(Mode!=int(Isometry), THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS)
m_matrix.template topRows<Dim>() *= s; m_matrix.template topRows<Dim>() *= s;
return *this; return *this;
} }
@ -746,7 +746,7 @@ Transform<Scalar,Dim,Mode>&
Transform<Scalar,Dim,Mode>::shear(Scalar sx, Scalar sy) Transform<Scalar,Dim,Mode>::shear(Scalar sx, Scalar sy)
{ {
EIGEN_STATIC_ASSERT(int(Dim)==2, YOU_MADE_A_PROGRAMMING_MISTAKE) EIGEN_STATIC_ASSERT(int(Dim)==2, YOU_MADE_A_PROGRAMMING_MISTAKE)
EIGEN_STATIC_ASSERT(Mode!=Isometry, THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS) EIGEN_STATIC_ASSERT(Mode!=int(Isometry), THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS)
VectorType tmp = linear().col(0)*sy + linear().col(1); VectorType tmp = linear().col(0)*sy + linear().col(1);
linear() << linear().col(0) + linear().col(1)*sx, tmp; linear() << linear().col(0) + linear().col(1)*sx, tmp;
return *this; return *this;
@ -762,7 +762,7 @@ Transform<Scalar,Dim,Mode>&
Transform<Scalar,Dim,Mode>::preshear(Scalar sx, Scalar sy) Transform<Scalar,Dim,Mode>::preshear(Scalar sx, Scalar sy)
{ {
EIGEN_STATIC_ASSERT(int(Dim)==2, YOU_MADE_A_PROGRAMMING_MISTAKE) EIGEN_STATIC_ASSERT(int(Dim)==2, YOU_MADE_A_PROGRAMMING_MISTAKE)
EIGEN_STATIC_ASSERT(Mode!=Isometry, THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS) EIGEN_STATIC_ASSERT(Mode!=int(Isometry), THIS_METHOD_IS_ONLY_FOR_SPECIFIC_TRANSFORMATIONS)
m_matrix.template block<Dim,HDim>(0,0) = LinearMatrixType(1, sx, sy, 1) * m_matrix.template block<Dim,HDim>(0,0); m_matrix.template block<Dim,HDim>(0,0) = LinearMatrixType(1, sx, sy, 1) * m_matrix.template block<Dim,HDim>(0,0);
return *this; return *this;
} }
@ -1127,7 +1127,7 @@ struct ei_transform_right_product_impl<Other,Mode, Dim,HDim, Dim,Dim>
TransformType res; TransformType res;
res.matrix().col(Dim) = tr.matrix().col(Dim); res.matrix().col(Dim) = tr.matrix().col(Dim);
res.linearExt().noalias() = (tr.linearExt() * other); res.linearExt().noalias() = (tr.linearExt() * other);
if(Mode==Affine) if(Mode==int(Affine))
res.matrix().row(Dim).template head<Dim>() = tr.matrix().row(Dim).template head<Dim>(); res.matrix().row(Dim).template head<Dim>() = tr.matrix().row(Dim).template head<Dim>();
return res; return res;
} }
@ -1143,10 +1143,10 @@ struct ei_transform_right_product_impl<Other,Mode, Dim,HDim, Dim,HDim>
static ResultType run(const TransformType& tr, const Other& other) static ResultType run(const TransformType& tr, const Other& other)
{ {
TransformType res; TransformType res;
enum { Rows = Mode==Projective ? HDim : Dim }; enum { Rows = Mode==int(Projective) ? HDim : Dim };
res.matrix().template block<Rows,HDim>(0,0).noalias() = (tr.linearExt() * other); res.matrix().template block<Rows,HDim>(0,0).noalias() = (tr.linearExt() * other);
res.translationExt() += tr.translationExt(); res.translationExt() += tr.translationExt();
if(Mode!=Affine) if(Mode!=int(Affine))
res.makeAffine(); res.makeAffine();
return res; return res;
} }
@ -1248,7 +1248,7 @@ struct ei_transform_left_product_impl<Other,Mode,Dim,HDim, Dim,Dim>
static ResultType run(const Other& other, const TransformType& tr) static ResultType run(const Other& other, const TransformType& tr)
{ {
TransformType res; TransformType res;
if(Mode!=AffineCompact) if(Mode!=int(AffineCompact))
res.matrix().row(Dim) = tr.matrix().row(Dim); res.matrix().row(Dim) = tr.matrix().row(Dim);
res.matrix().template topRows<Dim>().noalias() res.matrix().template topRows<Dim>().noalias()
= other * tr.matrix().template topRows<Dim>(); = other * tr.matrix().template topRows<Dim>();

2
Eigen/src/Geometry/arch/Geometry_SSE.h
View File

@ -95,6 +95,7 @@ struct ei_quat_product<Architecture::SSE, Derived, OtherDerived, double, Aligned
t1 = ei_padd(ei_pmul(a_ww, b_xy), ei_pmul(a_yy, b_zw)); t1 = ei_padd(ei_pmul(a_ww, b_xy), ei_pmul(a_yy, b_zw));
t2 = ei_psub(ei_pmul(a_zz, b_xy), ei_pmul(a_xx, b_zw)); t2 = ei_psub(ei_pmul(a_zz, b_xy), ei_pmul(a_xx, b_zw));
#ifdef __SSE3__ #ifdef __SSE3__
EIGEN_UNUSED_VARIABLE(mask)
ei_pstore(&res.x(), _mm_addsub_pd(t1, ei_preverse(t2))); ei_pstore(&res.x(), _mm_addsub_pd(t1, ei_preverse(t2)));
#else #else
ei_pstore(&res.x(), ei_padd(t1, ei_pxor(mask,ei_preverse(t2)))); ei_pstore(&res.x(), ei_padd(t1, ei_pxor(mask,ei_preverse(t2))));
@ -108,6 +109,7 @@ struct ei_quat_product<Architecture::SSE, Derived, OtherDerived, double, Aligned
t1 = ei_psub(ei_pmul(a_ww, b_zw), ei_pmul(a_yy, b_xy)); t1 = ei_psub(ei_pmul(a_ww, b_zw), ei_pmul(a_yy, b_xy));
t2 = ei_padd(ei_pmul(a_zz, b_zw), ei_pmul(a_xx, b_xy)); t2 = ei_padd(ei_pmul(a_zz, b_zw), ei_pmul(a_xx, b_xy));
#ifdef __SSE3__ #ifdef __SSE3__
EIGEN_UNUSED_VARIABLE(mask)
ei_pstore(&res.z(), ei_preverse(_mm_addsub_pd(ei_preverse(t1), t2))); ei_pstore(&res.z(), ei_preverse(_mm_addsub_pd(ei_preverse(t1), t2)));
#else #else
ei_pstore(&res.z(), ei_psub(t1, ei_pxor(mask,ei_preverse(t2)))); ei_pstore(&res.z(), ei_psub(t1, ei_pxor(mask,ei_preverse(t2))));