vcl/generic/glyphs/gcach_layout.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 718329232eac6bd2c1e5f46f9c49dbec289c2b86 Author: Khaled Hosny <khaledho...@eglug.org> Date: Sat Jan 18 01:20:10 2014 +0200 This is an int, not float Change-Id: Ie3fbda69c5747f4ca42d84c272356ba9f435194e diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index cb2d521..7f4266a 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits