diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-10-17 17:47:08 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-10-17 17:47:08 +0000 |
| commit | f113fba09e2df478335e983f04ad09798c774fe7 (patch) | |
| tree | 1b20d687972cf713df472d7e24a192276495fd23 /src/libnrtype | |
| parent | Allow multiple shapes in 'shape-inside' and 'shape-subtract'. Work from Alex ... (diff) | |
| download | inkscape-f113fba09e2df478335e983f04ad09798c774fe7.tar.gz inkscape-f113fba09e2df478335e983f04ad09798c774fe7.zip | |
Replace deprecated call to pango_win32_get_context
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, |