diff options
author | Gard Spreemann <gspreemann@gmail.com> | 2017-04-20 11:10:45 +0200 |
---|---|---|
committer | Gard Spreemann <gspreemann@gmail.com> | 2017-04-20 11:10:45 +0200 |
commit | 8d7329f3e5ad843e553c3c5503cecc28ef2eead6 (patch) | |
tree | 6d80d83a7c4bcd3296e12a28404bfe84ef84ed55 /GudhUI/view | |
parent | 55c7181126aa7defce38c9b82872d14223d4c1dd (diff) |
GUDHI 2.0.0 as released by upstream in a tarball.upstream/2.0.0
Diffstat (limited to 'GudhUI/view')
-rw-r--r-- | GudhUI/view/FirstCoordProjector.h | 6 | ||||
-rw-r--r-- | GudhUI/view/Viewer.h | 3 | ||||
-rw-r--r-- | GudhUI/view/Viewer_instructor.h | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/GudhUI/view/FirstCoordProjector.h b/GudhUI/view/FirstCoordProjector.h index a4027b7f..1333f5d3 100644 --- a/GudhUI/view/FirstCoordProjector.h +++ b/GudhUI/view/FirstCoordProjector.h @@ -33,9 +33,11 @@ class FirstCoordProjector3D : public Projector3D { Point_3 operator()(const Point& p) const { if (p.dimension() >= 3) - return Point_3(p.x(), p.y(), p.z()); + return Point_3(p.x(), p.y(), p.z()); else if (p.dimension() >= 2) - return Point_3(p.x(), p.y(), 0.0); + return Point_3(p.x(), p.y(), 0.0); + else + return Point_3(0.0, 0.0, 0.0); } }; diff --git a/GudhUI/view/Viewer.h b/GudhUI/view/Viewer.h index 319c8e04..797ddc53 100644 --- a/GudhUI/view/Viewer.h +++ b/GudhUI/view/Viewer.h @@ -24,9 +24,6 @@ #ifndef VIEW_VIEWER_H_ #define VIEW_VIEWER_H_ -// Workaround for moc-qt4 not parsing boost headers -#include <CGAL/config.h> - #include <QGLViewer/qglviewer.h> #include <vector> diff --git a/GudhUI/view/Viewer_instructor.h b/GudhUI/view/Viewer_instructor.h index 1da28009..05c5c1fc 100644 --- a/GudhUI/view/Viewer_instructor.h +++ b/GudhUI/view/Viewer_instructor.h @@ -26,9 +26,6 @@ // todo do a viewer instructor that have directely a pointer to a QGLviewer and buffer ot not triangles -// Workaround for moc-qt4 not parsing boost headers -#include <CGAL/config.h> - #include <QFileDialog> #include <QKeyEvent> #include <QGLViewer/camera.h> |