diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-19 12:58:30 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-19 12:58:30 (GMT) |
| commit | a9045315baac2e8bd24428668cfa88f116984af7 (patch) | |
| tree | a59e5c7672b50e074a58feda7ee7a2310725a0c1 /src | |
| parent | 702525f69c0c9b7dbeb9f07efd4d9acaf9ead65d (diff) | |
rewrite Eigen detection in CMakelists. cleanup files for pull request.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dxfdata.cc | 1 | ||||
| -rw-r--r-- | src/dxfdim.cc | 2 | ||||
| -rw-r--r-- | src/dxftess-cgal.cc | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/dxfdata.cc b/src/dxfdata.cc index 0e18dd0..4258a4c 100644 --- a/src/dxfdata.cc +++ b/src/dxfdata.cc @@ -39,6 +39,7 @@ #include <boost/algorithm/string.hpp> #include <algorithm> #include <sstream> +#include <map> #include <QDir> #include "value.h" diff --git a/src/dxfdim.cc b/src/dxfdim.cc index 872637b..1ed37fa 100644 --- a/src/dxfdim.cc +++ b/src/dxfdim.cc @@ -183,7 +183,9 @@ Value builtin_dxf_cross(const Context *ctx, const std::vector<std::string> &argn return dxf_cross_cache[key] = Value(ret); } } + PRINTB("WARNING: Can't find cross in '%s', layer '%s'!", filename % layername); + return Value(); } diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc index fb5bf50..f221e3a 100644 --- a/src/dxftess-cgal.cc +++ b/src/dxftess-cgal.cc @@ -107,10 +107,8 @@ void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool /* do_tr std::vector<struct triangle> tri; Grid2d<point_info_t> point_info(GRID_FINE); -// boost::unordered_map<edge_t,int> edge_to_triangle; -// boost::unordered_map<edge_t,int> edge_to_path; - std::map<edge_t,int> edge_to_triangle; - std::map<edge_t,int> edge_to_path; + boost::unordered_map<edge_t,int> edge_to_triangle; + boost::unordered_map<edge_t,int> edge_to_path; CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION); try { |