diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/splivarot.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -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; |