summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-11-01 16:10:03 (GMT)
committerMarius Kintel <marius@kintel.net>2013-11-01 16:10:03 (GMT)
commit5aa01edb938cc0ddb01deef98452bafb6d34f351 (patch)
treef5f1e8c690b2b99128af1538b39c4f6e25ea8bd0
parente05a9745a348d7805fcc7ef8879fe74c5e66d8f7 (diff)
Fix potential memory alignment issue with eigen. This might make us dependent on eigen3, but it's about time anyway
-rw-r--r--src/dxfdata.h4
-rw-r--r--src/linalg.h5
2 files changed, 4 insertions, 5 deletions
diff --git a/src/dxfdata.h b/src/dxfdata.h
index 64853dc..ac7260c 100644
--- a/src/dxfdata.h
+++ b/src/dxfdata.h
@@ -28,11 +28,7 @@ public:
}
};
-#ifdef __APPLE__
- std::vector<Vector2d, Eigen::aligned_allocator<Vector2d> > points;
-#else
std::vector<Vector2d> points;
-#endif
std::vector<Path> paths;
std::vector<Dim> dims;
diff --git a/src/linalg.h b/src/linalg.h
index 1f9ed30..cb82452 100644
--- a/src/linalg.h
+++ b/src/linalg.h
@@ -4,10 +4,13 @@
#include <Eigen/Core>
#include <Eigen/Geometry>
#include <Eigen/Dense>
+#include<Eigen/StdVector>
+EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector2d)
using Eigen::Vector2d;
+EIGEN_DEFINE_STL_VECTOR_SPECIALIZATION(Eigen::Vector3d)
using Eigen::Vector3d;
-using Eigen::Vector3f;
+
typedef Eigen::AlignedBox<double, 3> BoundingBox;
using Eigen::Matrix3f;
using Eigen::Matrix3d;
contact: Jan Huwald // Impressum