From 877aa1b2cc662978aae61ed4d5c6ea8ba56b2fe7 Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Thu, 27 Sep 2018 21:17:36 -0400 Subject: [PATCH] Align FreeType with standard C memory management. * include/freetype/ftsystem.h: Include FT_TYPES_H. (*FT_Alloc_Func, *FT_Realloc_Func): Use size_t for the size arguments. * src/raster/ftmisc.h: Ditto. * builds/amiga/src/base/ftsystem.c, builds/unix/ftsystem.c, * builds/vms/ftsystem.c, src/base/ftsystem.c (ft_alloc, ft_realloc): Use size_t for the size arguments. * src/base/ftdbgmem.c (ft_mem_debug_alloc, ft_mem_debug_realloc): Use FT_Offset, aka size_t, for the size arguments. --- ChangeLog | 17 ++++++++++++++++- builds/amiga/src/base/ftsystem.c | 6 +++--- builds/unix/ftsystem.c | 6 +++--- builds/vms/ftsystem.c | 6 +++--- include/freetype/ftsystem.h | 7 ++++--- src/base/ftdbgmem.c | 9 ++++++--- src/base/ftsystem.c | 10 +++++----- src/raster/ftmisc.h | 6 +++--- 8 files changed, 43 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 201d1cab4..0b8da23f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2018-09-27 Alexei Podtelezhnikov + + Align FreeType with standard C memory management. + + * include/freetype/ftsystem.h: Include FT_TYPES_H. + (*FT_Alloc_Func, *FT_Realloc_Func): Use size_t for the size arguments. + * src/raster/ftmisc.h: Ditto. + + * builds/amiga/src/base/ftsystem.c, builds/unix/ftsystem.c, + * builds/vms/ftsystem.c, src/base/ftsystem.c (ft_alloc, ft_realloc): + Use size_t for the size arguments. + + * src/base/ftdbgmem.c (ft_mem_debug_alloc, ft_mem_debug_realloc): Use + FT_Offset, aka size_t, for the size arguments. + 2018-09-25 Werner Lemberg Fix handling of `FT_Bool'. @@ -39,7 +54,7 @@ * src/base/ftobjs.c (ft_glyphslot_preset_bimap): Another tweak. This one should be clearer. When the rounded monochrome bbox collapses - we add a pixel that covers most if not all original cbox. + we add a pixel that covers most if not all original cbox. 2018-09-21 Alexei Podtelezhnikov diff --git a/builds/amiga/src/base/ftsystem.c b/builds/amiga/src/base/ftsystem.c index 53abdb01b..031bd29b8 100644 --- a/builds/amiga/src/base/ftsystem.c +++ b/builds/amiga/src/base/ftsystem.c @@ -139,7 +139,7 @@ Free_VecPooled( APTR poolHeader, /* */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { #ifdef __amigaos4__ return AllocVecPooled( memory->user, size ); @@ -171,8 +171,8 @@ Free_VecPooled( APTR poolHeader, /* */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { void* new_block; diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index 449c0ed01..8e709883e 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -95,7 +95,7 @@ /* */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { FT_UNUSED( memory ); @@ -125,8 +125,8 @@ /* */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { FT_UNUSED( memory ); diff --git a/builds/vms/ftsystem.c b/builds/vms/ftsystem.c index 71aab3563..51a7a3fd9 100644 --- a/builds/vms/ftsystem.c +++ b/builds/vms/ftsystem.c @@ -94,7 +94,7 @@ /* */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { FT_UNUSED( memory ); @@ -124,8 +124,8 @@ /* */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { FT_UNUSED( memory ); diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h index d6947f526..810b7b848 100644 --- a/include/freetype/ftsystem.h +++ b/include/freetype/ftsystem.h @@ -21,6 +21,7 @@ #include +#include FT_TYPES_H FT_BEGIN_HEADER @@ -86,7 +87,7 @@ FT_BEGIN_HEADER */ typedef void* (*FT_Alloc_Func)( FT_Memory memory, - long size ); + size_t size ); /************************************************************************** @@ -140,8 +141,8 @@ FT_BEGIN_HEADER */ typedef void* (*FT_Realloc_Func)( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ); diff --git a/src/base/ftdbgmem.c b/src/base/ftdbgmem.c index 6e0a0741e..0354a1ff7 100644 --- a/src/base/ftdbgmem.c +++ b/src/base/ftdbgmem.c @@ -676,10 +676,11 @@ static FT_Pointer ft_mem_debug_alloc( FT_Memory memory, - FT_Long size ) + FT_Offset size_ ) { FT_MemTable table = (FT_MemTable)memory->user; FT_Byte* block; + FT_Long size = (FT_Long)size_; if ( size <= 0 ) @@ -736,14 +737,16 @@ static FT_Pointer ft_mem_debug_realloc( FT_Memory memory, - FT_Long cur_size, - FT_Long new_size, + FT_Offset cur_size_, + FT_Offset new_size_, FT_Pointer block ) { FT_MemTable table = (FT_MemTable)memory->user; FT_MemNode node, *pnode; FT_Pointer new_block; FT_Long delta; + FT_Long cur_size = (FT_Long)cur_size_; + FT_Long new_size = (FT_Long)new_size_; const char* file_name = FT_FILENAME( _ft_debug_file ); FT_Long line_no = _ft_debug_lineno; diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c index 8fffe4833..ded49a44d 100644 --- a/src/base/ftsystem.c +++ b/src/base/ftsystem.c @@ -69,11 +69,11 @@ */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { FT_UNUSED( memory ); - return ft_smalloc( (size_t)size ); + return ft_smalloc( size ); } @@ -103,14 +103,14 @@ */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { FT_UNUSED( memory ); FT_UNUSED( cur_size ); - return ft_srealloc( block, (size_t)new_size ); + return ft_srealloc( block, new_size ); } diff --git a/src/raster/ftmisc.h b/src/raster/ftmisc.h index 97db37154..fb63a02c4 100644 --- a/src/raster/ftmisc.h +++ b/src/raster/ftmisc.h @@ -59,14 +59,14 @@ typedef struct FT_MemoryRec_* FT_Memory; typedef void* (*FT_Alloc_Func)( FT_Memory memory, - long size ); + size_t size ); typedef void (*FT_Free_Func)( FT_Memory memory, void* block ); typedef void* (*FT_Realloc_Func)( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ); typedef struct FT_MemoryRec_