rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Align FreeType with standard C memory management." 

This reverts commit 877aa1b2cc.
This commit is contained in:
Alexei Podtelezhnikov 2018-10-26 22:52:25 -04:00
parent bfe5329475
commit d71f2bc159
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
2018-10-27 Alexei Podtelezhnikov <apodtele@gmail.com>
Revert: Align FreeType with standard C memory management.
2018-10-27 Werner Lemberg <wl@gnu.org>
[psaux] Fix numeric overflow.
@ -137,7 +141,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 <apodtele@gmail.com>

6
builds/amiga/src/base/ftsystem.c
View File

@ -139,7 +139,7 @@ Free_VecPooled( APTR poolHeader,
/* */
FT_CALLBACK_DEF( void* )
ft_alloc( FT_Memory memory,
size_t size )
long 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,
size_t cur_size,
size_t new_size,
long cur_size,
long new_size,
void* block )
{
void* new_block;

6
builds/unix/ftsystem.c
View File

@ -95,7 +95,7 @@
/* */
FT_CALLBACK_DEF( void* )
ft_alloc( FT_Memory memory,
size_t size )
long size )
{
FT_UNUSED( memory );
@ -125,8 +125,8 @@
/* */
FT_CALLBACK_DEF( void* )
ft_realloc( FT_Memory memory,
size_t cur_size,
size_t new_size,
long cur_size,
long new_size,
void* block )
{
FT_UNUSED( memory );

6
builds/vms/ftsystem.c
View File

@ -94,7 +94,7 @@
/* */
FT_CALLBACK_DEF( void* )
ft_alloc( FT_Memory memory,
size_t size )
long size )
{
FT_UNUSED( memory );
@ -124,8 +124,8 @@
/* */
FT_CALLBACK_DEF( void* )
ft_realloc( FT_Memory memory,
size_t cur_size,
size_t new_size,
long cur_size,
long new_size,
void* block )
{
FT_UNUSED( memory );

7
include/freetype/ftsystem.h
View File

@ -21,7 +21,6 @@
#include <ft2build.h>
#include FT_TYPES_H
FT_BEGIN_HEADER
@ -87,7 +86,7 @@ FT_BEGIN_HEADER
*/
typedef void*
(*FT_Alloc_Func)( FT_Memory memory,
size_t size );
long size );
/**************************************************************************
@ -141,8 +140,8 @@ FT_BEGIN_HEADER
*/
typedef void*
(*FT_Realloc_Func)( FT_Memory memory,
size_t cur_size,
size_t new_size,
long cur_size,
long new_size,
void* block );

9
src/base/ftdbgmem.c
View File

@ -676,11 +676,10 @@
static FT_Pointer
ft_mem_debug_alloc( FT_Memory memory,
FT_Offset size_ )
FT_Long size )
{
FT_MemTable table = (FT_MemTable)memory->user;
FT_Byte* block;
FT_Long size = (FT_Long)size_;
if ( size <= 0 )
@ -737,16 +736,14 @@
static FT_Pointer
ft_mem_debug_realloc( FT_Memory memory,
FT_Offset cur_size_,
FT_Offset new_size_,
FT_Long cur_size,
FT_Long 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;

10
src/base/ftsystem.c
View File

@ -69,11 +69,11 @@
*/
FT_CALLBACK_DEF( void* )
ft_alloc( FT_Memory memory,
size_t size )
long size )
{
FT_UNUSED( memory );
return ft_smalloc( size );
return ft_smalloc( (size_t)size );
}
@ -103,14 +103,14 @@
*/
FT_CALLBACK_DEF( void* )
ft_realloc( FT_Memory memory,
size_t cur_size,
size_t new_size,
long cur_size,
long new_size,
void* block )
{
FT_UNUSED( memory );
FT_UNUSED( cur_size );
return ft_srealloc( block, new_size );
return ft_srealloc( block, (size_t)new_size );
}

6
src/raster/ftmisc.h
View File

@ -59,14 +59,14 @@
typedef struct FT_MemoryRec_* FT_Memory;
typedef void* (*FT_Alloc_Func)( FT_Memory memory,
size_t size );
long size );
typedef void (*FT_Free_Func)( FT_Memory memory,
void* block );
typedef void* (*FT_Realloc_Func)( FT_Memory memory,
size_t cur_size,
size_t new_size,
long cur_size,
long new_size,
void* block );
typedef struct FT_MemoryRec_