diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2014-01-18 01:20:10 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2014-01-18 01:20:10 +0200 |
| commit | 718329232eac6bd2c1e5f46f9c49dbec289c2b86 (patch) | |
| tree | f86f1f192705296c70fd94fa1a9df12fb5b543ba /vcl/generic | |
| parent | ee8a36a9678cad3f99a7df96ce59077d237a195f (diff) | |
This is an int, not float
Change-Id: Ie3fbda69c5747f4ca42d84c272356ba9f435194e
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 cb2d52107f10..7f4266abdafb 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -326,7 +326,7 @@ class HbLayoutEngine : public ServerFontLayoutEngine private: hb_script_t maHbScript; hb_face_t* mpHbFace; - int mfUnitsPerEM; + int mnUnitsPerEM; public: HbLayoutEngine(ServerFont&); @@ -338,14 +338,14 @@ public: HbLayoutEngine::HbLayoutEngine(ServerFont& rServerFont) : maHbScript(HB_SCRIPT_INVALID), mpHbFace(NULL), - mfUnitsPerEM(0) + mnUnitsPerEM(0) { FT_Face aFtFace = rServerFont.GetFtFace(); - mfUnitsPerEM = rServerFont.GetEmUnits(); + mnUnitsPerEM = rServerFont.GetEmUnits(); mpHbFace = hb_face_create_for_tables(getFontTable, &rServerFont, NULL); hb_face_set_index(mpHbFace, aFtFace->face_index); - hb_face_set_upem(mpHbFace, mfUnitsPerEM); + hb_face_set_upem(mpHbFace, mnUnitsPerEM); } HbLayoutEngine::~HbLayoutEngine() @@ -380,8 +380,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) mfUnitsPerEM) >> 16, - ((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) mfUnitsPerEM) >> 16); + ((uint64_t) aFtFace->size->metrics.x_scale * (uint64_t) mnUnitsPerEM) >> 16, + ((uint64_t) aFtFace->size->metrics.y_scale * (uint64_t) mnUnitsPerEM) >> 16); hb_font_set_ppem(pHbFont, aFtFace->size->metrics.x_ppem, aFtFace->size->metrics.y_ppem); // allocate temporary arrays, note: round to even |