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

Fix return value of `FT_Set_Named_Instance' (#56186). 

* src/truetype/ttgxvar.c (TT_Set_Named_Instance): Correctly handle
internal return value -1 of `TT_Set_Var_Design'.
This commit is contained in:
Werner Lemberg 2019-04-22 07:41:35 +02:00
parent d74106e233
commit af400438b7
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2019-04-22 Werner Lemberg <wl@gnu.org>
Fix return value of `FT_Set_Named_Instance' (#56186).
* src/truetype/ttgxvar.c (TT_Set_Named_Instance): Correctly handle
internal return value -1 of `TT_Set_Var_Design'.
2019-04-18 Werner Lemberg <wl@gnu.org> 2019-04-18 Werner Lemberg <wl@gnu.org>
[pcf] Fix handling of undefined glyph (#56067). [pcf] Fix handling of undefined glyph (#56067).

4
docs/CHANGES
View File

@ -15,6 +15,10 @@ CHANGES BETWEEN 2.10.0 and 2.10.1
in version 2.10.0 was partially broken, causing premature abortion in version 2.10.0 was partially broken, causing premature abortion
of charmap iteration for many fonts. of charmap iteration for many fonts.
- If `FT_Set_Named_Instance' was called with the same arguments
twice in a row, the function returned an incorrect error code the
second time.
====================================================================== ======================================================================

5
src/truetype/ttgxvar.c
View File

@ -3080,7 +3080,12 @@
mmvar->num_axis, mmvar->num_axis,
named_style->coords ); named_style->coords );
if ( error ) if ( error )
{
/* internal error code -1 means `no change' */
if ( error == -1 )
error = FT_Err_Ok;
goto Exit; goto Exit;
}
} }
else else
error = TT_Set_Var_Design( face, 0, NULL ); error = TT_Set_Var_Design( face, 0, NULL );