diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-03-23 17:05:17 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-03-23 17:05:17 +0000 |
| commit | af97b8698325656cea28e335a9e4a7b49b9464f5 (patch) | |
| tree | 24661149040aab21b343d46a4b460bb99410e3be /src | |
| parent | Start of reading OpenType fvar table. (diff) | |
| download | inkscape-af97b8698325656cea28e335a9e4a7b49b9464f5.tar.gz inkscape-af97b8698325656cea28e335a9e4a7b49b9464f5.zip | |
Allow building with USE_PANGO_WIN32.
Needs to be tested....
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 2 | ||||
| -rw-r--r-- | src/libnrtype/OpenTypeUtil.cpp | 6 | ||||
| -rw-r--r-- | src/libnrtype/OpenTypeUtil.h | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 3b8703321..8cccd6ff3 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -703,12 +703,14 @@ font_instance *font_factory::Face(PangoFontDescription *descr, bool canFail) } } +#ifndef USE_PANGO_WIN32 if (res) { readOpenTypeGsubTable( res->theFace, res->openTypeTables, res->openTypeSubstitutions ); std::map<Glib::ustring, OTVarAxis> axes; std::map<Glib::ustring, OTVarNamed> named; readOpenTypeFvarTable( res->theFace, axes, named ); } +#endif } else { // already here diff --git a/src/libnrtype/OpenTypeUtil.cpp b/src/libnrtype/OpenTypeUtil.cpp index 7998427d9..72541824b 100644 --- a/src/libnrtype/OpenTypeUtil.cpp +++ b/src/libnrtype/OpenTypeUtil.cpp @@ -1,6 +1,9 @@ +#ifndef USE_PANGO_WIN32 + #include "OpenTypeUtil.h" + #include <iostream> // For debugging // FreeType @@ -243,9 +246,10 @@ void readOpenTypeFvarTable(const FT_Face ft_face, } -#endif +#endif /* FREETYPE Version */ } +#endif /* !USE_PANGO_WIND32 */ /* Local Variables: diff --git a/src/libnrtype/OpenTypeUtil.h b/src/libnrtype/OpenTypeUtil.h index 424087017..d76b53e06 100644 --- a/src/libnrtype/OpenTypeUtil.h +++ b/src/libnrtype/OpenTypeUtil.h @@ -2,6 +2,8 @@ #ifndef SEEN_OPENTYPEUTIL_H #define SEEN_OPENTYPEUTIL_H +#ifndef USE_PANGO_WIN32 + #include <map> #include <ft2build.h> @@ -47,7 +49,7 @@ void readOpenTypeFvarTable (const FT_Face ft_face, std::map<Glib::ustring, OTVarAxis>& axes, std::map<Glib::ustring, OTVarNamed>& named); - +#endif /* !USE_PANGO_WIND32 */ #endif /* !SEEN_OPENTYPEUTIL_H */ /* |