ref: 877aa1b2cc662978aae61ed4d5c6ea8ba56b2fe7
parent: 4500c701c29f154eb0acd44552590d0dc315ac5f
author: Alexei Podtelezhnikov <[email protected]>
date: Thu Sep 27 17:17:36 EDT 2018
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.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2018-09-27 Alexei Podtelezhnikov <[email protected]>
+
+ 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 <[email protected]>
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 <[email protected]>
--- a/builds/amiga/src/base/ftsystem.c
+++ b/builds/amiga/src/base/ftsystem.c
@@ -139,7 +139,7 @@
/* */
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 @@
/* */
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;
--- 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 );
--- 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 );
--- a/include/freetype/ftsystem.h
+++ b/include/freetype/ftsystem.h
@@ -21,6 +21,7 @@
#include <ft2build.h>
+#include FT_TYPES_H
FT_BEGIN_HEADER
@@ -86,7 +87,7 @@
*/
typedef void*
(*FT_Alloc_Func)( FT_Memory memory,
- long size );
+ size_t size );
/**************************************************************************
@@ -140,8 +141,8 @@
*/
typedef void*
(*FT_Realloc_Func)( FT_Memory memory,
- long cur_size,
- long new_size,
+ size_t cur_size,
+ size_t new_size,
void* block );
--- 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,8 +737,8 @@
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;
@@ -744,6 +745,8 @@
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;
--- 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 );
}
--- 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_