manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sounds like I forgot to commit the addition of Transpose compatibility + fix related to recent Eigen change

This commit is contained in:
Paolo Cignoni 2008-11-04 12:33:47 +00:00
parent cb22994ef5
commit 0927eaf2fb
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/math/eigen.h
View File

@ -303,6 +303,12 @@ inline const Eigen::CwiseUnaryOp<Eigen::ei_scalar_abs_op<typename Eigen::ei_trai
Abs(const Eigen::MatrixBase<Derived>& p)
{ return p.cwise().abs(); }
/** \deprecated use transposeInPlace() or transpose() */
template<typename Scalar,int Size,int StorageOrder>
EIGEN_DEPRECATED inline Eigen::Matrix<Scalar,Size,Size,StorageOrder>&
Transpose(const Eigen::Matrix<Scalar,Size,Size,StorageOrder>& m)
{ return m.transposeInPlace(); return m; }
template<typename Derived>
inline const Eigen::CwiseBinaryOp<Eigen::ei_scalar_max_op<typename Eigen::ei_traits<Derived>::Scalar>,
Derived,

2
vcg/math/eigen_matrix_addons.h
View File

@ -92,8 +92,6 @@ EIGEN_DEPRECATED inline const Scalar& V( const int i ) const
assert(i>=0 && i<SizeAtCompileTime);
return data()[i];
}
// // redefined because gcc 4.0.1 does not handle using Base::V
// EIGEN_DEPRECATED inline Scalar& V(int i) { return (*this)[i]; };
//--------------------------------------------------------------------------------
// SPACE

11
vcg/math/eigen_matrixbase_addons.h
View File

@ -188,7 +188,7 @@ EIGEN_DEPRECATED void Dump()
}
// norm2 will be renamed squaredNorm() in Eigen
inline Scalar squaredNorm() const { return norm2(); };
// inline Scalar squaredNorm() const { return norm2(); };
/** \deprecated use norm() */
EIGEN_DEPRECATED inline Scalar Norm() const { return norm(); };
@ -199,6 +199,11 @@ EIGEN_DEPRECATED inline Derived& Normalize() { normalize(); return derived(); };
/** \deprecated use normalized() */
EIGEN_DEPRECATED inline const EvalType Normalize() const { return normalized(); };
/** \deprecated use transposeInPlace() or transpose() */
EIGEN_DEPRECATED inline Derived& Transpose() { transposeInPlace(); return derived(); };
/** \deprecated use transpose() */
EIGEN_DEPRECATED inline const Eigen::Transpose<Derived> Transpose() const { return transpose(); };
/** \deprecated use .cross(p) */
EIGEN_DEPRECATED inline EvalType operator ^ (const Derived& p ) const { return this->cross(p); }
@ -245,13 +250,13 @@ EIGEN_DEPRECATED inline int MaxI() const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Deriv
EIGEN_DEPRECATED inline int MinI() const { EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived); int i; minCoeff(&i,0); return i; }
/// Padding function: give a default 0 value to all the elements that are not in the [0..2] range.
/// Padding function: give a default 0 value to all the elements that are not in the [0..2] range.
/// Useful for managing in a consistent way object that could have point2 / point3 / point4
inline Scalar Ext( const int i ) const
{
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived);
EIGEN_STATIC_ASSERT_FIXED_SIZE(Derived);
if(i>=0 && i<SizeAtCompileTime)
return coeff(i);
else