summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2016-03-29 09:19:22 +0200
committerWerner Lemberg <wl@gnu.org>2016-03-29 09:19:22 +0200
commitff82747e6d42faa3b11b6acec8976a2542e5eff8 (patch)
tree83c0b5b1e73955b0d878476dea66d3d01938e26b
parent351fc4b4a4e6ac8036df7248ab6c24129ca13269 (diff)
downloadfreetype2-ff82747e6d42faa3b11b6acec8976a2542e5eff8.tar.gz
* src/base/ftadvance.c (FT_Get_Advances): Fix invalid left shift.
-rw-r--r--ChangeLog4
-rw-r--r--src/base/ftadvanc.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24735469d..4794fdee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2016-03-29 Werner Lemberg <wl@gnu.org>
+ * src/base/ftadvance.c (FT_Get_Advances): Fix invalid left shift.
+
+2016-03-29 Werner Lemberg <wl@gnu.org>
+
[pfr] Fix binary search (#47514).
* src/pfr/pfrsbit.c (pfr_lookup_bitmap_data): Handle border
diff --git a/src/base/ftadvanc.c b/src/base/ftadvanc.c
index 2bfbe8a23..9e2ab8984 100644
--- a/src/base/ftadvanc.c
+++ b/src/base/ftadvanc.c
@@ -159,8 +159,8 @@
/* scale from 26.6 to 16.16 */
padvances[nn] = ( flags & FT_LOAD_VERTICAL_LAYOUT )
- ? face->glyph->advance.y << 10
- : face->glyph->advance.x << 10;
+ ? face->glyph->advance.y * 1024
+ : face->glyph->advance.x * 1024;
}
return error;