diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-23 16:01:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-23 20:36:30 +0000 |
| commit | 4129da25f71f9082c54a3e53dd96927c2bbbe45e (patch) | |
| tree | 2b9bed51d9f3eb0dce8bb2a7e37e4ab4ccc2c502 /vcl/unx/generic/gdi/cairotextrender.cxx | |
| parent | This code is only ever compiled on Unix (diff) | |
| download | core-4129da25f71f9082c54a3e53dd96927c2bbbe45e.tar.gz core-4129da25f71f9082c54a3e53dd96927c2bbbe45e.zip | |
reorg a bit and ensure FontConfigFontOptions is always available
Change-Id: Ie671be765ea1d188480a399ae201081a774cb0c0
Diffstat (limited to 'vcl/unx/generic/gdi/cairotextrender.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index cce03121916b..9bbfaa72c9ac 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -64,7 +64,7 @@ public: struct CacheId { FT_Face maFace; - const void *mpOptions; + const FontConfigFontOptions *mpOptions; bool mbEmbolden; bool mbVerticalMetrics; bool operator ==(const CacheId& rOther) const @@ -288,8 +288,8 @@ void CairoTextRender::DrawServerFontLayout( const GenericSalLayout& rLayout, con cairo_font_face_t* font_face = static_cast<cairo_font_face_t*>(CairoFontsCache::FindCachedFont(aId)); if (!font_face) { - const FontConfigFontOptions *pOptions = rFont.GetFontOptions().get(); - FcPattern *pPattern = pOptions->GetPattern(rFont.GetFontFileName(), rFont.GetFontFaceIndex(), aId.mbEmbolden); + const FontConfigFontOptions *pOptions = aId.mpOptions; + FcPattern *pPattern = pOptions->GetPattern(); font_face = cairo_ft_font_face_create_for_pattern(pPattern); CairoFontsCache::CacheFont(font_face, aId); } |