Commit 5cff1134 authored by David Turner's avatar David Turner
Browse files

* renaming stream macros. Examples:

           FILE_Skip    => FT_STREAM_SKIP
           FILE_Read    => FT_STREAM_READ
           ACCESS_Frame => FT_FRAME_ENTER
           FORGET_Frame => FT_FRAME_EXIT
           etc...
parent de388f50
2002-03-20 David Turner <david@freetype.org>
* renaming stream macros. Examples:
FILE_Skip => FT_STREAM_SKIP
FILE_Read => FT_STREAM_READ
ACCESS_Frame => FT_FRAME_ENTER
FORGET_Frame => FT_FRAME_EXIT
etc...
* src/sfnt/sfdriver.c (get_sfnt_postscript_name): fixed memory leak
* include/freetype/internal/ftobjs.h: changing the definition of
FT_CMap_CharNextFunc slightly
......
......@@ -265,38 +265,38 @@ FT_BEGIN_HEADER
/* */
#define FT_GET_MACRO( func, type ) ( (type)func( stream ) )
#define GET_Char() FT_GET_MACRO( FT_Stream_Get_Char, FT_Char )
#define GET_Byte() FT_GET_MACRO( FT_Stream_Get_Char, FT_Byte )
#define GET_Short() FT_GET_MACRO( FT_Stream_Get_Short, FT_Short )
#define GET_UShort() FT_GET_MACRO( FT_Stream_Get_Short, FT_UShort )
#define GET_Offset() FT_GET_MACRO( FT_Stream_Get_Offset, FT_Long )
#define GET_UOffset() FT_GET_MACRO( FT_Stream_Get_Offset, FT_ULong )
#define GET_Long() FT_GET_MACRO( FT_Stream_Get_Long, FT_Long )
#define GET_ULong() FT_GET_MACRO( FT_Stream_Get_Long, FT_ULong )
#define GET_Tag4() FT_GET_MACRO( FT_Stream_Get_Long, FT_ULong )
#define GET_ShortLE() FT_GET_MACRO( FT_Stream_Get_ShortLE, FT_Short )
#define GET_UShortLE() FT_GET_MACRO( FT_Stream_Get_ShortLE, FT_UShort )
#define GET_LongLE() FT_GET_MACRO( FT_Stream_Get_LongLE, FT_Long )
#define GET_ULongLE() FT_GET_MACRO( FT_Stream_Get_LongLE, FT_ULong )
#define GET_Char() FT_GET_MACRO( FT_Stream_GetChar, FT_Char )
#define GET_Byte() FT_GET_MACRO( FT_Stream_GetChar, FT_Byte )
#define GET_Short() FT_GET_MACRO( FT_Stream_GetShort, FT_Short )
#define GET_UShort() FT_GET_MACRO( FT_Stream_GetShort, FT_UShort )
#define GET_Offset() FT_GET_MACRO( FT_Stream_GetOffset, FT_Long )
#define GET_UOffset() FT_GET_MACRO( FT_Stream_GetOffset, FT_ULong )
#define GET_Long() FT_GET_MACRO( FT_Stream_GetLong, FT_Long )
#define GET_ULong() FT_GET_MACRO( FT_Stream_GetLong, FT_ULong )
#define GET_Tag4() FT_GET_MACRO( FT_Stream_GetLong, FT_ULong )
#define GET_ShortLE() FT_GET_MACRO( FT_Stream_GetShortLE, FT_Short )
#define GET_UShortLE() FT_GET_MACRO( FT_Stream_GetShortLE, FT_UShort )
#define GET_LongLE() FT_GET_MACRO( FT_Stream_GetLongLE, FT_Long )
#define GET_ULongLE() FT_GET_MACRO( FT_Stream_GetLongLE, FT_ULong )
#define FT_READ_MACRO( func, type, var ) \
( var = (type)func( stream, &error ), \
error != FT_Err_Ok )
#define READ_Byte( var ) FT_READ_MACRO( FT_Stream_Read_Char, FT_Byte, var )
#define READ_Char( var ) FT_READ_MACRO( FT_Stream_Read_Char, FT_Char, var )
#define READ_Short( var ) FT_READ_MACRO( FT_Stream_Read_Short, FT_Short, var )
#define READ_UShort( var ) FT_READ_MACRO( FT_Stream_Read_Short, FT_UShort, var )
#define READ_Offset( var ) FT_READ_MACRO( FT_Stream_Read_Offset, FT_Long, var )
#define READ_UOffset( var ) FT_READ_MACRO( FT_Stream_Read_Offset, FT_ULong, var )
#define READ_Long( var ) FT_READ_MACRO( FT_Stream_Read_Long, FT_Long, var )
#define READ_ULong( var ) FT_READ_MACRO( FT_Stream_Read_Long, FT_ULong, var )
#define READ_Byte( var ) FT_READ_MACRO( FT_Stream_ReadChar, FT_Byte, var )
#define READ_Char( var ) FT_READ_MACRO( FT_Stream_ReadChar, FT_Char, var )
#define READ_Short( var ) FT_READ_MACRO( FT_Stream_ReadShort, FT_Short, var )
#define READ_UShort( var ) FT_READ_MACRO( FT_Stream_ReadShort, FT_UShort, var )
#define READ_Offset( var ) FT_READ_MACRO( FT_Stream_ReadOffset, FT_Long, var )
#define READ_UOffset( var ) FT_READ_MACRO( FT_Stream_ReadOffset, FT_ULong, var )
#define READ_Long( var ) FT_READ_MACRO( FT_Stream_ReadLong, FT_Long, var )
#define READ_ULong( var ) FT_READ_MACRO( FT_Stream_ReadLong, FT_ULong, var )
#define READ_ShortLE( var ) FT_READ_MACRO( FT_Stream_Read_ShortLE, FT_Short, var )
#define READ_UShortLE( var ) FT_READ_MACRO( FT_Stream_Read_ShortLE, FT_UShort, var )
#define READ_LongLE( var ) FT_READ_MACRO( FT_Stream_Read_LongLE, FT_Long, var )
#define READ_ULongLE( var ) FT_READ_MACRO( FT_Stream_Read_LongLE, FT_ULong, var )
#define READ_ShortLE( var ) FT_READ_MACRO( FT_Stream_ReadShortLE, FT_Short, var )
#define READ_UShortLE( var ) FT_READ_MACRO( FT_Stream_ReadShortLE, FT_UShort, var )
#define READ_LongLE( var ) FT_READ_MACRO( FT_Stream_ReadLongLE, FT_Long, var )
#define READ_ULongLE( var ) FT_READ_MACRO( FT_Stream_ReadLongLE, FT_ULong, var )
......@@ -313,9 +313,9 @@ FT_BEGIN_HEADER
/* initialize a stream for reading in-memory data */
FT_BASE( void )
FT_Stream_Open_Memory( FT_Stream stream,
const FT_Byte* base,
FT_ULong size );
FT_Stream_OpenMemory( FT_Stream stream,
const FT_Byte* base,
FT_ULong size );
/* close a stream (does not destroy the stream structure) */
FT_BASE( void )
......@@ -346,27 +346,27 @@ FT_BEGIN_HEADER
/* read bytes from a stream at a given position */
FT_BASE( FT_Error )
FT_Stream_Read_At( FT_Stream stream,
FT_ULong pos,
FT_Byte* buffer,
FT_ULong count );
FT_Stream_ReadAt( FT_Stream stream,
FT_ULong pos,
FT_Byte* buffer,
FT_ULong count );
/* enter a frame of 'count' consecutive bytes in a stream. returns an */
/* error if the frame could not be read/accessed. The caller can use */
/* the FT_Stream_Get_XXX function to retrieve frame data without */
/* error checks.. */
/* */
/* you must _always_ call FT_Stream_Exit_Frame once you've entered */
/* you must _always_ call FT_Stream_ExitFrame once you've entered */
/* a stream frame !! */
/* */
FT_BASE( FT_Error )
FT_Stream_Enter_Frame( FT_Stream stream,
FT_ULong count );
FT_Stream_EnterFrame( FT_Stream stream,
FT_ULong count );
/* exit a stream frame.. */
/* */
FT_BASE( void )
FT_Stream_Exit_Frame( FT_Stream stream );
FT_Stream_ExitFrame( FT_Stream stream );
/* extract a stream frame. if the stream is disk-based, a heap block */
/* is allocated and the frame bytes are read into it. if the stream */
......@@ -375,126 +375,119 @@ FT_BEGIN_HEADER
/* useful to optimize access to memory-based streams transparently. */
/* */
/* all extracted frames must be "freed" with a call to the function */
/* FT_Stream_Release_Frame */
/* FT_Stream_ReleaseFrame */
/* */
FT_BASE( FT_Error )
FT_Stream_Extract_Frame( FT_Stream stream,
FT_ULong count,
FT_Byte** pbytes );
FT_Stream_ExtractFrame( FT_Stream stream,
FT_ULong count,
FT_Byte** pbytes );
/* release an extract frame (see FT_Stream_Extract_Frame) */
/* release an extract frame (see FT_Stream_ExtractFrame) */
/* */
FT_BASE( void )
FT_Stream_Release_Frame( FT_Stream stream,
FT_Byte** pbytes );
FT_Stream_ReleaseFrame( FT_Stream stream,
FT_Byte** pbytes );
/* read a byte from an entered frame */
FT_BASE( FT_Char )
FT_Stream_Get_Char( FT_Stream stream );
FT_Stream_GetChar( FT_Stream stream );
/* read a 16-bit big-endian integer from an entered frame */
FT_BASE( FT_Short )
FT_Stream_Get_Short( FT_Stream stream );
FT_Stream_GetShort( FT_Stream stream );
/* read a 24-bit big-endian integer from an entered frame */
FT_BASE( FT_Long )
FT_Stream_Get_Offset( FT_Stream stream );
FT_Stream_GetOffset( FT_Stream stream );
/* read a 32-bit big-endian integer from an entered frame */
FT_BASE( FT_Long )
FT_Stream_Get_Long( FT_Stream stream );
FT_Stream_GetLong( FT_Stream stream );
/* read a 16-bit little-endian integer from an entered frame */
FT_BASE( FT_Short )
FT_Stream_Get_ShortLE( FT_Stream stream );
FT_Stream_GetShortLE( FT_Stream stream );
/* read a 32-bit little-endian integer from an entered frame */
FT_BASE( FT_Long )
FT_Stream_Get_LongLE( FT_Stream stream );
FT_Stream_GetLongLE( FT_Stream stream );
/* read a byte from a stream */
FT_BASE( FT_Char )
FT_Stream_Read_Char( FT_Stream stream,
FT_Error* error );
FT_Stream_ReadChar( FT_Stream stream,
FT_Error* error );
/* read a 16-bit big-endian integer from a stream */
FT_BASE( FT_Short )
FT_Stream_Read_Short( FT_Stream stream,
FT_Error* error );
FT_Stream_ReadShort( FT_Stream stream,
FT_Error* error );
/* read a 24-bit big-endian integer from a stream */
FT_BASE( FT_Long )
FT_Stream_Read_Offset( FT_Stream stream,
FT_Error* error );
FT_Stream_ReadOffset( FT_Stream stream,
FT_Error* error );
/* read a 32-bit big-endian integer from a stream */
FT_BASE( FT_Long )
FT_Stream_Read_Long( FT_Stream stream,
FT_Error* error );
FT_Stream_ReadLong( FT_Stream stream,
FT_Error* error );
/* read a 16-bit little-endian integer from a stream */
FT_BASE( FT_Short )
FT_Stream_Read_ShortLE( FT_Stream stream,
FT_Error* error );
FT_Stream_ReadShortLE( FT_Stream stream,
FT_Error* error );
/* read a 32-bit little-endian integer from a stream */
FT_BASE( FT_Long )
FT_Stream_Read_LongLE( FT_Stream stream,
FT_Error* error );
FT_Stream_ReadLongLE( FT_Stream stream,
FT_Error* error );
/* read a structure from a stream. The structure must be described */
/* by an array of FT_Frame_Field records.. */
FT_BASE( FT_Error )
FT_Stream_Read_Fields( FT_Stream stream,
const FT_Frame_Field* fields,
void* structure );
#define USE_Stream( resource, stream ) \
FT_SET_ERROR( FT_Open_Stream( resource, stream ) )
#define DONE_Stream( stream ) \
FT_Stream_Close( stream )
FT_Stream_ReadFields( FT_Stream stream,
const FT_Frame_Field* fields,
void* structure );
#define ACCESS_Frame( size ) \
FT_SET_ERROR( FT_Stream_Enter_Frame( stream, size ) )
#define FORGET_Frame() \
FT_Stream_Exit_Frame( stream )
#define EXTRACT_Frame( size, bytes ) \
FT_SET_ERROR( FT_Stream_Extract_Frame( stream, size, \
(FT_Byte**)&(bytes) ) )
#define RELEASE_Frame( bytes ) \
FT_Stream_Release_Frame( stream, (FT_Byte**)&(bytes) )
#define FT_STREAM_POS() \
FT_Stream_Pos( stream )
#define FILE_Seek( position ) \
#define FT_STREAM_SEEK( position ) \
FT_SET_ERROR( FT_Stream_Seek( stream, position ) )
#define FILE_Skip( distance ) \
#define FT_STREAM_SKIP( distance ) \
FT_SET_ERROR( FT_Stream_Skip( stream, distance ) )
#define FILE_Pos() \
FT_Stream_Pos( stream )
#define FILE_Read( buffer, count ) \
FT_SET_ERROR( FT_Stream_Read( stream, \
(FT_Byte*)buffer, \
#define FT_STREAM_READ( buffer, count ) \
FT_SET_ERROR( FT_Stream_Read( stream, \
(FT_Byte*)buffer, \
count ) )
#define FILE_Read_At( position, buffer, count ) \
FT_SET_ERROR( FT_Stream_Read_At( stream, \
#define FT_STREAM_READ_AT( position, buffer, count ) \
FT_SET_ERROR( FT_Stream_ReadAt( stream, \
position, \
(FT_Byte*)buffer, \
count ) )
#define READ_Fields( fields, object ) \
( ( error = FT_Stream_Read_Fields( stream, fields, object ) ) != FT_Err_Ok )
#define FT_STREAM_READ_FIELDS( fields, object ) \
FT_SET_ERROR( FT_Stream_ReadFields( stream, fields, object ) )
#define FT_FRAME_ENTER( size ) \
FT_SET_ERROR( FT_Stream_EnterFrame( stream, size ) )
#define FT_FRAME_EXIT() \
FT_Stream_ExitFrame( stream )
#define FT_FRAME_EXTRACT( size, bytes ) \
FT_SET_ERROR( FT_Stream_ExtractFrame( stream, size, \
(FT_Byte**)&(bytes) ) )
#define FT_FRAME_RELEASE( bytes ) \
FT_Stream_ReleaseFrame( stream, (FT_Byte**)&(bytes) )
FT_END_HEADER
......
......@@ -1220,8 +1220,8 @@ FT_BEGIN_HEADER
/* FreeType error code. 0 means success. */
/* */
/* <Note> */
/* This function is normally equivalent to FILE_Seek(offset) */
/* followed by ACCESS_Frame(byte_count) with the loader's stream, but */
/* This function is normally equivalent to FT_STREAM_SEEK(offset) */
/* followed by FT_FRAME_ENTER(byte_count) with the loader's stream, but */
/* alternative formats (e.g. compressed ones) might use something */
/* different. */
/* */
......
This diff is collapsed.
......@@ -69,9 +69,9 @@
if ( args->flags & ft_open_memory )
{
/* create a memory-based stream */
FT_Stream_Open_Memory( stream,
(FT_Byte*)args->memory_base,
args->memory_size );
FT_Stream_OpenMemory( stream,
(const FT_Byte*)args->memory_base,
args->memory_size );
}
else if ( args->flags & ft_open_pathname )
{
......
......@@ -32,9 +32,9 @@
FT_BASE_DEF( void )
FT_Stream_Open_Memory( FT_Stream stream,
const FT_Byte* base,
FT_ULong size )
FT_Stream_OpenMemory( FT_Stream stream,
const FT_Byte* base,
FT_ULong size )
{
stream->base = (FT_Byte*) base;
stream->size = size;
......@@ -60,7 +60,7 @@
FT_Stream_Seek( FT_Stream stream,
FT_ULong pos )
{
FT_Error error;
FT_Error error = FT_Err_Ok;
stream->pos = pos;
......@@ -69,28 +69,21 @@
{
if ( stream->read( stream, pos, 0, 0 ) )
{
FT_ERROR(( "FT_Stream_Seek:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
pos, stream->size ));
FT_ERROR(( "%s: invalid i/o; pos = 0x%lx, size = 0x%lx\n",
"FT_Stream_Seek", pos, stream->size ));
error = FT_Err_Invalid_Stream_Operation;
}
else
error = FT_Err_Ok;
}
/* note that seeking to the first position after the file is valid */
else if ( pos > stream->size )
{
FT_ERROR(( "FT_Stream_Seek:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
pos, stream->size ));
FT_ERROR(( "%s: invalid i/o; pos = 0x%lx, size = 0x%lx\n",
"FT_Stream_Seek", pos, stream->size ));
error = FT_Err_Invalid_Stream_Operation;
}
else
error = FT_Err_Ok;
return error;
}
......@@ -115,15 +108,15 @@
FT_Byte* buffer,
FT_ULong count )
{
return FT_Stream_Read_At( stream, stream->pos, buffer, count );
return FT_Stream_ReadAt( stream, stream->pos, buffer, count );
}
FT_BASE_DEF( FT_Error )
FT_Stream_Read_At( FT_Stream stream,
FT_ULong pos,
FT_Byte* buffer,
FT_ULong count )
FT_Stream_ReadAt( FT_Stream stream,
FT_ULong pos,
FT_Byte* buffer,
FT_ULong count )
{
FT_Error error = FT_Err_Ok;
FT_ULong read_bytes;
......@@ -131,9 +124,8 @@
if ( pos >= stream->size )
{
FT_ERROR(( "FT_Stream_Read_At:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
pos, stream->size ));
FT_ERROR(( "%s: invalid i/o; pos = 0x%lx, size = 0x%lx\n",
"FT_Stream_ReadAt", pos, stream->size ));
return FT_Err_Invalid_Stream_Operation;
}
......@@ -153,9 +145,8 @@
if ( read_bytes < count )
{
FT_ERROR(( "FT_Stream_Read_At:" ));
FT_ERROR(( " invalid read; expected %lu bytes, got %lu\n",
count, read_bytes ));
FT_ERROR(( "%s: invalid read; expected %lu bytes, got %lu\n",
"FT_Stream_ReadAt", count, read_bytes ));
error = FT_Err_Invalid_Stream_Operation;
}
......@@ -165,19 +156,19 @@
FT_BASE_DEF( FT_Error )
FT_Stream_Extract_Frame( FT_Stream stream,
FT_ULong count,
FT_Byte** pbytes )
FT_Stream_ExtractFrame( FT_Stream stream,
FT_ULong count,
FT_Byte** pbytes )
{
FT_Error error;
error = FT_Stream_Enter_Frame( stream, count );
error = FT_Stream_EnterFrame( stream, count );
if ( !error )
{
*pbytes = (FT_Byte*)stream->cursor;
/* equivalent to FT_Stream_Exit_Frame(), with no memory block release */
/* equivalent to FT_Stream_ExitFrame(), with no memory block release */
stream->cursor = 0;
stream->limit = 0;
}
......@@ -187,8 +178,8 @@
FT_BASE_DEF( void )
FT_Stream_Release_Frame( FT_Stream stream,
FT_Byte** pbytes )
FT_Stream_ReleaseFrame( FT_Stream stream,
FT_Byte** pbytes )
{
if ( stream->read )
{
......@@ -202,8 +193,8 @@
FT_BASE_DEF( FT_Error )
FT_Stream_Enter_Frame( FT_Stream stream,
FT_ULong count )
FT_Stream_EnterFrame( FT_Stream stream,
FT_ULong count )
{
FT_Error error = FT_Err_Ok;
FT_ULong read_bytes;
......@@ -226,7 +217,7 @@
stream->base, count );
if ( read_bytes < count )
{
FT_ERROR(( "FT_Stream_Enter_Frame:" ));
FT_ERROR(( "FT_Stream_EnterFrame:" ));
FT_ERROR(( " invalid read; expected %lu bytes, got %lu\n",
count, read_bytes ));
......@@ -243,7 +234,7 @@
if ( stream->pos >= stream->size ||
stream->pos + count > stream->size )
{
FT_ERROR(( "FT_Stream_Enter_Frame:" ));
FT_ERROR(( "FT_Stream_EnterFrame:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, count = %lu, size = 0x%lx\n",
stream->pos, count, stream->size ));
......@@ -263,7 +254,7 @@
FT_BASE_DEF( void )
FT_Stream_Exit_Frame( FT_Stream stream )
FT_Stream_ExitFrame( FT_Stream stream )
{
/* IMPORTANT: The assertion stream->cursor != 0 was removed, given */
/* that it is possible to access a frame of length 0 in */
......@@ -272,7 +263,7 @@
/* */
/* In this case, the loader code handles the 0-length table */
/* gracefully; however, stream.cursor is really set to 0 by the */
/* FT_Stream_Enter_Frame() call, and this is not an error. */
/* FT_Stream_EnterFrame() call, and this is not an error. */
/* */
FT_ASSERT( stream );
......@@ -289,7 +280,7 @@
FT_BASE_DEF( FT_Char )
FT_Stream_Get_Char( FT_Stream stream )
FT_Stream_GetChar( FT_Stream stream )
{
FT_Char result;
......@@ -305,7 +296,7 @@
FT_BASE_DEF( FT_Short )
FT_Stream_Get_Short( FT_Stream stream )
FT_Stream_GetShort( FT_Stream stream )
{
FT_Byte* p;
FT_Short result;
......@@ -324,7 +315,7 @@
FT_BASE_DEF( FT_Short )
FT_Stream_Get_ShortLE( FT_Stream stream )
FT_Stream_GetShortLE( FT_Stream stream )
{
FT_Byte* p;
FT_Short result;
......@@ -343,7 +334,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_Get_Offset( FT_Stream stream )
FT_Stream_GetOffset( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
......@@ -361,7 +352,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_Get_Long( FT_Stream stream )
FT_Stream_GetLong( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
......@@ -379,7 +370,7 @@
FT_BASE_DEF( FT_Long )
FT_Stream_Get_LongLE( FT_Stream stream )
FT_Stream_GetLongLE( FT_Stream stream )
{
FT_Byte* p;
FT_Long result;
......@@ -397,8 +388,8 @@
FT_BASE_DEF( FT_Char )
FT_Stream_Read_Char( FT_Stream stream,
FT_Error* error )
FT_Stream_ReadChar( FT_Stream stream,
FT_Error* error )
{
FT_Byte result = 0;
......@@ -425,17 +416,16 @@
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Stream_Read_Char:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
stream->pos, stream->size ));
FT_ERROR(( "%s: invalid i/o; pos = 0x%lx, size = 0x%lx\n",
"FT_Stream_ReadChar", stream->pos, stream->size ));
return 0;
}
FT_BASE_DEF( FT_Short )
FT_Stream_Read_Short( FT_Stream stream,
FT_Error* error )
FT_Stream_ReadShort( FT_Stream stream,
FT_Error* error )
{
FT_Byte reads[2];
FT_Byte* p = 0;
......@@ -472,7 +462,7 @@
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Stream_Read_Short:" ));
FT_ERROR(( "FT_Stream_ReadShort:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
stream->pos, stream->size ));
......@@ -481,8 +471,8 @@
FT_BASE_DEF( FT_Short )
FT_Stream_Read_ShortLE( FT_Stream stream,
FT_Error* error )
FT_Stream_ReadShortLE( FT_Stream stream,
FT_Error* error )
{
FT_Byte reads[2];
FT_Byte* p = 0;
......@@ -519,7 +509,7 @@
Fail:
*error = FT_Err_Invalid_Stream_Operation;
FT_ERROR(( "FT_Stream_Read_Short:" ));
FT_ERROR(( "FT_Stream_ReadShort:" ));
FT_ERROR(( " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
stream->pos, stream->size ));
......@@ -528,8 +518,8 @@
FT_BASE_DEF( FT_Long )
FT_Stream_Read_Offset( FT_Stream stream,
FT_Error* error )
FT_Stream_ReadOffset( FT_Stream stream,
FT_Error* error )