diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-10-19 01:26:50 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-10-19 01:26:50 +0000 |
| commit | 4c77f246c1e4e9c275d315a4b9217267d8d5265d (patch) | |
| tree | 203d2d4d5c127c9d2677606fc162001900666aa1 /src/libnrtype | |
| parent | Improving speed (diff) | |
| parent | Replace deprecated call to pango_win32_get_context (diff) | |
| download | inkscape-4c77f246c1e4e9c275d315a4b9217267d8d5265d.tar.gz inkscape-4c77f246c1e4e9c275d315a4b9217267d8d5265d.zip | |
Merge remote-tracking branch 'origin/master' into SymbolsSearch
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index b2baeb2f0..bf4cbc56f 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -89,26 +89,20 @@ font_factory::font_factory(void) : nbEnt(0), // Note: this "ents" cache only keeps fonts from being unreffed, does not speed up access maxEnt(32), ents(static_cast<font_entry*>(g_malloc(maxEnt*sizeof(font_entry)))), - #ifdef USE_PANGO_WIN32 fontServer(pango_win32_font_map_for_display()), - fontContext(pango_win32_get_context()), pangoFontCache(pango_win32_font_map_get_font_cache(fontServer)), hScreenDC(pango_win32_get_dc()), #else fontServer(pango_ft2_font_map_new()), - fontContext(0), #endif + fontContext(pango_font_map_create_context(fontServer)), fontSize(512), loadedPtr(new FaceMapType()) { -#ifdef USE_PANGO_WIN32 -#else +#ifndef USE_PANGO_WIN32 pango_ft2_font_map_set_resolution(PANGO_FT2_FONT_MAP(fontServer), 72, 72); - - fontContext = pango_font_map_create_context(fontServer); - pango_ft2_font_map_set_default_substitute(PANGO_FT2_FONT_MAP(fontServer), FactorySubstituteFunc, this, |