From: mental <mental@users.sourceforge.net>
Date: Tue, 9 May 2006 03:03:38 +0000 (+0000)
Subject: use std::vector rather than dynamically-sized automatic arrays
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=555c285af940ce0786916ed8954c7901126c5557;p=inkscape.git

use std::vector rather than dynamically-sized automatic arrays
---

diff --git a/ChangeLog b/ChangeLog
index 66ccb0508..3a1be5f51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2006-05-08  MenTaLguY  <mental@rydia.net>
 
-	* src/streams-zlib.cpp, src/streams-jar.cpp:
+	* src/streams-zlib.cpp, src/streams-jar.cpp, src/splivarot.cpp:
 
 	  use std::vector rather than dynamically-sized automatic arrays,
 	  plus cleanups and minor fixes
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 2f4441889..c5969576e 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -17,6 +17,7 @@
 # include <config.h>
 #endif
 
+#include <vector>
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "sp-path.h"
@@ -174,8 +175,8 @@ sp_selected_path_boolop(bool_op bop)
     // extract the livarot Paths from the source objects
     // also get the winding rule specified in the style
     int nbOriginaux = g_slist_length(il);
-    Path *originaux[nbOriginaux];
-    FillRule  origWind[nbOriginaux];
+    std::vector<Path *> originaux(nbOriginaux);
+    std::vector<FillRule> origWind(nbOriginaux);
     int curOrig;
     {
         curOrig = 0;
@@ -378,9 +379,9 @@ sp_selected_path_boolop(bool_op bop)
         // function needs it.
         // this function uses the point_data to get the winding number of each path (ie: is a hole or not)
         // for later reconstruction in objects, you also need to extract which path is parent of holes (nesting info)
-        theShape->ConvertToFormeNested(res, nbOriginaux, originaux, 1, nbNest, nesting, conts);
+        theShape->ConvertToFormeNested(res, nbOriginaux, &originaux[0], 1, nbNest, nesting, conts);
     } else {
-        theShape->ConvertToForme(res, nbOriginaux, originaux);
+        theShape->ConvertToForme(res, nbOriginaux, &originaux[0]);
     }
 
     delete theShape;