summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-09-07 22:09:03 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2016-09-07 22:09:03 +0000
commit22f3e6739c985c8c8c57f362a9e50f73248ab11b (patch)
tree18563e2e7b3431d9a75464ca0ec6e3e353685112 /Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc
parent101256f3c6a52f6b155706bf20d5be12ddf0a5a9 (diff)
harfbuzz 1.3.1
git-svn-id: svn://tug.org/texlive/trunk@42013 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc
index eaa1311d445..2b06c59be38 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ft.cc
@@ -33,6 +33,8 @@
#include "hb-font-private.hh"
+#include "hb-cache-private.hh" // Maybe use in the future?
+
#include FT_ADVANCES_H
#include FT_TRUETYPE_TABLES_H
@@ -606,8 +608,8 @@ hb_ft_font_create (FT_Face ft_face,
hb_face_destroy (face);
_hb_ft_font_set_funcs (font, ft_face, false);
hb_font_set_scale (font,
- (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16),
- (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1<<15)) >> 16));
+ (int) (((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16),
+ (int) (((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM + (1u<<15)) >> 16));
#if 0 /* hb-ft works in no-hinting model */
hb_font_set_ppem (font,
ft_face->size->metrics.x_ppem,