diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-03-06 10:39:01 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-03-06 10:39:01 +0000 |
| commit | 77c4aa255792244d3b678960e485c06096f11e85 (patch) | |
| tree | 193705d57927e9f340f99449b66f853576076171 | |
| parent | Inkview: Split options code out (diff) | |
| download | inkscape-77c4aa255792244d3b678960e485c06096f11e85.tar.gz inkscape-77c4aa255792244d3b678960e485c06096f11e85.zip | |
Remove unused includes, etc.
| -rw-r--r-- | src/libnrtype/FontInstance.cpp | 4 | ||||
| -rw-r--r-- | src/libnrtype/font-style.h | 5 | ||||
| -rw-r--r-- | src/ui/tools/spray-tool.cpp | 2 |
3 files changed, 1 insertions, 10 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 }; diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp index beb556dff..603d5e80a 100644 --- a/src/ui/tools/spray-tool.cpp +++ b/src/ui/tools/spray-tool.cpp @@ -52,8 +52,6 @@ #include "helper/action.h" -#include "livarot/Shape.h" - #include "object/box3d.h" #include "object/sp-item-transform.h" |