summaryrefslogtreecommitdiff
path: root/src/dxftess-cgal.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-09-03 20:44:41 (GMT)
committerMarius Kintel <marius@kintel.net>2011-09-03 20:44:41 (GMT)
commit6096f2734a9a2f2c789f2e948c021def6b41f85b (patch)
treeed87e8732c45c19413de488ccd16fafe049111b2 /src/dxftess-cgal.cc
parent946605234c7cf35cadfe9bde5531ebe6655f1b42 (diff)
De-Qt-ification continues, almost done with DxfData
Diffstat (limited to 'src/dxftess-cgal.cc')
-rw-r--r--src/dxftess-cgal.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc
index 825132f..6585e76 100644
--- a/src/dxftess-cgal.cc
+++ b/src/dxftess-cgal.cc
@@ -106,17 +106,17 @@ void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool /* do_tr
try {
// read path data and copy all relevant infos
- for (int i = 0; i < dxf.paths.count(); i++)
+ for (int i = 0; i < dxf.paths.size(); i++)
{
if (!dxf.paths[i].is_closed)
continue;
Vertex_handle first, prev;
struct point_info_t *first_pi = NULL, *prev_pi = NULL;
- for (int j = 1; j < dxf.paths[i].points.count(); j++)
+ for (int j = 1; j < dxf.paths[i].indices.size(); j++)
{
- double x = (*dxf.paths[i].points[j])[0];
- double y = (*dxf.paths[i].points[j])[1];
+ double x = dxf.points[dxf.paths[i].indices[j]][0];
+ double y = dxf.points[dxf.paths[i].indices[j]][1];
if (point_info.has(x, y)) {
// FIXME: How can the same path set contain the same point twice?
@@ -127,7 +127,7 @@ void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool /* do_tr
}
struct point_info_t *pi = &point_info.align(x, y);
- *pi = point_info_t(x, y, i, j, dxf.paths[i].points.count()-1);
+ *pi = point_info_t(x, y, i, j, dxf.paths[i].indices.size()-1);
Vertex_handle vh = cdt.insert(CDTPoint(x, y));
if (first_pi == NULL) {
contact: Jan Huwald // Impressum