diff options
| author | Mihaela Jurković <mihaela.jurkovic@gmail.com> | 2018-02-11 22:55:25 +0000 |
|---|---|---|
| committer | Mihaela Jurković <mihaela.jurkovic@gmail.com> | 2018-02-11 22:55:25 +0000 |
| commit | e4574627188824cf90dbcea4e7d043e6be47b082 (patch) | |
| tree | 0005b509561907cdce7c7839509774a2c0ae4625 /src/splivarot.cpp | |
| parent | I removed some unnecessary window geometry, Inkscape version, text styles, I ... (diff) | |
| parent | Misc. typos (diff) | |
| download | inkscape-e4574627188824cf90dbcea4e7d043e6be47b082.tar.gz inkscape-e4574627188824cf90dbcea4e7d043e6be47b082.zip | |
Merge branch 'master' into 'master'
Master commit to prkos. Test of reverse merging
See merge request prkos/inkscape!1
Diffstat (limited to 'src/splivarot.cpp')
| -rw-r--r-- | src/splivarot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 7daaefdfa..cbb51f312 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -281,7 +281,7 @@ sp_pathvector_boolop(Geom::PathVector const &pathva, Geom::PathVector const &pat free(toCut); } else if ( bop == bool_op_cut ) { // il faut appeler pour desallouer PointData (pas vital, mais bon) - // the Booleen() function did not deallocated the point_data array in theShape, because this + // the Booleen() function did not deallocate the point_data array in theShape, because this // 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) @@ -659,7 +659,7 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, free(toCut); } else if ( bop == bool_op_cut ) { // il faut appeler pour desallouer PointData (pas vital, mais bon) - // the Booleen() function did not deallocated the point_data array in theShape, because this + // the Booleen() function did not deallocate the point_data array in theShape, because this // 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) |