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

compilation fixes with eigen

This commit is contained in:
Paolo Cignoni 2009-01-22 23:10:24 +00:00
parent f6b42772eb
commit 9a47677ed2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vcg/math/eigen.h
View File

@ -25,7 +25,7 @@
#define EIGEN_VCGLIB #define EIGEN_VCGLIB
// TODO enable the vectorization // TODO enable the vectorization
#define EIGEN_DONT_VECTORIZE //#define EIGEN_DONT_VECTORIZE
#define EIGEN_MATRIXBASE_PLUGIN <vcg/math/eigen_matrixbase_addons.h> #define EIGEN_MATRIXBASE_PLUGIN <vcg/math/eigen_matrixbase_addons.h>
#define EIGEN_MATRIX_PLUGIN <vcg/math/eigen_matrix_addons.h> #define EIGEN_MATRIX_PLUGIN <vcg/math/eigen_matrix_addons.h>
@ -33,7 +33,7 @@
namespace Eigen { namespace Eigen {
template<typename T> struct ei_traits; template<typename T> struct ei_traits;
#include "../Eigen/src/Core/util/Meta.h" template<typename A,typename B> struct ei_is_same_type;
template<typename Derived1, typename Derived2, int Size> struct ei_lexi_comparison; template<typename Derived1, typename Derived2, int Size> struct ei_lexi_comparison;

8
vcg/math/eigen_matrixbase_addons.h
View File

@ -197,7 +197,7 @@ EIGEN_DEPRECATED inline Scalar SquaredNorm() const { return squaredNorm(); };
/** \deprecated use normalize() or normalized() */ /** \deprecated use normalize() or normalized() */
EIGEN_DEPRECATED inline Derived& Normalize() { normalize(); return derived(); }; EIGEN_DEPRECATED inline Derived& Normalize() { normalize(); return derived(); };
/** \deprecated use normalized() */ /** \deprecated use normalized() */
EIGEN_DEPRECATED inline const EvalType Normalize() const { return normalized(); }; EIGEN_DEPRECATED inline const PlainMatrixType Normalize() const { return normalized(); };
/** \deprecated use transposeInPlace() or transpose() */ /** \deprecated use transposeInPlace() or transpose() */
EIGEN_DEPRECATED inline Derived& Transpose() { transposeInPlace(); return derived(); }; EIGEN_DEPRECATED inline Derived& Transpose() { transposeInPlace(); return derived(); };
@ -205,7 +205,7 @@ EIGEN_DEPRECATED inline Derived& Transpose() { transposeInPlace(); return derive
EIGEN_DEPRECATED inline const Eigen::Transpose<Derived> Transpose() const { return transpose(); }; EIGEN_DEPRECATED inline const Eigen::Transpose<Derived> Transpose() const { return transpose(); };
/** \deprecated use .cross(p) */ /** \deprecated use .cross(p) */
EIGEN_DEPRECATED inline EvalType operator ^ (const Derived& p ) const { return this->cross(p); } EIGEN_DEPRECATED inline PlainMatrixType operator ^ (const Derived& p ) const { return this->cross(p); }
/// Homogeneous normalization (division by W) /// Homogeneous normalization (division by W)
inline Derived& HomoNormalize() inline Derived& HomoNormalize()
@ -226,9 +226,9 @@ inline Derived& HomoNormalize()
return *this; return *this;
} }
inline const EvalType HomoNormalize() const inline const PlainMatrixType HomoNormalize() const
{ {
EvalType res = derived(); PlainMatrixType res = derived();
return res.HomoNormalize(); return res.HomoNormalize();
} }