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

[pshinter] Signature fixes. 

* src/pshinter/pshrec.c (t1_hints_close, t1_hints_apply): New wrapper
functions.
(t1_hints_funcs_init): Use them.
(t2_hints_close, t2_hints_apply): New wrapper functions.
(t2_hints_funcs_init): Use them.
This commit is contained in:
Werner Lemberg 2023-05-07 20:26:12 +02:00
parent 274e0dd5b5
commit 669b7f7d6b
2 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pshinter/pshmod.c
View File

@ -37,8 +37,11 @@
/* finalize module */
FT_CALLBACK_DEF( void )
ps_hinter_done( PS_Hinter_Module module )
ps_hinter_done( FT_Module module_ ) /* PS_Hinter_Module */
{
PS_Hinter_Module module = (PS_Hinter_Module)module_;
module->t1_funcs.hints = NULL;
module->t2_funcs.hints = NULL;
@ -48,8 +51,10 @@
/* initialize module, create hints recorder and the interface */
FT_CALLBACK_DEF( FT_Error )
ps_hinter_init( PS_Hinter_Module module )
ps_hinter_init( FT_Module module_ ) /* PS_Hinter_Module */
{
PS_Hinter_Module module = (PS_Hinter_Module)module_;
FT_Memory memory = module->root.memory;
void* ph = &module->ps_hints;

63
src/pshinter/pshrec.c
View File

@ -851,10 +851,11 @@
/* add one Type1 counter stem to the current hints table */
static void
ps_hints_t1stem3( PS_Hints hints,
ps_hints_t1stem3( T1_Hints hints_, /* PS_Hints */
FT_UInt dimension,
FT_Fixed* stems )
{
PS_Hints hints = (PS_Hints)hints_;
FT_Error error = FT_Err_Ok;
@ -914,9 +915,10 @@
/* reset hints (only with Type 1 hints) */
static void
ps_hints_t1reset( PS_Hints hints,
ps_hints_t1reset( T1_Hints hints_, /* PS_Hints */
FT_UInt end_point )
{
PS_Hints hints = (PS_Hints)hints_;
FT_Error error = FT_Err_Ok;
@ -953,11 +955,12 @@
/* Type2 "hintmask" operator, add a new hintmask to each direction */
static void
ps_hints_t2mask( PS_Hints hints,
ps_hints_t2mask( T2_Hints hints_, /* PS_Hints */
FT_UInt end_point,
FT_UInt bit_count,
const FT_Byte* bytes )
{
PS_Hints hints = (PS_Hints)hints_;
FT_Error error;
@ -999,10 +1002,11 @@
static void
ps_hints_t2counter( PS_Hints hints,
ps_hints_t2counter( T2_Hints hints_, /* PS_Hints */
FT_UInt bit_count,
const FT_Byte* bytes )
{
PS_Hints hints = (PS_Hints)hints_;
FT_Error error;
@ -1087,6 +1091,13 @@
ps_hints_open( (PS_Hints)hints, PS_HINT_TYPE_1 );
}
static FT_Error
t1_hints_close( T1_Hints hints,
FT_UInt end_point )
{
return ps_hints_close( (PS_Hints)hints, end_point );
}
static void
t1_hints_stem( T1_Hints hints,
FT_UInt dimension,
@ -1102,17 +1113,27 @@
}
static FT_Error
t1_hints_apply( T1_Hints hints,
FT_Outline* outline,
PSH_Globals globals,
FT_Render_Mode hint_mode )
{
return ps_hints_apply( (PS_Hints)hints, outline, globals, hint_mode );
}
FT_LOCAL_DEF( void )
t1_hints_funcs_init( T1_Hints_FuncsRec* funcs )
{
FT_ZERO( funcs );
funcs->open = (T1_Hints_OpenFunc) t1_hints_open;
funcs->close = (T1_Hints_CloseFunc) ps_hints_close;
funcs->close = (T1_Hints_CloseFunc) t1_hints_close;
funcs->stem = (T1_Hints_SetStemFunc) t1_hints_stem;
funcs->stem3 = (T1_Hints_SetStem3Func)ps_hints_t1stem3;
funcs->reset = (T1_Hints_ResetFunc) ps_hints_t1reset;
funcs->apply = (T1_Hints_ApplyFunc) ps_hints_apply;
funcs->apply = (T1_Hints_ApplyFunc) t1_hints_apply;
}
@ -1131,6 +1152,14 @@
}
static FT_Error
t2_hints_close( T2_Hints hints,
FT_UInt end_point )
{
return ps_hints_close( (PS_Hints)hints, end_point );
}
static void
t2_hints_stems( T2_Hints hints,
FT_UInt dimension,
@ -1168,17 +1197,27 @@
}
static FT_Error
t2_hints_apply( T2_Hints hints,
FT_Outline* outline,
PSH_Globals globals,
FT_Render_Mode hint_mode )
{
return ps_hints_apply( (PS_Hints)hints, outline, globals, hint_mode );
}
FT_LOCAL_DEF( void )
t2_hints_funcs_init( T2_Hints_FuncsRec* funcs )
{
FT_ZERO( funcs );
funcs->open = (T2_Hints_OpenFunc) t2_hints_open;
funcs->close = (T2_Hints_CloseFunc) ps_hints_close;
funcs->stems = (T2_Hints_StemsFunc) t2_hints_stems;
funcs->hintmask= (T2_Hints_MaskFunc) ps_hints_t2mask;
funcs->counter = (T2_Hints_CounterFunc)ps_hints_t2counter;
funcs->apply = (T2_Hints_ApplyFunc) ps_hints_apply;
funcs->open = (T2_Hints_OpenFunc) t2_hints_open;
funcs->close = (T2_Hints_CloseFunc) t2_hints_close;
funcs->stems = (T2_Hints_StemsFunc) t2_hints_stems;
funcs->hintmask = (T2_Hints_MaskFunc) ps_hints_t2mask;
funcs->counter = (T2_Hints_CounterFunc)ps_hints_t2counter;
funcs->apply = (T2_Hints_ApplyFunc) t2_hints_apply;
}