diff options
| author | hellozee <hellozee@disroot.org> | 2018-03-06 12:22:22 +0000 |
|---|---|---|
| committer | hellozee <hellozee@disroot.org> | 2018-03-06 12:22:22 +0000 |
| commit | a65c02c515528168aec0c5a092078117de02b0a9 (patch) | |
| tree | c80b1ead2a302de453ab901af79b4740947122f1 /src/libnrtype | |
| parent | Fix for Bug #1643260, Step size changed to 0.1% for Blur and Opacity Spin But... (diff) | |
| parent | Remove unused includes, etc. (diff) | |
| download | inkscape-a65c02c515528168aec0c5a092078117de02b0a9.tar.gz inkscape-a65c02c515528168aec0c5a092078117de02b0a9.zip | |
Merge remote-tracking branch 'remote/master'
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 4 | ||||
| -rw-r--r-- | src/libnrtype/font-style.h | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp index 57aa22d48..e93c7481c 100644 --- a/src/libnrtype/FontInstance.cpp +++ b/src/libnrtype/FontInstance.cpp @@ -27,7 +27,6 @@ #include <2geom/path-sink.h> #include "libnrtype/font-glyph.h" #include "libnrtype/font-instance.h" -#include "livarot/Path.h" #include "util/unordered-containers.h" @@ -121,8 +120,7 @@ typedef FT_Vector const FREETYPE_VECTOR; typedef FT_Vector FREETYPE_VECTOR; #endif -// outline as returned by freetype -> livarot Path -// see nr-type-ft2.cpp for the freetype -> artBPath on which this code is based +// outline as returned by freetype static int ft2_move_to(FREETYPE_VECTOR *to, void * i_user) { FT2GeomData *user = (FT2GeomData*)i_user; diff --git a/src/libnrtype/font-style.h b/src/libnrtype/font-style.h index 810fc72cf..1ed82e89c 100644 --- a/src/libnrtype/font-style.h +++ b/src/libnrtype/font-style.h @@ -6,9 +6,6 @@ // structure that holds data describing how to render glyphs of a font -class Path; -class Shape; - // Different raster styles. struct font_style { Geom::Affine transform; // the ctm. contains the font-size @@ -21,8 +18,6 @@ struct font_style { int nbDash; double dash_offset; double* dashes; - - void Apply(Path *src, Shape *dst); // utility: applies the style to the path and stores the result in the shape }; |