diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-19 02:26:40 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-19 02:26:40 +0000 |
| commit | 5c8a7b8df6203791610487d2435646f86a0eed96 (patch) | |
| tree | 3bf6c7a52f27978f84b267482bb69389051c4085 /src/sp-object-repr.cpp | |
| parent | changes_2013_03_18c.patch (diff) | |
| parent | Drop remaining unused functions (diff) | |
| download | inkscape-5c8a7b8df6203791610487d2435646f86a0eed96.tar.gz inkscape-5c8a7b8df6203791610487d2435646f86a0eed96.zip | |
merge from trunk (r12224)
(bzr r11668.1.60)
Diffstat (limited to 'src/sp-object-repr.cpp')
| -rw-r--r-- | src/sp-object-repr.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/sp-object-repr.cpp b/src/sp-object-repr.cpp index cd332cd34..eba38ec67 100644 --- a/src/sp-object-repr.cpp +++ b/src/sp-object-repr.cpp @@ -48,13 +48,11 @@ #include "sp-script.h" #include "config.h" -#ifdef ENABLE_SVG_FONTS - #include "sp-font.h" - #include "sp-font-face.h" - #include "sp-glyph.h" - #include "sp-missing-glyph.h" - #include "sp-glyph-kerning.h" -#endif +#include "sp-font.h" +#include "sp-font-face.h" +#include "sp-glyph.h" +#include "sp-missing-glyph.h" +#include "sp-glyph-kerning.h" #include "sp-style-elem.h" #include "sp-switch.h" @@ -151,14 +149,12 @@ populate_dtables() { "svg:flowRegionExclude", SP_TYPE_FLOWREGIONEXCLUDE }, { "svg:flowRoot", SP_TYPE_FLOWTEXT }, { "svg:flowSpan", SP_TYPE_FLOWTSPAN }, -#ifdef ENABLE_SVG_FONTS { "svg:font", SP_TYPE_FONT }, { "svg:font-face", SP_TYPE_FONTFACE }, { "svg:glyph", SP_TYPE_GLYPH }, { "svg:missing-glyph", SP_TYPE_MISSING_GLYPH }, { "svg:hkern", SP_TYPE_HKERN }, { "svg:vkern", SP_TYPE_VKERN }, -#endif { "svg:g", SP_TYPE_GROUP }, { "svg:feBlend", SP_TYPE_FEBLEND }, { "svg:feColorMatrix", SP_TYPE_FECOLORMATRIX }, |