diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-05-09 17:06:59 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-05-09 17:06:59 +0000 |
| commit | b5fbebdee9ad52de4b9b373998d91581b9fd9004 (patch) | |
| tree | 31f6f2cdab11f3276ef6abad0775e8b6888e1d33 /src/libnr/nr-path.cpp | |
| parent | Apply Sas' patch to improve import of SVG as in LP#227472 and the bugs mentio... (diff) | |
| download | inkscape-b5fbebdee9ad52de4b9b373998d91581b9fd9004.tar.gz inkscape-b5fbebdee9ad52de4b9b373998d91581b9fd9004.zip | |
complete adding const to have only NArtBpath const * get_bpath() const; for accessing the protected member of SPCurve. Nowhere in Inkscape source is the path data changed of SPCurve, except within SPCurve's own methods ! So removed the non-const NArtBpath* get_bpath.
(bzr r5642)
Diffstat (limited to 'src/libnr/nr-path.cpp')
| -rw-r--r-- | src/libnr/nr-path.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libnr/nr-path.cpp b/src/libnr/nr-path.cpp index 713cfe43d..734f3426d 100644 --- a/src/libnr/nr-path.cpp +++ b/src/libnr/nr-path.cpp @@ -20,7 +20,7 @@ static void nr_curve_bbox(NR::Point const p000, NR::Point const p001, NR::Point const p011, NR::Point const p111, NRRect *bbox); -NRBPath *nr_path_duplicate_transform(NRBPath *d, NRBPath *s, NR::Matrix const *transform) +NRBPath *nr_path_duplicate_transform(NRBPath *d, const_NRBPath *s, NR::Matrix const *transform) { int i; @@ -49,16 +49,17 @@ NRBPath *nr_path_duplicate_transform(NRBPath *d, NRBPath *s, NR::Matrix const *t return d; } -NRBPath *nr_path_duplicate_transform(NRBPath *d, NRBPath *s, NR::Matrix const transform) { +NRBPath *nr_path_duplicate_transform(NRBPath *d, const_NRBPath *s, NR::Matrix const transform) { NR::Matrix tr = transform; return nr_path_duplicate_transform(d, s, &tr); } -NArtBpath* nr_artpath_affine(NArtBpath *s, NR::Matrix const &aff) { - NRBPath bp, abp; - bp.path = s; - nr_path_duplicate_transform(&abp, &bp, aff); - return abp.path; +NArtBpath* nr_artpath_affine(NArtBpath const *s, NR::Matrix const &aff) { + const_NRBPath bp; + bp.path = s; + NRBPath abp; + nr_path_duplicate_transform(&abp, &bp, aff); + return abp.path; } static void @@ -212,7 +213,7 @@ nr_curve_bbox_wind_distance (NR::Coord x000, NR::Coord y000, } void -nr_path_matrix_point_bbox_wind_distance (NRBPath *bpath, NR::Matrix const &m, NR::Point &pt, +nr_path_matrix_point_bbox_wind_distance (const_NRBPath const *bpath, NR::Matrix const &m, NR::Point &pt, NRRect *bbox, int *wind, NR::Coord *dist, NR::Coord tolerance, NR::Rect *viewbox) { @@ -449,7 +450,7 @@ nr_curve_bbox (NR::Coord x000, NR::Coord y000, NR::Coord x001, NR::Coord y001, N } void -nr_path_matrix_bbox_union(NRBPath const *bpath, NR::Matrix const &m, +nr_path_matrix_bbox_union(const_NRBPath *bpath, NR::Matrix const &m, NRRect *bbox) { using NR::X; |