diff options
| author | David Turner <david@freetype.org> | 2002-03-01 02:26:22 +0000 |
|---|---|---|
| committer | David Turner <david@freetype.org> | 2002-03-01 02:26:22 +0000 |
| commit | bc82f1bbefa90c649a9ad2c28938d55b4acbf380 (patch) | |
| tree | 4fda83b72ac4380036b4bbb01af77cee07ca4edb /include/freetype/internal/ftmemory.h | |
| parent | 041889e763fa84eee20f15ef850fccc790294b67 (diff) | |
| download | freetype2-bc82f1bbefa90c649a9ad2c28938d55b4acbf380.tar.gz | |
* include/freetype/ftconfig.h: changed FT_LOCAL xxxx to FT_LOCAL( xxxx )
everywhere in the source. Sames goes for FT_LOCAL_DEF xxxx translated
into FT_LOCAL_DEF( xxxxx )
Diffstat (limited to 'include/freetype/internal/ftmemory.h')
| -rw-r--r-- | include/freetype/internal/ftmemory.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h index a08a955a3..f2da6feca 100644 --- a/include/freetype/internal/ftmemory.h +++ b/include/freetype/internal/ftmemory.h @@ -218,16 +218,22 @@ FT_BEGIN_HEADER #define MEM_Free( _pointer_ ) \ FT_Free_Debug( memory, (void**)&(_pointer_), __FILE__, __LINE__ ) - + #else /* !FT_DEBUG_MEMORY */ #define MEM_Alloc( _pointer_, _size_ ) \ FT_Alloc( memory, _size_, (void**)&(_pointer_) ) +#define MEM_New( _pointer_ ) MEM_Alloc( _pointer_, sizeof(*(_pointer_)) ) + + #define MEM_Alloc_Array( _pointer_, _count_, _type_ ) \ FT_Alloc( memory, (_count_)*sizeof ( _type_ ), \ (void**)&(_pointer_) ) +#define MEM_New_Array( _pointer_, _count_ ) \ + MEM_Alloc_Array( _pointer_, _count_, sizeof(*(_pointer_)) ) + #define MEM_Realloc( _pointer_, _current_, _size_ ) \ FT_Realloc( memory, _current_, _size_, (void**)&(_pointer_) ) @@ -235,6 +241,9 @@ FT_BEGIN_HEADER FT_Realloc( memory, (_current_)*sizeof ( _type_ ), \ (_new_)*sizeof ( _type_ ), (void**)&(_pointer_) ) +#define MEM_Renew_Array( _pointer_, _current_, _new_ ) \ + MEM_Realloc_Array( _pointer_, _current_, _new_, *(_pointer_) ) + #define MEM_Free( _pointer_ ) \ FT_Free( memory, (void**)&(_pointer_) ) @@ -244,6 +253,9 @@ FT_BEGIN_HEADER #define ALLOC( _pointer_, _size_ ) \ FT_SET_ERROR( MEM_Alloc( _pointer_, _size_ ) ) +#define NEW( _pointer_ ) \ + FT_SET_ERROR( MEM_New( _pointer_ ) ) + #define REALLOC( _pointer_, _current_, _size_ ) \ FT_SET_ERROR( MEM_Realloc( _pointer_, _current_, _size_ ) ) @@ -251,11 +263,17 @@ FT_BEGIN_HEADER FT_SET_ERROR( MEM_Alloc( _pointer_, \ (_count_)*sizeof ( _type_ ) ) ) +#define NEW_ARRAY( _pointer_, _count_ ) \ + FT_SET_ERROR( MEM_New_Array( _pointer_, _count_ ) ) + #define REALLOC_ARRAY( _pointer_, _current_, _count_, _type_ ) \ FT_SET_ERROR( MEM_Realloc( _pointer_, \ (_current_)*sizeof ( _type_ ), \ (_count_)*sizeof ( _type_ ) ) ) +#define RENEW_ARRAY( _pointer_, _current_, _new_ ) \ + FT_SET_ERROR( MEM_Renew_Array( _pointer_, _current_, _new_ ) ) + #define FREE( _pointer_ ) \ MEM_Free( _pointer_ ) |