From edcedb11fd95a3ffb58dd9c90faea67e0e4cd543 Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Sun, 27 Jul 2008 11:40:49 +0000
Subject: [PATCH] forgot to update demo code after Triple->array changes

---
 Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h |  4 ++--
 Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h b/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h
index 86fba8a6a1c..235d7f4f274 100644
--- a/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h
+++ b/Circular_kernel_2/include/CGAL/IO/Dxf_reader_doubles.h
@@ -137,7 +137,7 @@ private:
   is >> r;
   FT rft(r);
 
-  circ = Circle_2(cx,cy,rft);
+  circ = CGALi::make_array(cx,cy,rft);
 }
 
 
@@ -176,7 +176,7 @@ read_polygon(std::istream& is, Polygon& poly)
       } else {
 	CGAL_assertion(n == 0);
       }
-      poly.push_back(Point_2_and_bulge(x,y, len));
+      poly.push_back(CGALi::make_array(x,y, len));
     }
 
   } while (str != "SEQEND");
diff --git a/Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h b/Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
index 8a718f36833..7114a6cdfc9 100644
--- a/Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
+++ b/Circular_kernel_2/include/CGAL/IO/Dxf_variant_reader.h
@@ -68,7 +68,7 @@ template<class CK,class Circular_arc_2, class Line_arc_2, class OutputIterator>
 
 
   for(typename Circles::iterator it = circles.begin(); it != circles.end(); it++){
-    Arc arc = typename CK::Construct_circular_arc_2()(typename CK::Construct_circle_2()(typename CK::Construct_point_2()(it->first, it->second), FT(it->third)));
+    Arc arc = typename CK::Construct_circular_arc_2()(typename CK::Construct_circle_2()(typename CK::Construct_point_2()((*it)[0], (*it)[1]), FT((*it)[2])));
     *res++ = arc;
   }
   
@@ -83,21 +83,21 @@ template<class CK,class Circular_arc_2, class Line_arc_2, class OutputIterator>
   for(typename Polygons::iterator it = polygons.begin(); it != polygons.end(); it++){
     typename Polygon::iterator pit = it->begin();
 
-    std::pair<double,double> xyfirst = std::make_pair(pit->first, pit->second);    
-    std::pair<double,double> xyps, xypt = std::make_pair(pit->first, pit->second);
+    std::pair<double,double> xyfirst = std::make_pair((*pit)[0], (*pit)[1]);    
+    std::pair<double,double> xyps, xypt = std::make_pair((*pit)[0], (*pit)[1]);
     Point_2 ps, pt = typename CK::Construct_point_2()(xypt.first, xypt.second);
     Point_2 first = pt;
 
       while(true){
       xyps = xypt;
       ps = pt;
-      bulge = pit->third;
+      bulge = (*pit)[2];
       pit++;
 
       if(pit ==it->end()){
 	break;
       }
-      xypt = std::make_pair(pit->first, pit->second);
+      xypt = std::make_pair((*pit)[0], (*pit)[1]);
       pt = typename CK::Construct_point_2()(xypt.first, xypt.second);
 
       p_cap_it = points.find(xyps);