aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Geometry/Scaling.h
diff options
context:
space:
mode:
authorGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-08-17 20:03:50 +0200
committerGravatar Hauke Heibel <hauke.heibel@gmail.com>2010-08-17 20:03:50 +0200
commit85fdcdf0554918a485112ed078417379f691d01b (patch)
treed567a6be5691c67cc6341cc560366abc292f6232 /Eigen/src/Geometry/Scaling.h
parent87aafc9169cd549213c8a950bbeabada109b00ef (diff)
Fixed Geometry module failures.
Removed default parameter from Transform. Removed the TransformXX typedefs. Removed references to TransformXX from unit tests and docs. Assigning Transforms to a sub-group is now forbidden at compile time. Products should now properly support the Isometry flag. Fixed alignment checks in MapBase.
Diffstat (limited to 'Eigen/src/Geometry/Scaling.h')
-rw-r--r--Eigen/src/Geometry/Scaling.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Geometry/Scaling.h b/Eigen/src/Geometry/Scaling.h
index 2bcf48630..05b3e0526 100644
--- a/Eigen/src/Geometry/Scaling.h
+++ b/Eigen/src/Geometry/Scaling.h
@@ -69,7 +69,7 @@ public:
/** Concatenates a uniform scaling and a translation */
template<int Dim>
- inline Transform<Scalar,Dim> operator* (const Translation<Scalar,Dim>& t) const;
+ inline Transform<Scalar,Dim,Affine> operator* (const Translation<Scalar,Dim>& t) const;
/** Concatenates a uniform scaling and an affine transformation */
template<int Dim, int Mode>
@@ -158,10 +158,10 @@ typedef DiagonalMatrix<double,3> AlignedScaling3d;
template<typename Scalar>
template<int Dim>
-inline Transform<Scalar,Dim>
+inline Transform<Scalar,Dim,Affine>
UniformScaling<Scalar>::operator* (const Translation<Scalar,Dim>& t) const
{
- Transform<Scalar,Dim> res;
+ Transform<Scalar,Dim,Affine> res;
res.matrix().setZero();
res.linear().diagonal().fill(factor());
res.translation() = factor() * t.vector();