diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-06-12 20:20:51 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-06-12 20:20:51 +0000 |
| commit | 21f04a292dafc2cfd1374609720c458124c5b9a4 (patch) | |
| tree | 1a38adb5df88eb36bafb6d055b55faf6b0d69cba /src/desktop-style.cpp | |
| parent | update 2geom (diff) | |
| download | inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.tar.gz inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.zip | |
change NR::Matrix to Geom:: for many sp_item_xxx_affine functions
(bzr r5915)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 3504dcf40..4f4344f9b 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -120,7 +120,7 @@ sp_desktop_apply_css_recursive(SPObject *o, SPCSSAttr *css, bool skip_lines) // Scale the style by the inverse of the accumulated parent transform in the paste context. { - NR::Matrix const local(sp_item_i2doc_affine(SP_ITEM(o))); + NR::Matrix const local(from_2geom(sp_item_i2doc_affine(SP_ITEM(o)))); double const ex(NR::expansion(local)); if ( ( ex != 0. ) && ( ex != 1. ) ) { @@ -394,7 +394,7 @@ stroke_average_width (GSList const *objects) if (!SP_IS_ITEM (l->data)) continue; - NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(l->data)); + NR::Matrix i2d = from_2geom(sp_item_i2d_affine (SP_ITEM(l->data))); SPObject *object = SP_OBJECT(l->data); @@ -660,7 +660,7 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res) n_stroked ++; - NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj)); + NR::Matrix i2d = from_2geom(sp_item_i2d_affine (SP_ITEM(obj))); double sw = style->stroke_width.computed * NR::expansion(i2d); if (prev_sw != -1 && fabs(sw - prev_sw) > 1e-3) @@ -876,7 +876,7 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) if (!style) continue; texts ++; - size += style->font_size.computed * NR::expansion(sp_item_i2d_affine(SP_ITEM(obj))); /// \todo FIXME: we assume non-% units here + size += style->font_size.computed * NR::expansion(from_2geom(sp_item_i2d_affine(SP_ITEM(obj)))); /// \todo FIXME: we assume non-% units here if (style->letter_spacing.normal) { if (!different && (letterspacing_prev == 0 || letterspacing_prev == letterspacing)) @@ -1211,7 +1211,7 @@ objects_query_blur (GSList *objects, SPStyle *style_res) if (!style) continue; if (!SP_IS_ITEM(obj)) continue; - NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj)); + NR::Matrix i2d = from_2geom(sp_item_i2d_affine (SP_ITEM(obj))); items ++; |