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

[smooth] Signature fixes.

This commit is contained in:
Werner Lemberg 2023-05-07 20:37:38 +02:00
parent 669b7f7d6b
commit 02283a6e99
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/smooth/ftgrays.c
View File

@ -1427,8 +1427,10 @@ typedef ptrdiff_t FT_PtrDist;
static int
gray_move_to( const FT_Vector* to,
gray_PWorker worker )
void* worker_ ) /* gray_PWorker */
{
gray_PWorker worker = (gray_PWorker)worker_;
TPos x, y;
@ -1446,8 +1448,11 @@ typedef ptrdiff_t FT_PtrDist;
static int
gray_line_to( const FT_Vector* to,
gray_PWorker worker )
void* worker_ ) /* gray_PWorker */
{
gray_PWorker worker = (gray_PWorker)worker_;
gray_render_line( RAS_VAR_ UPSCALE( to->x ), UPSCALE( to->y ) );
return 0;
}
@ -1456,8 +1461,11 @@ typedef ptrdiff_t FT_PtrDist;
static int
gray_conic_to( const FT_Vector* control,
const FT_Vector* to,
gray_PWorker worker )
void* worker_ ) /* gray_PWorker */
{
gray_PWorker worker = (gray_PWorker)worker_;
gray_render_conic( RAS_VAR_ control, to );
return 0;
}
@ -1467,8 +1475,11 @@ typedef ptrdiff_t FT_PtrDist;
gray_cubic_to( const FT_Vector* control1,
const FT_Vector* control2,
const FT_Vector* to,
gray_PWorker worker )
void* worker_ ) /* gray_PWorker */
{
gray_PWorker worker = (gray_PWorker)worker_;
gray_render_cubic( RAS_VAR_ control1, control2, to );
return 0;
}
@ -2155,9 +2166,12 @@ typedef ptrdiff_t FT_PtrDist;
#else /* !STANDALONE_ */
static int
gray_raster_new( FT_Memory memory,
gray_PRaster* araster )
gray_raster_new( void* memory_,
FT_Raster* araster_ )
{
FT_Memory memory = (FT_Memory)memory_;
gray_PRaster* araster = (gray_PRaster*)araster_;
FT_Error error;
gray_PRaster raster = NULL;

22
src/smooth/ftsmooth.c
View File

@ -87,8 +87,10 @@
/* initialize renderer -- init its raster */
static FT_Error
ft_smooth_init( FT_Renderer render )
ft_smooth_init( FT_Module module ) /* FT_Renderer */
{
FT_Renderer render = (FT_Renderer)module;
FT_Vector* sub = render->root.library->lcd_geometry;
@ -111,8 +113,10 @@
ft_smooth_lcd_spans( int y,
int count,
const FT_Span* spans,
TOrigin* target )
void* target_ ) /* TOrigin* */
{
TOrigin* target = (TOrigin*)target_;
unsigned char* dst_line = target->origin - y * target->pitch;
unsigned char* dst;
unsigned short w;
@ -141,7 +145,7 @@
/* Set up direct rendering to record them on each third byte. */
params.source = outline;
params.flags = FT_RASTER_FLAG_AA | FT_RASTER_FLAG_DIRECT;
params.gray_spans = (FT_SpanFunc)ft_smooth_lcd_spans;
params.gray_spans = ft_smooth_lcd_spans;
params.user = ⌖
params.clip_box.xMin = 0;
@ -256,8 +260,11 @@
/* initialize renderer -- init its raster */
static FT_Error
ft_smooth_init( FT_Renderer render )
ft_smooth_init( FT_Module module ) /* FT_Renderer */
{
FT_Renderer render = (FT_Renderer)module;
/* set up default LCD filtering */
FT_Library_SetLcdFilter( render->root.library, FT_LCD_FILTER_DEFAULT );
@ -340,8 +347,11 @@
ft_smooth_overlap_spans( int y,
int count,
const FT_Span* spans,
TOrigin* target )
void* target_ )
{
TOrigin* target = (TOrigin*)target_;
unsigned char* dst = target->origin - ( y / SCALE ) * target->pitch;
unsigned short x;
unsigned int cover, sum;
@ -386,7 +396,7 @@
/* Set up direct rendering to average oversampled spans. */
params.source = outline;
params.flags = FT_RASTER_FLAG_AA | FT_RASTER_FLAG_DIRECT;
params.gray_spans = (FT_SpanFunc)ft_smooth_overlap_spans;
params.gray_spans = ft_smooth_overlap_spans;
params.user = ⌖
params.clip_box.xMin = 0;