[SCM] Eigen3 packaging. branch, master, updated. upstream/3.0.2-41-gf71091e

Anton Gladky gladky.anton at gmail.com
Thu Oct 6 21:35:47 UTC 2011


The following commit has been merged in the master branch:
commit 3a0e6e131cb1ba49b4aa2b6f961e22c6e0b6cf54
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Oct 6 23:29:43 2011 +0200

    Remove patch, applied by upstream.

diff --git a/debian/patches/fix_eigen2support_in_geometry-module.patch b/debian/patches/fix_eigen2support_in_geometry-module.patch
deleted file mode 100644
index 74f21e4..0000000
--- a/debian/patches/fix_eigen2support_in_geometry-module.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Description: Fixes eigen2-support in geometry-module
-Author: Gael Guennebaud
-Bug: http://eigen.tuxfamily.org/bz/show_bug.cgi?id=337
-Applied-Upstream: https://bitbucket.org/eigen/eigen/changeset/ef57c8f83ca3#chg-Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-Last-Update: 2011-08-28
-
---- eigen3-3.0.2.orig/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+++ eigen3-3.0.2/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-@@ -51,14 +51,14 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTO
-   { if (AmbientDimAtCompileTime!=Dynamic) setNull(); }
- 
-   /** Constructs a null box with \a _dim the dimension of the ambient space. */
--  inline explicit AlignedBox(int _dim) : m_(min)(_dim), m_(max)(_dim)
-+  inline explicit AlignedBox(int _dim) : m_min(_dim), m_max(_dim)
-   { setNull(); }
- 
-   /** Constructs a box with extremities \a _min and \a _max. */
--  inline AlignedBox(const VectorType& _min, const VectorType& _max) : m_(min)(_min), m_(max)(_max) {}
-+  inline AlignedBox(const VectorType& _min, const VectorType& _max) : m_min(_min), m_max(_max) {}
- 
-   /** Constructs a box containing a single point \a p. */
--  inline explicit AlignedBox(const VectorType& p) : m_(min)(p), m_(max)(p) {}
-+  inline explicit AlignedBox(const VectorType& p) : m_min(p), m_max(p) {}
- 
-   ~AlignedBox() {}
- 
-@@ -71,8 +71,8 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTO
-   /** Makes \c *this a null/empty box. */
-   inline void setNull()
-   {
--    m_min.setConstant( std::numeric_limits<Scalar>::(max)());
--    m_max.setConstant(-std::numeric_limits<Scalar>::(max)());
-+    m_min.setConstant( (std::numeric_limits<Scalar>::max)());
-+    m_max.setConstant(-(std::numeric_limits<Scalar>::max)());
-   }
- 
-   /** \returns the minimal corner */
-@@ -90,19 +90,19 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTO
- 
-   /** \returns true if the box \a b is entirely inside the box \c *this. */
-   inline bool contains(const AlignedBox& b) const
--  { return (m_min.cwise()<=b.(min)()).all() && (b.(max)().cwise()<=m_max).all(); }
-+  { return (m_min.cwise()<=(b.min)()).all() && ((b.max)().cwise()<=m_max).all(); }
- 
-   /** Extends \c *this such that it contains the point \a p and returns a reference to \c *this. */
-   inline AlignedBox& extend(const VectorType& p)
--  { m_min = m_min.cwise().(min)(p); m_max = m_max.cwise().(max)(p); return *this; }
-+  { m_min = (m_min.cwise().min)(p); m_max = (m_max.cwise().max)(p); return *this; }
- 
-   /** Extends \c *this such that it contains the box \a b and returns a reference to \c *this. */
-   inline AlignedBox& extend(const AlignedBox& b)
--  { m_min = m_min.cwise().(min)(b.m_min); m_max = m_max.cwise().(max)(b.m_max); return *this; }
-+  { m_min = (m_min.cwise().min)(b.m_min); m_max = (m_max.cwise().max)(b.m_max); return *this; }
- 
-   /** Clamps \c *this by the box \a b and returns a reference to \c *this. */
-   inline AlignedBox& clamp(const AlignedBox& b)
--  { m_min = m_min.cwise().(max)(b.m_min); m_max = m_max.cwise().(min)(b.m_max); return *this; }
-+  { m_min = (m_min.cwise().max)(b.m_min); m_max = (m_max.cwise().min)(b.m_max); return *this; }
- 
-   /** Translate \c *this by the vector \a t and returns a reference to \c *this. */
-   inline AlignedBox& translate(const VectorType& t)
-@@ -138,8 +138,8 @@ EIGEN_MAKE_ALIGNED_OPERATOR_NEW_IF_VECTO
-   template<typename OtherScalarType>
-   inline explicit AlignedBox(const AlignedBox<OtherScalarType,AmbientDimAtCompileTime>& other)
-   {
--    m_min = other.(min)().template cast<Scalar>();
--    m_max = other.(max)().template cast<Scalar>();
-+    m_min = (other.min)().template cast<Scalar>();
-+    m_max = (other.max)().template cast<Scalar>();
-   }
- 
-   /** \returns \c true if \c *this is approximately equal to \a other, within the precision
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4f86f41..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix_eigen2support_in_geometry-module.patch

-- 
Eigen3 packaging. 



More information about the debian-science-commits mailing list