summaryrefslogtreecommitdiffstats
path: root/src/splivarot.cpp
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2006-05-09 03:03:38 +0000
committermental <mental@users.sourceforge.net>2006-05-09 03:03:38 +0000
commit9d70a6ef2dd43220fdaab3c67e928b235b4893a0 (patch)
tree87b2ee880b8caba954d5bb44da305bfe8c570e8a /src/splivarot.cpp
parenthmm, make that std::vector (diff)
downloadinkscape-9d70a6ef2dd43220fdaab3c67e928b235b4893a0.tar.gz
inkscape-9d70a6ef2dd43220fdaab3c67e928b235b4893a0.zip
use std::vector rather than dynamically-sized automatic arrays
(bzr r784)
Diffstat (limited to 'src/splivarot.cpp')
-rw-r--r--src/splivarot.cpp9
1 files changed, 5 insertions, 4 deletions
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;