diff options
| author | David Turner <david@freetype.org> | 2002-03-22 13:52:37 +0000 |
|---|---|---|
| committer | David Turner <david@freetype.org> | 2002-03-22 13:52:37 +0000 |
| commit | e459d742e6236df43f542b8c29dfdcf05d69716c (patch) | |
| tree | 38339223b6d6426fdc1e0b23aeeb2d4f89c3b367 /src/base/ftstream.c | |
| parent | a890c29cb06f990ac19ada14eae0f9513bb9ed88 (diff) | |
| download | freetype2-e459d742e6236df43f542b8c29dfdcf05d69716c.tar.gz | |
* include/freetype/internal/ftmemory.h, and a lot of other files !!:
changed the names of memory macros. Examples:
MEM_Set => FT_MEM_SET
MEM_Copy => FT_MEM_COPY
MEM_Move => FT_MEM_MOVE
ALLOC => FT_ALLOC
FREE => FT_FREE
REALLOC = >FT_REALLOC
FT_NEW was introduced to allocate a new object from a _typed_
pointer..
note that ALLOC_ARRAY and REALLOC_ARRAY have been replaced
by FT_NEW_ARRAY and FT_RENEW_ARRAY which take _typed_ pointer
arguments.
This results in _lots_ of sources being changed, but makes the
code more generic and less error-prone..
Diffstat (limited to 'src/base/ftstream.c')
| -rw-r--r-- | src/base/ftstream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/base/ftstream.c b/src/base/ftstream.c index 7fafbcf83..9266d5099 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -138,7 +138,7 @@ if ( read_bytes > count ) read_bytes = count; - MEM_Copy( buffer, stream->base + pos, read_bytes ); + FT_MEM_COPY( buffer, stream->base + pos, read_bytes ); } stream->pos = pos + read_bytes; @@ -186,7 +186,7 @@ FT_Memory memory = stream->memory; - FREE( *pbytes ); + FT_FREE( *pbytes ); } *pbytes = 0; } @@ -209,7 +209,7 @@ FT_Memory memory = stream->memory; - if ( ALLOC( stream->base, count ) ) + if ( FT_ALLOC( stream->base, count ) ) goto Exit; /* read it */ @@ -221,7 +221,7 @@ FT_ERROR(( " invalid read; expected %lu bytes, got %lu\n", count, read_bytes )); - FREE( stream->base ); + FT_FREE( stream->base ); error = FT_Err_Invalid_Stream_Operation; } stream->cursor = stream->base; @@ -272,7 +272,7 @@ FT_Memory memory = stream->memory; - FREE( stream->base ); + FT_FREE( stream->base ); } stream->cursor = 0; stream->limit = 0; @@ -704,7 +704,7 @@ if ( fields->value == ft_frame_bytes ) { p = (FT_Byte*)structure + fields->offset; - MEM_Copy( p, cursor, len ); + FT_MEM_COPY( p, cursor, len ); } cursor += len; fields++; |