[base] Signature fixes.
This commit is contained in:
parent
ff0ef828c9
commit
e05c056220
|
@ -82,10 +82,13 @@
|
||||||
* @Return:
|
* @Return:
|
||||||
* Always 0. Needed for the interface only.
|
* Always 0. Needed for the interface only.
|
||||||
*/
|
*/
|
||||||
static int
|
FT_CALLBACK_DEF( int )
|
||||||
BBox_Move_To( FT_Vector* to,
|
BBox_Move_To( const FT_Vector* to,
|
||||||
TBBox_Rec* user )
|
void* user_ )
|
||||||
{
|
{
|
||||||
|
TBBox_Rec* user = (TBBox_Rec*)user_;
|
||||||
|
|
||||||
|
|
||||||
FT_UPDATE_BBOX( to, user->bbox );
|
FT_UPDATE_BBOX( to, user->bbox );
|
||||||
|
|
||||||
user->last = *to;
|
user->last = *to;
|
||||||
|
@ -116,10 +119,13 @@
|
||||||
* @Return:
|
* @Return:
|
||||||
* Always 0. Needed for the interface only.
|
* Always 0. Needed for the interface only.
|
||||||
*/
|
*/
|
||||||
static int
|
FT_CALLBACK_DEF( int )
|
||||||
BBox_Line_To( FT_Vector* to,
|
BBox_Line_To( const FT_Vector* to,
|
||||||
TBBox_Rec* user )
|
void* user_ )
|
||||||
{
|
{
|
||||||
|
TBBox_Rec* user = (TBBox_Rec*)user_;
|
||||||
|
|
||||||
|
|
||||||
user->last = *to;
|
user->last = *to;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -205,11 +211,14 @@
|
||||||
* In the case of a non-monotonous arc, we compute directly the
|
* In the case of a non-monotonous arc, we compute directly the
|
||||||
* extremum coordinates, as it is sufficiently fast.
|
* extremum coordinates, as it is sufficiently fast.
|
||||||
*/
|
*/
|
||||||
static int
|
FT_CALLBACK_DEF( int )
|
||||||
BBox_Conic_To( FT_Vector* control,
|
BBox_Conic_To( const FT_Vector* control,
|
||||||
FT_Vector* to,
|
const FT_Vector* to,
|
||||||
TBBox_Rec* user )
|
void* user_ )
|
||||||
{
|
{
|
||||||
|
TBBox_Rec* user = (TBBox_Rec*)user_;
|
||||||
|
|
||||||
|
|
||||||
/* in case `to' is implicit and not included in bbox yet */
|
/* in case `to' is implicit and not included in bbox yet */
|
||||||
FT_UPDATE_BBOX( to, user->bbox );
|
FT_UPDATE_BBOX( to, user->bbox );
|
||||||
|
|
||||||
|
@ -410,12 +419,15 @@
|
||||||
* In the case of a non-monotonous arc, we don't compute directly
|
* In the case of a non-monotonous arc, we don't compute directly
|
||||||
* extremum coordinates, we subdivide instead.
|
* extremum coordinates, we subdivide instead.
|
||||||
*/
|
*/
|
||||||
static int
|
FT_CALLBACK_DEF( int )
|
||||||
BBox_Cubic_To( FT_Vector* control1,
|
BBox_Cubic_To( const FT_Vector* control1,
|
||||||
FT_Vector* control2,
|
const FT_Vector* control2,
|
||||||
FT_Vector* to,
|
const FT_Vector* to,
|
||||||
TBBox_Rec* user )
|
void* user_ )
|
||||||
{
|
{
|
||||||
|
TBBox_Rec* user = (TBBox_Rec*)user_;
|
||||||
|
|
||||||
|
|
||||||
/* We don't need to check `to' since it is always an on-point, */
|
/* We don't need to check `to' since it is always an on-point, */
|
||||||
/* thus within the bbox. Only segments with an off-point outside */
|
/* thus within the bbox. Only segments with an off-point outside */
|
||||||
/* the bbox can possibly reach new extreme values. */
|
/* the bbox can possibly reach new extreme values. */
|
||||||
|
|
|
@ -1245,9 +1245,13 @@
|
||||||
/* destructor for sizes list */
|
/* destructor for sizes list */
|
||||||
static void
|
static void
|
||||||
destroy_size( FT_Memory memory,
|
destroy_size( FT_Memory memory,
|
||||||
FT_Size size,
|
void* size_,
|
||||||
FT_Driver driver )
|
void* driver_ )
|
||||||
{
|
{
|
||||||
|
FT_Size size = (FT_Size)size_;
|
||||||
|
FT_Driver driver = (FT_Driver)driver_;
|
||||||
|
|
||||||
|
|
||||||
/* finalize client-specific data */
|
/* finalize client-specific data */
|
||||||
if ( size->generic.finalizer )
|
if ( size->generic.finalizer )
|
||||||
size->generic.finalizer( size );
|
size->generic.finalizer( size );
|
||||||
|
@ -1293,10 +1297,12 @@
|
||||||
/* destructor for faces list */
|
/* destructor for faces list */
|
||||||
static void
|
static void
|
||||||
destroy_face( FT_Memory memory,
|
destroy_face( FT_Memory memory,
|
||||||
FT_Face face,
|
void* face_,
|
||||||
FT_Driver driver )
|
void* driver_ )
|
||||||
{
|
{
|
||||||
FT_Driver_Class clazz = driver->clazz;
|
FT_Face face = (FT_Face)face_;
|
||||||
|
FT_Driver driver = (FT_Driver)driver_;
|
||||||
|
FT_Driver_Class clazz = driver->clazz;
|
||||||
|
|
||||||
|
|
||||||
/* discard auto-hinting data */
|
/* discard auto-hinting data */
|
||||||
|
@ -1310,7 +1316,7 @@
|
||||||
|
|
||||||
/* discard all sizes for this face */
|
/* discard all sizes for this face */
|
||||||
FT_List_Finalize( &face->sizes_list,
|
FT_List_Finalize( &face->sizes_list,
|
||||||
(FT_List_Destructor)destroy_size,
|
destroy_size,
|
||||||
memory,
|
memory,
|
||||||
driver );
|
driver );
|
||||||
face->size = NULL;
|
face->size = NULL;
|
||||||
|
@ -1346,7 +1352,7 @@
|
||||||
Destroy_Driver( FT_Driver driver )
|
Destroy_Driver( FT_Driver driver )
|
||||||
{
|
{
|
||||||
FT_List_Finalize( &driver->faces_list,
|
FT_List_Finalize( &driver->faces_list,
|
||||||
(FT_List_Destructor)destroy_face,
|
destroy_face,
|
||||||
driver->root.memory,
|
driver->root.memory,
|
||||||
driver );
|
driver );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue