dxfngc

@@ -7,7 +7,9 @@

 #include <iostream>

 #include <vector>

-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

+#include <CGAL/Gmpq.h>

+#include <CGAL/number_utils.h>

 #include <CGAL/Polygon_2.h>

 #include <CGAL/Polygon_with_holes_2.h>

 #include <CGAL/Boolean_set_operations_2.h>

@@ -179,9 +181,10 @@ bool Polygons::createInnerOffset(double offset, Polygons &offsetPolys) const

   for (poly = mPolys.begin(); poly != mPolys.end(); ++poly) {

     // create inner offset polygons

+    CGAL::Lazy_exact_nt<CGAL::Gmpq> offs(offset);

     CgPolyHolesPtrVec offPolys =

       CGAL::create_interior_skeleton_and_offset_polygons_with_holes_2(

-        offset, *poly);

+        offs, *poly);

     // add offset polygons to output polygons

     CgPolyHolesPtrVec::const_iterator offPoly;

@@ -247,8 +250,9 @@ bool Polygons::fillInnerOffset(double offset, Polygons &offsetPolys) const

     for (i = 1; ; ++i) {

       // create inner offset polygons

+      CGAL::Lazy_exact_nt<CGAL::Gmpq> offs_i(offset * i);

       CgPolyPtrVec offPolys =

-        CGAL::create_offset_polygons_2<CgPoly>(offset * i, *skel);

+        CGAL::create_offset_polygons_2<CgPoly>(offs_i, *skel);

       // no offset polygons -> done

       if (offPolys.empty())

@@ -298,9 +302,12 @@ bool Polygons::createOuterOffsetPoly(const CgPolyHoles &poly, double offset,

                                      CgPolyHoles &offsetPoly)

 {

   // calculate outer offset of outer bondary

+  CGAL::Lazy_exact_nt<CGAL::Gmpq> offs(offset);

   const CgPoly &outer = poly.outer_boundary();

+  CgKern kern;

   CgPolyPtrVec outOffPolys =

-    CGAL::create_exterior_skeleton_and_offset_polygons_2(offset, outer);

+    CGAL::create_exterior_skeleton_and_offset_polygons_2(

+      offs, outer, kern, kern);

   /* outer Offset should now contain 2 polygons,

      the artificially added very outer boundary and the offset polygon */

   if (outOffPolys.size() != 2) {

@@ -315,7 +322,8 @@ bool Polygons::createOuterOffsetPoly(const CgPolyHoles &poly, double offset,

     CgPoly holeRev = *hole; // reverse orientation (make hole a normal poly)

     holeRev.reverse_orientation();

     CgPolyPtrVec inOffPolys =

-      CGAL::create_interior_skeleton_and_offset_polygons_2(offset, holeRev);

+      CGAL::create_interior_skeleton_and_offset_polygons_2(

+        offs, holeRev, kern, kern);

     CgPolyPtrVec::iterator inOff; // add inner offset polys as new holes

     for (inOff = inOffPolys.begin(); inOff != inOffPolys.end(); ++inOff) {

       (*inOff)->reverse_orientation(); // re-reverse (make poly a hole again)

@@ -342,10 +350,9 @@ void Polygons::PolyToLayer(const CgPoly &poly, Layer &layer)

   // add all points

   CgPoly::Vertex_const_iterator v;

   for (v = poly.vertices_begin(); v != poly.vertices_end(); ++v)

-    path.addPoint(v->x(), v->y());

+    path.addPoint(CGAL::to_double(v->x()), CGAL::to_double(v->y()));

   // add first point again to close path

-  v = poly.vertices_begin();

-  path.addPoint(v->x(), v->y());

+  path.addPoint(path.mPoints.front());

 }

 /**

@@ -9,7 +9,7 @@

 #include <boost/shared_ptr.hpp>

 #include <vector>

-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>

 #include <CGAL/Polygon_2.h>

 #include <CGAL/Polygon_with_holes_2.h>

 #include <CGAL/create_straight_skeleton_from_polygon_with_holes_2.h>

@@ -19,7 +19,7 @@

 /// a set of polygons

 class Polygons {

 public:

-  typedef CGAL::Exact_predicates_inexact_constructions_kernel CgKern;

+  typedef CGAL::Exact_predicates_exact_constructions_kernel CgKern;

   typedef CgKern::Point_2                    CgPoint;

   typedef CGAL::Polygon_2<CgKern>            CgPoly;