Make sure that snapping attributes pass 'make check'

[inkscape.git] / src / livarot / Shape.cpp

diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index 178e8660ee2531273ac341aefa8ecbc39c713a39..c694cdd2776b958e2369a6e9f3b24ed921e42f97 100644 (file)
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -19,10 +19,10 @@
  */
 
 Shape::Shape()
-  : iData(NULL),
+  : qrsData(NULL),
+    iData(NULL),
     sTree(NULL),
     sEvts(NULL),
-    qrsData(NULL),
     _need_points_sorting(false),
     _need_edges_sorting(false),
     _has_points_data(false),
@@ -51,15 +51,13 @@ Shape::~Shape (void)
 
 void Shape::Affiche(void)
 {
-  /*
-  printf("sh=%p nbPt=%i nbAr=%i\n",this,nbPt,nbAr); // localizing ok
-  for (int i=0;i<nbPt;i++) {
-    printf("pt %i : x=(%f %f) dI=%i dO=%i\n",i,pts[i].x[0],pts[i].x[1],pts[i].dI,pts[i].dO); // localizing ok
+  printf("sh=%p nbPt=%i nbAr=%i\n", this, static_cast<int>(_pts.size()), static_cast<int>(_aretes.size())); // localizing ok
+  for (unsigned int i=0; i<_pts.size(); i++) {
+    printf("pt %i : x=(%f %f) dI=%i dO=%i\n",i, _pts[i].x[0], _pts[i].x[1], _pts[i].dI, _pts[i].dO); // localizing ok
   }
-  for (int i=0;i<nbAr;i++) {
-    printf("ar %i : dx=(%f %f) st=%i en=%i\n",i,aretes[i].dx[0],aretes[i].dx[1],aretes[i].st,aretes[i].en); // localizing ok
+  for (unsigned int i=0; i<_aretes.size(); i++) {
+    printf("ar %i : dx=(%f %f) st=%i en=%i\n",i, _aretes[i].dx[0], _aretes[i].dx[1], _aretes[i].st, _aretes[i].en); // localizing ok
   }
-  */
 }
 
 /**