diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-07-12 16:31:41 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-07-12 16:31:41 +0000 |
| commit | b788d34462d7c397666538a730cb4d7962a3f665 (patch) | |
| tree | bc9fd94c4aadf0a72a3d38761db1d528d1d67950 /src/libnrtype | |
| parent | 2geomify latex-pstricks (diff) | |
| download | inkscape-b788d34462d7c397666538a730cb4d7962a3f665.tar.gz inkscape-b788d34462d7c397666538a730cb4d7962a3f665.zip | |
remove no longer used methods (livarot to nartbpath ; font glyphs to nartbpath)
(bzr r6280)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 20 | ||||
| -rw-r--r-- | src/libnrtype/font-glyph.h | 1 | ||||
| -rw-r--r-- | src/libnrtype/font-instance.h | 2 |
3 files changed, 0 insertions, 23 deletions
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 9504a9713..5058e8e22 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -178,7 +178,6 @@ font_instance::~font_instance(void) for (int i=0;i<nbGlyph;i++) { if ( glyphs[i].outline ) delete glyphs[i].outline; - if ( glyphs[i].artbpath ) free(glyphs[i].artbpath); if ( glyphs[i].pathvector ) delete glyphs[i].pathvector; } if ( glyphs ) free(glyphs); @@ -430,7 +429,6 @@ void font_instance::LoadGlyph(int glyph_id) } font_glyph n_g; n_g.outline=NULL; - n_g.artbpath=NULL; n_g.pathvector=NULL; n_g.bbox[0]=n_g.bbox[1]=n_g.bbox[2]=n_g.bbox[3]=0; bool doAdd=false; @@ -558,7 +556,6 @@ void font_instance::LoadGlyph(int glyph_id) if ( doAdd ) { if ( n_g.outline ) { n_g.outline->FastBBox(n_g.bbox[0],n_g.bbox[1],n_g.bbox[2],n_g.bbox[3]); - n_g.artbpath=n_g.outline->MakeArtBPath(); n_g.pathvector=n_g.outline->MakePathVector(); } glyphs[nbGlyph]=n_g; @@ -661,23 +658,6 @@ Path* font_instance::Outline(int glyph_id,Path* copyInto) return src_o; } -void* font_instance::ArtBPath(int glyph_id) -{ - int no=-1; - if ( id_to_no.find(glyph_id) == id_to_no.end() ) { - LoadGlyph(glyph_id); - if ( id_to_no.find(glyph_id) == id_to_no.end() ) { - // didn't load - } else { - no=id_to_no[glyph_id]; - } - } else { - no=id_to_no[glyph_id]; - } - if ( no < 0 ) return NULL; - return glyphs[no].artbpath; -} - Geom::PathVector* font_instance::PathVector(int glyph_id) { int no = -1; diff --git a/src/libnrtype/font-glyph.h b/src/libnrtype/font-glyph.h index 11e0206b5..234502f9d 100644 --- a/src/libnrtype/font-glyph.h +++ b/src/libnrtype/font-glyph.h @@ -12,7 +12,6 @@ struct font_glyph { double bbox[4]; // bbox of the path (and the artbpath), not the bbox of the glyph // as the fonts sometimes contain Path* outline; // outline as a livarot Path - void* artbpath; // outline as a artbpath, for text->curve stuff (should be unified with livarot) Geom::PathVector* pathvector; // outline as 2geom pathvector, for text->curve stuff (should be unified with livarot) }; diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h index 9fb33e470..e204f5df1 100644 --- a/src/libnrtype/font-instance.h +++ b/src/libnrtype/font-instance.h @@ -70,8 +70,6 @@ public: Path* Outline(int glyph_id, Path *copyInto=NULL); // queries the outline of the glyph (in livarot Path form), and copies it into copyInto instead // of allocating a new Path if copyInto != NULL - void* ArtBPath(int glyph_id); - // returns the artbpath for this glyph. no refcounting needed, it's deallocated when the font_instance dies Geom::PathVector* PathVector(int glyph_id); // returns the 2geom-type pathvector for this glyph. no refcounting needed, it's deallocated when the font_instance dies double Advance(int glyph_id, bool vertical); |