summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:36 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:36 +0900
commitc156c52cd973c969b706b7421e4b19bdff3a9374 (patch)
treeefecc225abce0c0b84a8a99dbe6336cbc25d0aa9
parentc7a2e69ed8d8ad6f90d94b94c6588ff52c009204 (diff)
downloadfreetype2-c156c52cd973c969b706b7421e4b19bdff3a9374.tar.gz
truetype: Extend TrueType GX packed deltas to FT_Offset.
-rw-r--r--ChangeLog9
-rw-r--r--src/truetype/ttgxvar.c6
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a9afe67d5..37090a853 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ truetype: Extend TrueType GX packed deltas to FT_Offset.
+
+ * src/truetype/ttgxvar.c (ft_var_readpackeddeltas):
+ The type of 2nd argument `delta_cnt' is changed from
+ FT_Int to FT_Offset, because its source can be cvt
+ table size calculated from stream position.
+
+2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
truetype: Extend mmvar_len to hold size_t values.
* src/truetype/ttgxvar.h: The type of
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 2055e7d15..1456a8cc0 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -211,12 +211,12 @@
/* */
static FT_Short*
ft_var_readpackeddeltas( FT_Stream stream,
- FT_Int delta_cnt )
+ FT_Offset delta_cnt )
{
FT_Short *deltas;
FT_Int runcnt;
- FT_Int i;
- FT_Int j;
+ FT_Offset i;
+ FT_Offset j;
FT_Memory memory = stream->memory;
FT_Error error = TT_Err_Ok;