minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[sfnt] Fix check for default named instance. 

* src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four
bytes, not two...
This commit is contained in:
Werner Lemberg 2017-03-23 18:37:06 +01:00
parent 67ff7664e4
commit 913f436d12
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2017-03-23 Werner Lemberg <wl@gnu.org>
[sfnt] Fix check for default named instance.
* src/sfnt/sfobjs.c (sfnt_init_face): A `fixed' number needs four
bytes, not two...
2017-03-23 Werner Lemberg <wl@gnu.org>
Make MM fonts work (again).

12
src/sfnt/sfobjs.c
View File

@ -1013,8 +1013,8 @@
*/
if ( ( face->variation_support & TT_FACE_FLAG_VAR_FVAR ) &&
!( FT_ALLOC( default_values, num_axes * 2 ) ||
FT_ALLOC( instance_values, num_axes * 2 ) ) )
!( FT_ALLOC( default_values, num_axes * 4 ) ||
FT_ALLOC( instance_values, num_axes * 4 ) ) )
{
/* the current stream position is 16 bytes after the table start */
FT_ULong array_start = FT_STREAM_POS() - 16 + offset;
@ -1029,10 +1029,10 @@
for ( i = 0; i < num_axes; i++ )
{
(void)FT_STREAM_READ_AT( default_value_offset, p, 2 );
(void)FT_STREAM_READ_AT( default_value_offset, p, 4 );
default_value_offset += axis_size;
p += 2;
p += 4;
}
instance_offset = array_start + axis_size * num_axes + 4;
@ -1041,9 +1041,9 @@
{
(void)FT_STREAM_READ_AT( instance_offset,
instance_values,
num_axes * 2 );
num_axes * 4 );
if ( !ft_memcmp( default_values, instance_values, num_axes * 2 ) )
if ( !ft_memcmp( default_values, instance_values, num_axes * 4 ) )
break;
instance_offset += instance_size;