diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-01 14:24:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | fcdf143e519778bba1a852fd75b65122ba748f1c (patch) | |
| tree | 53f4105423e4590bbaa16d368bb8a3b057e7d99f /vcl | |
| parent | 4442d226438c1f558021b2df9fe6e540e72cbc7e (diff) | |
convert FontHinting to scoped enum
Change-Id: I13ce9e6d50e8d4e087c936bd86e8e96997f020cd
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/fc_fontoptions.hxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx index d085e260366b..2f1594a24be7 100644 --- a/vcl/inc/unx/fc_fontoptions.hxx +++ b/vcl/inc/unx/fc_fontoptions.hxx @@ -41,7 +41,7 @@ public: meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), meAntiAlias(ANTIALIAS_DONTKNOW), meAutoHint(AUTOHINT_DONTKNOW), - meHinting(HINTING_DONTKNOW), + meHinting(FontHinting::DontKnow), meHintStyle(FontHintStyle::Slight), mpPattern(pPattern) {} ~FontConfigFontOptions(); @@ -50,7 +50,7 @@ public: FontHintStyle GetHintStyle() const { return meHintStyle; } bool DontUseEmbeddedBitmaps() const { return meEmbeddedBitmap == EMBEDDEDBITMAP_FALSE; } bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; } - bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == FontHintStyle::NONE); } + bool DontUseHinting() const { return (meHinting == FontHinting::No) || (GetHintStyle() == FontHintStyle::NONE); } void* GetPattern(void * /*pFace*/, bool /*bEmbolden*/) const; private: FcPattern* mpPattern; diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 887c3ed80216..5f6da53ba448 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -1212,7 +1212,7 @@ FontConfigFontOptions* PrintFontManager::getFontOptions( if( eAutoHint == FcResultMatch ) pOptions->meAutoHint = autohint ? AUTOHINT_TRUE : AUTOHINT_FALSE; if( eHinting == FcResultMatch ) - pOptions->meHinting = hinting ? HINTING_TRUE : HINTING_FALSE; + pOptions->meHinting = hinting ? FontHinting::Yes : FontHinting::No; switch (hintstyle) { case FC_HINT_NONE: pOptions->meHintStyle = FontHintStyle::NONE; break; |