AuroraMiddleware/freetype
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Savannah bug #43682] Adjust some renderer callbacks.

Browse Source 
* src/raster/ftraster.c (ft_black_set_mode): Change return type to
`int' to stay in sync with `FT_Renderer_SetModeFunc' prototype.

* src/smooth/ftgrays.c (gray_raster_set_mode): New dummy function
for orthogonality.
(ft_grays_raster): Use it.
This commit is contained in:
Werner Lemberg 2014-11-25 09:01:07 +01:00
parent 6689a009ce
commit 3e86711ebf
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2014-11-24 Werner Lemberg <wl@gnu.org>
[Savannah bug #43682] Adjust some renderer callbacks.
* src/raster/ftraster.c (ft_black_set_mode): Change return type to
`int' to stay in sync with `FT_Renderer_SetModeFunc' prototype.
* src/smooth/ftgrays.c (gray_raster_set_mode): New dummy function
for orthogonality.
(ft_grays_raster): Use it.
2014-11-24 Werner Lemberg <wl@gnu.org>
[Savannah bug #43682] Properly handle missing return errors.

4
src/raster/ftraster.c
View File

@ -3542,7 +3542,7 @@
}
static void
static int
ft_black_set_mode( black_PRaster raster,
unsigned long mode,
const char* palette )
@ -3566,6 +3566,8 @@
FT_UNUSED( palette );
#endif
return 0;
}

16
src/smooth/ftgrays.c
View File

@ -2097,12 +2097,26 @@ typedef ptrdiff_t FT_PtrDist;
}
static int
gray_raster_set_mode( FT_Raster raster,
unsigned long mode,
void* args )
{
FT_UNUSED( raster );
FT_UNUSED( mode );
FT_UNUSED( args );
return 0; /* nothing to do */
}
FT_DEFINE_RASTER_FUNCS(ft_grays_raster,
FT_GLYPH_FORMAT_OUTLINE,
(FT_Raster_New_Func) gray_raster_new,
(FT_Raster_Reset_Func) gray_raster_reset,
(FT_Raster_Set_Mode_Func)0,
(FT_Raster_Set_Mode_Func)gray_raster_set_mode,
(FT_Raster_Render_Func) gray_raster_render,
(FT_Raster_Done_Func) gray_raster_done
)