summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-09-11 21:44:48 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-09-11 21:44:48 +0000
commit4c9d5ef55883fd94094371813f80cfef0befcf74 (patch)
tree2705753419ba635ce155a5821b55ec481af19125 /src/display
parentMake tooltip reflect the correct range for calligraphy angle fixation (diff)
downloadinkscape-4c9d5ef55883fd94094371813f80cfef0befcf74.tar.gz
inkscape-4c9d5ef55883fd94094371813f80cfef0befcf74.zip
convert almost all libnrtype to Geom::
(bzr r6793)
Diffstat (limited to 'src/display')
-rw-r--r--src/display/nr-arena-glyphs.cpp6
-rw-r--r--src/display/nr-arena-glyphs.h10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index 0216fe4f9..6bb64f8d0 100644
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -255,7 +255,7 @@ nr_arena_glyphs_pick(NRArenaItem *item, NR::Point p, gdouble /*delta*/, unsigned
}
void
-nr_arena_glyphs_set_path(NRArenaGlyphs *glyphs, SPCurve */*curve*/, unsigned int /*lieutenant*/, font_instance *font, gint glyph, NR::Matrix const *transform)
+nr_arena_glyphs_set_path(NRArenaGlyphs *glyphs, SPCurve */*curve*/, unsigned int /*lieutenant*/, font_instance *font, gint glyph, Geom::Matrix const *transform)
{
nr_return_if_fail(glyphs != NULL);
nr_return_if_fail(NR_IS_ARENA_GLYPHS(glyphs));
@@ -607,7 +607,7 @@ nr_arena_glyphs_group_clear(NRArenaGlyphsGroup *sg)
}
void
-nr_arena_glyphs_group_add_component(NRArenaGlyphsGroup *sg, font_instance *font, int glyph, NR::Matrix const *transform)
+nr_arena_glyphs_group_add_component(NRArenaGlyphsGroup *sg, font_instance *font, int glyph, Geom::Matrix const &transform)
{
NRArenaGroup *group;
@@ -622,7 +622,7 @@ nr_arena_glyphs_group_add_component(NRArenaGlyphsGroup *sg, font_instance *font,
NRArenaItem *new_arena = NRArenaGlyphs::create(group->arena);
nr_arena_item_append_child(NR_ARENA_ITEM(group), new_arena);
nr_arena_item_unref(new_arena);
- nr_arena_glyphs_set_path(NR_ARENA_GLYPHS(new_arena), NULL, FALSE, font, glyph, transform);
+ nr_arena_glyphs_set_path(NR_ARENA_GLYPHS(new_arena), NULL, FALSE, font, glyph, &transform);
nr_arena_glyphs_set_style(NR_ARENA_GLYPHS(new_arena), sg->style);
}
}
diff --git a/src/display/nr-arena-glyphs.h b/src/display/nr-arena-glyphs.h
index ebf5cee6d..9c6762363 100644
--- a/src/display/nr-arena-glyphs.h
+++ b/src/display/nr-arena-glyphs.h
@@ -59,10 +59,10 @@ struct NRArenaGlyphsClass {
NRArenaItemClass parent_class;
};
-void nr_arena_glyphs_set_path (NRArenaGlyphs *glyphs,
- SPCurve *curve, unsigned int lieutenant,
- font_instance *font, int glyph,
- const NR::Matrix *transform);
+void nr_arena_glyphs_set_path ( NRArenaGlyphs *glyphs,
+ SPCurve *curve, unsigned int lieutenant,
+ font_instance *font, int glyph,
+ Geom::Matrix const *transform );
void nr_arena_glyphs_set_style (NRArenaGlyphs *glyphs, SPStyle *style);
/* Integrated group of component glyphss */
@@ -100,7 +100,7 @@ struct NRArenaGlyphsGroupClass {
void nr_arena_glyphs_group_clear (NRArenaGlyphsGroup *group);
-void nr_arena_glyphs_group_add_component (NRArenaGlyphsGroup *group, font_instance *font, int glyph, const NR::Matrix *transform);
+void nr_arena_glyphs_group_add_component (NRArenaGlyphsGroup *group, font_instance *font, int glyph, Geom::Matrix const &transform);
void nr_arena_glyphs_group_set_style (NRArenaGlyphsGroup *group, SPStyle *style);