diff options
| author | Werner Lemberg <wl@gnu.org> | 2018-07-20 06:44:13 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2018-07-20 06:44:13 +0200 |
| commit | 14032290bf9f22afe4cb1cbbc8cfa2ee85a44aee (patch) | |
| tree | 558dac1bd55a13d62e5d2a217e23743682c9aaa4 | |
| parent | 8f09eb5ce0260aa17f93b2ccefb4bae347ca79fc (diff) | |
| download | freetype2-14032290bf9f22afe4cb1cbbc8cfa2ee85a44aee.tar.gz | |
[cff] Avoid left-shift of negative numbers (#54322).
* src/cff/cffgload.c (cff_slot_load): Use multiplication.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/cff/cffgload.c | 16 |
2 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2018-07-20 Werner Lemberg <wl@gnu.org> + + [cff] Avoid left-shift of negative numbers (#54322). + + * src/cff/cffgload.c (cff_slot_load): Use multiplication. + 2018-07-17 Werner Lemberg <wl@gnu.org> Allow FT_ENCODING_NONE for `FT_Select_Charmap'. diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 852515de6..88f56890c 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -280,16 +280,16 @@ glyph->root.outline.n_points = 0; glyph->root.outline.n_contours = 0; - glyph->root.metrics.width = (FT_Pos)metrics.width << 6; - glyph->root.metrics.height = (FT_Pos)metrics.height << 6; + glyph->root.metrics.width = (FT_Pos)metrics.width * 64; + glyph->root.metrics.height = (FT_Pos)metrics.height * 64; - glyph->root.metrics.horiBearingX = (FT_Pos)metrics.horiBearingX << 6; - glyph->root.metrics.horiBearingY = (FT_Pos)metrics.horiBearingY << 6; - glyph->root.metrics.horiAdvance = (FT_Pos)metrics.horiAdvance << 6; + glyph->root.metrics.horiBearingX = (FT_Pos)metrics.horiBearingX * 64; + glyph->root.metrics.horiBearingY = (FT_Pos)metrics.horiBearingY * 64; + glyph->root.metrics.horiAdvance = (FT_Pos)metrics.horiAdvance * 64; - glyph->root.metrics.vertBearingX = (FT_Pos)metrics.vertBearingX << 6; - glyph->root.metrics.vertBearingY = (FT_Pos)metrics.vertBearingY << 6; - glyph->root.metrics.vertAdvance = (FT_Pos)metrics.vertAdvance << 6; + glyph->root.metrics.vertBearingX = (FT_Pos)metrics.vertBearingX * 64; + glyph->root.metrics.vertBearingY = (FT_Pos)metrics.vertBearingY * 64; + glyph->root.metrics.vertAdvance = (FT_Pos)metrics.vertAdvance * 64; glyph->root.format = FT_GLYPH_FORMAT_BITMAP; |