diff options
author | David Turner <david@freetype.org> | 2002-02-24 05:26:57 +0000 |
---|---|---|
committer | David Turner <david@freetype.org> | 2002-02-24 05:26:57 +0000 |
commit | 53b3fa1da5e3397388f3483ccc95910eca4a419d (patch) | |
tree | 3d1566d393f2ca94349bd173c8544c26880581d4 /builds/amiga | |
parent | 4d57024d1c861443a981de6d7388548928349eee (diff) | |
download | freetype2-53b3fa1da5e3397388f3483ccc95910eca4a419d.tar.gz |
* renaming stream functions to the FT_Subject_Action scheme:
FT_Seek_Stream => FT_Stream_Seek
FT_Skip_Stream => FT_Stream_Skip
FT_Read_Stream => FT_Stream_Read
FT_Read_Stream_At => FT_Stream_Read_At
FT_Access_Frame => FT_Stream_Enter_Frame
FT_Forget_Frame => FT_Stream_Exit_Frame
FT_Extract_Frame => FT_Stream_Extract_Frame
FT_Release_Frame => FT_Stream_Release_Frame
FT_Get_XXXX => FT_Stream_Get_XXXX
FT_Read_XXXX => FT_Stream_Read_XXXX
note also that:
FT_New_Stream( filename, stream ) =>
FT_Stream_Open( stream, filename )
(the function doesn't create the FT_Stream structure, it simply
initializes it for reading)
FT_New_Memory_Stream( library, FT_Byte* base, size, stream ) =>
FT_Stream_Open_Memory( stream, const FT_Byte* base, size )
FT_Done_Stream => FT_Stream_Close
note that the name of the stream methods, defined in
"include/freetype/ftsystem.h" have also been changed without
problems:
FT_Stream_IO => FT_Stream_IOFunc
FT_Stream_Close => FT_Stream_CloseFunc
Diffstat (limited to 'builds/amiga')
-rw-r--r-- | builds/amiga/src/base/ftsystem.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/builds/amiga/src/base/ftsystem.c b/builds/amiga/src/base/ftsystem.c index a1a580214..f5ef85b0e 100644 --- a/builds/amiga/src/base/ftsystem.c +++ b/builds/amiga/src/base/ftsystem.c @@ -307,22 +307,22 @@ void FreeVecPooled(APTR poolHeader, APTR memory) /* documentation is in ftobjs.h */ FT_EXPORT_DEF( FT_Error ) - FT_New_Stream( const char* filepathname, - FT_Stream astream ) + FT_Stream_Open( FT_Stream stream, + const char* filepathname ) { // FILE* file; BPTR file; // TetiSoft struct FileInfoBlock *fib; // TetiSoft - if ( !astream ) + if ( !stream ) return FT_Err_Invalid_Stream_Handle; // file = fopen( filepathname, "rb" ); file = Open( filepathname, MODE_OLDFILE ); // TetiSoft if ( !file ) { - FT_ERROR(( "FT_New_Stream:" )); + FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); return FT_Err_Cannot_Open_Resource; @@ -335,7 +335,7 @@ void FreeVecPooled(APTR poolHeader, APTR memory) if ( !fib ) { Close ( file ); - FT_ERROR(( "FT_New_Stream:" )); + FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); return FT_Err_Cannot_Open_Resource; @@ -344,26 +344,26 @@ void FreeVecPooled(APTR poolHeader, APTR memory) { FreeDosObject(DOS_FIB, fib); Close ( file ); - FT_ERROR(( "FT_New_Stream:" )); + FT_ERROR(( "FT_Stream_Open:" )); FT_ERROR(( " could not open `%s'\n", filepathname )); return FT_Err_Cannot_Open_Resource; } - astream->size = fib->fib_Size; + stream->size = fib->fib_Size; FreeDosObject(DOS_FIB, fib); -// astream->descriptor.pointer = file; - astream->descriptor.pointer = (void *)file; +// stream->descriptor.pointer = file; + stream->descriptor.pointer = (void *)file; - astream->pathname.pointer = (char*)filepathname; - astream->pos = 0; + stream->pathname.pointer = (char*)filepathname; + stream->pos = 0; - astream->read = ft_io_stream; - astream->close = ft_close_stream; + stream->read = ft_io_stream; + stream->close = ft_close_stream; - FT_TRACE1(( "FT_New_Stream:" )); + FT_TRACE1(( "FT_Stream_Open:" )); FT_TRACE1(( " opened `%s' (%d bytes) successfully\n", - filepathname, astream->size )); + filepathname, stream->size )); return FT_Err_Ok; } @@ -374,12 +374,12 @@ void FreeVecPooled(APTR poolHeader, APTR memory) extern FT_Int ft_mem_debug_init( FT_Memory memory ); - + extern void ft_mem_debug_done( FT_Memory memory ); - -#endif - + +#endif + /* documentation is in ftobjs.h */ @@ -411,7 +411,7 @@ void FreeVecPooled(APTR poolHeader, APTR memory) memory->free = ft_free; #ifdef FT_DEBUG_MEMORY ft_mem_debug_init( memory ); -#endif +#endif } } @@ -426,7 +426,7 @@ void FreeVecPooled(APTR poolHeader, APTR memory) { #ifdef FT_DEBUG_MEMORY ft_mem_debug_done( memory ); -#endif +#endif #ifdef __GNUC__ DeletePool( memory->user ); |