diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2008-09-18 17:48:42 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2008-09-18 17:48:42 +0000 |
| commit | 07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8 (patch) | |
| tree | 3a4c8c7f4f8de2878adbe5eabaf75460d35b8bcb /src/sp-tspan.cpp | |
| parent | NR ==> Geom conversion in sp-canvas (diff) | |
| download | inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.tar.gz inkscape-07a2c5b0db916ac9e5dee3bcbafcb12d8e767fa8.zip | |
Next roud of NR ==> Geom conversion
(bzr r6839)
Diffstat (limited to 'src/sp-tspan.cpp')
| -rw-r--r-- | src/sp-tspan.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp index c86c852d7..2496fc6e0 100644 --- a/src/sp-tspan.cpp +++ b/src/sp-tspan.cpp @@ -57,7 +57,7 @@ static void sp_tspan_release(SPObject *object); static void sp_tspan_set(SPObject *object, unsigned key, gchar const *value); static void sp_tspan_update(SPObject *object, SPCtx *ctx, guint flags); static void sp_tspan_modified(SPObject *object, unsigned flags); -static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags); +static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags); static Inkscape::XML::Node *sp_tspan_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static char *sp_tspan_description (SPItem *item); @@ -203,7 +203,7 @@ sp_tspan_modified(SPObject *object, unsigned flags) } } -static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const /*flags*/) +static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const /*flags*/) { // find out the ancestor text which holds our layout SPObject *parent_text = SP_OBJECT(item); @@ -216,7 +216,7 @@ static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr // Add stroke width SPStyle* style=SP_OBJECT_STYLE (item); if (!style->stroke.isNone()) { - double const scale = expansion(transform); + double const scale = transform.descrim(); if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord double const width = MAX(0.125, style->stroke_width.computed * scale); if ( fabs(bbox->x1 - bbox->x0) > -0.00001 && fabs(bbox->y1 - bbox->y0) > -0.00001 ) { |