summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-05-09 17:06:59 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-05-09 17:06:59 +0000
commitb5fbebdee9ad52de4b9b373998d91581b9fd9004 (patch)
tree31f6f2cdab11f3276ef6abad0775e8b6888e1d33 /src/libnrtype
parentApply Sas' patch to improve import of SVG as in LP#227472 and the bugs mentio... (diff)
downloadinkscape-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/libnrtype')
-rwxr-xr-xsrc/libnrtype/Layout-TNG-Output.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp
index f3fac4218..499a8f7a5 100755
--- a/src/libnrtype/Layout-TNG-Output.cpp
+++ b/src/libnrtype/Layout-TNG-Output.cpp
@@ -156,14 +156,15 @@ void Layout::print(SPPrintContext *ctx,
NRBPath bpath;
bpath.path = (NArtBpath*)span.font->ArtBPath(_glyphs[glyph_index].glyph);
if (bpath.path) {
- NRBPath abp;
+ const_NRBPath abp;
_getGlyphTransformMatrix(glyph_index, &glyph_matrix);
- abp.path = nr_artpath_affine(bpath.path, glyph_matrix);
+ NArtBpath *temp_bpath = nr_artpath_affine(bpath.path, glyph_matrix);
+ abp.path = temp_bpath;
if (!text_source->style->fill.isNone())
sp_print_fill(ctx, &abp, &ctm, text_source->style, pbox, dbox, bbox);
if (!text_source->style->stroke.isNone())
sp_print_stroke(ctx, &abp, &ctm, text_source->style, pbox, dbox, bbox);
- g_free(abp.path);
+ g_free(temp_bpath);
}
glyph_index++;
} else {
@@ -234,7 +235,7 @@ void Layout::showGlyphs(CairoRenderContext *ctx) const
NArtBpath *bpath = (NArtBpath*)span.font->ArtBPath(_glyphs[glyph_index].glyph);
if (bpath) {
NArtBpath *abp = nr_artpath_affine(bpath, glyph_matrix);
- NRBPath bpath;
+ const_NRBPath bpath;
bpath.path = abp;
SPStyle const *style = text_source->style;
ctx->renderPath(&bpath, style, NULL);