diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-01 14:30:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | 8c5d90adaf1813c8f3a65487044b8fbe80f8bc85 (patch) | |
| tree | 3745bb752cb38d61e2818f351c55770a74a19afd /vcl | |
| parent | fcdf143e519778bba1a852fd75b65122ba748f1c (diff) | |
convert FontAutoHint to scoped enum
Change-Id: Ie60f2e94e178ab7ed292b20da88fb5958662a041
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/fc_fontoptions.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx index 2f1594a24be7..e5dc49161bc5 100644 --- a/vcl/inc/unx/fc_fontoptions.hxx +++ b/vcl/inc/unx/fc_fontoptions.hxx @@ -40,7 +40,7 @@ public: FontConfigFontOptions(FcPattern* pPattern) : meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), meAntiAlias(ANTIALIAS_DONTKNOW), - meAutoHint(AUTOHINT_DONTKNOW), + meAutoHint(FontAutoHint::DontKnow), meHinting(FontHinting::DontKnow), meHintStyle(FontHintStyle::Slight), mpPattern(pPattern) {} diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 5f6da53ba448..3f0571e474b7 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -1210,7 +1210,7 @@ FontConfigFontOptions* PrintFontManager::getFontOptions( if( eAntialias == FcResultMatch ) pOptions->meAntiAlias = antialias ? ANTIALIAS_TRUE : ANTIALIAS_FALSE; if( eAutoHint == FcResultMatch ) - pOptions->meAutoHint = autohint ? AUTOHINT_TRUE : AUTOHINT_FALSE; + pOptions->meAutoHint = autohint ? FontAutoHint::Yes : FontAutoHint::No; if( eHinting == FcResultMatch ) pOptions->meHinting = hinting ? FontHinting::Yes : FontHinting::No; switch (hintstyle) diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 1ad75c4c3fbb..c7c59bb681d7 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -545,10 +545,10 @@ void ServerFont::SetFontOptions(const std::shared_ptr<FontConfigFontOptions>& xF return; FontAutoHint eHint = mxFontOptions->GetUseAutoHint(); - if( eHint == AUTOHINT_DONTKNOW ) - eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE; + if( eHint == FontAutoHint::DontKnow ) + eHint = mbUseGamma ? FontAutoHint::Yes : FontAutoHint::No; - if( eHint == AUTOHINT_TRUE ) + if( eHint == FontAutoHint::Yes ) mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT; if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only |