diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2014-01-18 00:57:55 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-01-18 01:11:09 +0200 |
commit | e41b8ca51465c21e9b0cdde59fa908d908d80879 (patch) | |
tree | 657cde62207b69c7311a340e6b276ebf962ebce3 /vcl/generic | |
parent | Do proper script itemization with HarfBuzz (diff) | |
download | core-e41b8ca51465c21e9b0cdde59fa908d908d80879.tar.gz core-e41b8ca51465c21e9b0cdde59fa908d908d80879.zip |
Minor
Change-Id: Iefaa98350c8d6116aa07d4d91be29104a930b8db
Diffstat (limited to 'vcl/generic')
-rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index f450ee180025..20677ac0427d 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -328,7 +328,7 @@ class HbLayoutEngine : public ServerFontLayoutEngine private: UScriptCode meScriptCode; hb_face_t* mpHbFace; - int fUnitsPerEM; + int mfUnitsPerEM; public: HbLayoutEngine(ServerFont&); @@ -340,14 +340,14 @@ public: HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont) : meScriptCode(USCRIPT_INVALID_CODE), mpHbFace(NULL), - fUnitsPerEM(0) + mfUnitsPerEM(0) { FT_Face aFtFace = rServerFont.GetFtFace(); - fUnitsPerEM = rServerFont.GetEmUnits(); + mfUnitsPerEM = rServerFont.GetEmUnits(); mpHbFace = hb_face_create_for_tables(getFontTable, &rServerFont, NULL); hb_face_set_index(mpHbFace, aFtFace->face_index); - hb_face_set_upem(mpHbFace, fUnitsPerEM); + hb_face_set_upem(mpHbFace, mfUnitsPerEM); } HbLayoutEngine::~HbLayoutEngine() @@ -381,8 +381,8 @@ bool HbLayoutEngine::layout(ServerFontLayout& rLayout, ImplLayoutArgs& rArgs) hb_font_t *pHbFont = hb_font_create(mpHbFace); hb_font_set_funcs(pHbFont, pHbFontFuncs, &rFont, NULL); hb_font_set_scale(pHbFont, - ((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) fUnitsPerEM) >> 16, - ((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) fUnitsPerEM) >> 16); + ((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) mfUnitsPerEM) >> 16, + ((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) mfUnitsPerEM) >> 16); hb_font_set_ppem(pHbFont, aFtFace->size->metrics.x_ppem, aFtFace->size->metrics.y_ppem); // allocate temporary arrays, note: round to even |