mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[truetype, cff] Extend `get_var_blend' function of MM service.

Browse Source 
In particular, we need access to named instance data.

* include/freetype/internal/services/svmm.h (FT_Get_Var_Blend_Func):
Add argument for `FT_MM_Var'.

* src/cff/cffload.c (cff_get_var_blend): Updated.
* src/cff/cffload.h: Updated.

* src/cff/cf2ft.c (cf2_getNormalizedVector): Updated.

* src/truetype/ttgxvar.c (tt_get_var_blend): Updated.
Accept value `NULL' for arguments.
* src/truetype/ttgxvar.h: Updated.
This commit is contained in:
Werner Lemberg 2016-12-18 18:12:03 +01:00
parent 25f3ac2b9e
commit a8652c59da
7 changed files with 53 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2016-12-18 Werner Lemberg <wl@gnu.org>
[truetype, cff] Extend `get_var_blend' function of MM service.
In particular, we need access to named instance data.
* include/freetype/internal/services/svmm.h (FT_Get_Var_Blend_Func):
Add argument for `FT_MM_Var'.
* src/cff/cffload.c (cff_get_var_blend): Updated.
* src/cff/cffload.h: Updated.
* src/cff/cf2ft.c (cf2_getNormalizedVector): Updated.
* src/truetype/ttgxvar.c (tt_get_var_blend): Updated.
Accept value `NULL' for arguments.
* src/truetype/ttgxvar.h: Updated.
2016-12-18 Werner Lemberg <wl@gnu.org>
[sfnt] Handle `fvar' with zero axes as a non-MM font.

7
include/freetype/internal/services/svmm.h
View File

@ -69,9 +69,10 @@ FT_BEGIN_HEADER
FT_Long* coords );
typedef FT_Error
(*FT_Get_Var_Blend_Func)( FT_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords );
(*FT_Get_Var_Blend_Func)( FT_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords,
FT_MM_Var* *mm_var );
typedef void
(*FT_Done_Blend_Func)( FT_Face );

2
src/cff/cf2ft.c
View File

@ -450,7 +450,7 @@
FT_ASSERT( decoder && decoder->builder.face );
FT_ASSERT( vec && len );
return cff_get_var_blend( decoder->builder.face, len, vec );
return cff_get_var_blend( decoder->builder.face, len, vec, NULL );
}
#endif

9
src/cff/cffload.c
View File

@ -1548,14 +1548,15 @@
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_LOCAL_DEF( FT_Error )
cff_get_var_blend( CFF_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords )
cff_get_var_blend( CFF_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords,
FT_MM_Var* *mm_var )
{
FT_Service_MultiMasters mm = (FT_Service_MultiMasters)face->mm;
return mm->get_var_blend( FT_FACE( face ), num_coords, coords );
return mm->get_var_blend( FT_FACE( face ), num_coords, coords, mm_var );
}

7
src/cff/cffload.h
View File

@ -105,9 +105,10 @@ FT_BEGIN_HEADER
#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
FT_LOCAL( FT_Error )
cff_get_var_blend( CFF_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords );
cff_get_var_blend( CFF_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords,
FT_MM_Var* *mm_var );
FT_LOCAL( void )
cff_done_blend( CFF_Face face );

25
src/truetype/ttgxvar.c
View File

@ -2740,24 +2740,33 @@
/* tt_get_var_blend */
/* */
/* <Description> */
/* An internal version of `TT_Get_MM_Blend' that just returns */
/* An extended internal version of `TT_Get_MM_Blend' that returns */
/* pointers instead of copying data, without any initialization of */
/* the MM machinery in case it isn't loaded yet. */
/* */
FT_LOCAL_DEF( FT_Error )
tt_get_var_blend( TT_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords )
tt_get_var_blend( TT_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords,
FT_MM_Var* *mm_var )
{
if ( face->blend )
{
*num_coords = face->blend->num_axis;
*coords = face->blend->normalizedcoords;
if ( num_coords )
*num_coords = face->blend->num_axis;
if ( coords )
*coords = face->blend->normalizedcoords;
if ( mm_var )
*mm_var = face->blend->mmvar;
}
else
{
*num_coords = 0;
*coords = NULL;
if ( num_coords )
*num_coords = 0;
if ( coords )
*coords = NULL;
if ( mm_var )
*mm_var = NULL;
}
return FT_Err_Ok;

7
src/truetype/ttgxvar.h
View File

@ -260,9 +260,10 @@ FT_BEGIN_HEADER
FT_Int *adelta );
FT_LOCAL( FT_Error )
tt_get_var_blend( TT_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords );
tt_get_var_blend( TT_Face face,
FT_UInt *num_coords,
FT_Fixed* *coords,
FT_MM_Var* *mm_var );
FT_LOCAL( void )
tt_done_blend( TT_Face face );