|
 |
39671f |
--- freetype-2.4.11/src/base/ftstream.c
|
|
|
39671f |
+++ freetype-2.4.11/src/base/ftstream.c
|
|
|
39671f |
@@ -373,6 +373,25 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Short )
|
|
|
39671f |
+ FT_Stream_GetShort( FT_Stream stream )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte* p;
|
|
|
39671f |
+ FT_Short result;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream && stream->cursor );
|
|
|
39671f |
+
|
|
|
39671f |
+ result = 0;
|
|
|
39671f |
+ p = stream->cursor;
|
|
|
39671f |
+ if ( p + 1 < stream->limit )
|
|
|
39671f |
+ result = FT_NEXT_SHORT( p );
|
|
|
39671f |
+ stream->cursor = p;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_UShort )
|
|
|
39671f |
FT_Stream_GetUShortLE( FT_Stream stream )
|
|
|
39671f |
{
|
|
|
39671f |
@@ -392,6 +411,25 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Short )
|
|
|
39671f |
+ FT_Stream_GetShortLE( FT_Stream stream )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte* p;
|
|
|
39671f |
+ FT_Short result;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream && stream->cursor );
|
|
|
39671f |
+
|
|
|
39671f |
+ result = 0;
|
|
|
39671f |
+ p = stream->cursor;
|
|
|
39671f |
+ if ( p + 1 < stream->limit )
|
|
|
39671f |
+ result = FT_NEXT_SHORT_LE( p );
|
|
|
39671f |
+ stream->cursor = p;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_ULong )
|
|
|
39671f |
FT_Stream_GetUOffset( FT_Stream stream )
|
|
|
39671f |
{
|
|
|
39671f |
@@ -410,6 +448,24 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Long )
|
|
|
39671f |
+ FT_Stream_GetOffset( FT_Stream stream )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte* p;
|
|
|
39671f |
+ FT_Long result;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream && stream->cursor );
|
|
|
39671f |
+
|
|
|
39671f |
+ result = 0;
|
|
|
39671f |
+ p = stream->cursor;
|
|
|
39671f |
+ if ( p + 2 < stream->limit )
|
|
|
39671f |
+ result = FT_NEXT_OFF3( p );
|
|
|
39671f |
+ stream->cursor = p;
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_ULong )
|
|
|
39671f |
FT_Stream_GetULong( FT_Stream stream )
|
|
|
39671f |
{
|
|
|
39671f |
@@ -428,6 +484,24 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Long )
|
|
|
39671f |
+ FT_Stream_GetLong( FT_Stream stream )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte* p;
|
|
|
39671f |
+ FT_Long result;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream && stream->cursor );
|
|
|
39671f |
+
|
|
|
39671f |
+ result = 0;
|
|
|
39671f |
+ p = stream->cursor;
|
|
|
39671f |
+ if ( p + 3 < stream->limit )
|
|
|
39671f |
+ result = FT_NEXT_LONG( p );
|
|
|
39671f |
+ stream->cursor = p;
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_ULong )
|
|
|
39671f |
FT_Stream_GetULongLE( FT_Stream stream )
|
|
|
39671f |
{
|
|
|
39671f |
@@ -446,6 +520,24 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Long )
|
|
|
39671f |
+ FT_Stream_GetLongLE( FT_Stream stream )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte* p;
|
|
|
39671f |
+ FT_Long result;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream && stream->cursor );
|
|
|
39671f |
+
|
|
|
39671f |
+ result = 0;
|
|
|
39671f |
+ p = stream->cursor;
|
|
|
39671f |
+ if ( p + 3 < stream->limit )
|
|
|
39671f |
+ result = FT_NEXT_LONG_LE( p );
|
|
|
39671f |
+ stream->cursor = p;
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_Char )
|
|
|
39671f |
FT_Stream_ReadChar( FT_Stream stream,
|
|
|
39671f |
FT_Error* error )
|
|
|
39671f |
@@ -530,6 +622,53 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Short )
|
|
|
39671f |
+ FT_Stream_ReadShort( FT_Stream stream,
|
|
|
39671f |
+ FT_Error* error )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte reads[2];
|
|
|
39671f |
+ FT_Byte* p = 0;
|
|
|
39671f |
+ FT_Short result = 0;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream );
|
|
|
39671f |
+
|
|
|
39671f |
+ *error = FT_Err_Ok;
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( stream->pos + 1 < stream->size )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read( stream, stream->pos, reads, 2L ) != 2L )
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ p = reads;
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ {
|
|
|
39671f |
+ p = stream->base + stream->pos;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( p )
|
|
|
39671f |
+ result = FT_NEXT_SHORT( p );
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ stream->pos += 2;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+
|
|
|
39671f |
+ Fail:
|
|
|
39671f |
+ *error = FT_Err_Invalid_Stream_Operation;
|
|
|
39671f |
+ FT_ERROR(( "FT_Stream_ReadShort:"
|
|
|
39671f |
+ " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
|
|
39671f |
+ stream->pos, stream->size ));
|
|
|
39671f |
+
|
|
|
39671f |
+ return 0;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_UShort )
|
|
|
39671f |
FT_Stream_ReadUShortLE( FT_Stream stream,
|
|
|
b3c194 |
FT_Error* error )
|
|
|
39671f |
@@ -577,6 +716,53 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Short )
|
|
|
39671f |
+ FT_Stream_ReadShortLE( FT_Stream stream,
|
|
|
39671f |
+ FT_Error* error )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte reads[2];
|
|
|
39671f |
+ FT_Byte* p = 0;
|
|
|
39671f |
+ FT_Short result = 0;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream );
|
|
|
39671f |
+
|
|
|
39671f |
+ *error = FT_Err_Ok;
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( stream->pos + 1 < stream->size )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read( stream, stream->pos, reads, 2L ) != 2L )
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ p = reads;
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ {
|
|
|
39671f |
+ p = stream->base + stream->pos;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( p )
|
|
|
39671f |
+ result = FT_NEXT_SHORT_LE( p );
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ stream->pos += 2;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+
|
|
|
39671f |
+ Fail:
|
|
|
39671f |
+ *error = FT_Err_Invalid_Stream_Operation;
|
|
|
39671f |
+ FT_ERROR(( "FT_Stream_ReadShortLE:"
|
|
|
39671f |
+ " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
|
|
39671f |
+ stream->pos, stream->size ));
|
|
|
39671f |
+
|
|
|
39671f |
+ return 0;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_ULong )
|
|
|
39671f |
FT_Stream_ReadUOffset( FT_Stream stream,
|
|
|
b3c194 |
FT_Error* error )
|
|
|
39671f |
@@ -624,6 +810,53 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Long )
|
|
|
39671f |
+ FT_Stream_ReadOffset( FT_Stream stream,
|
|
|
39671f |
+ FT_Error* error )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte reads[3];
|
|
|
39671f |
+ FT_Byte* p = 0;
|
|
|
39671f |
+ FT_Long result = 0;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream );
|
|
|
39671f |
+
|
|
|
39671f |
+ *error = FT_Err_Ok;
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( stream->pos + 2 < stream->size )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if (stream->read( stream, stream->pos, reads, 3L ) != 3L )
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ p = reads;
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ {
|
|
|
39671f |
+ p = stream->base + stream->pos;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( p )
|
|
|
39671f |
+ result = FT_NEXT_OFF3( p );
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ stream->pos += 3;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+
|
|
|
39671f |
+ Fail:
|
|
|
39671f |
+ *error = FT_Err_Invalid_Stream_Operation;
|
|
|
39671f |
+ FT_ERROR(( "FT_Stream_ReadOffset:"
|
|
|
39671f |
+ " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
|
|
39671f |
+ stream->pos, stream->size ));
|
|
|
39671f |
+
|
|
|
39671f |
+ return 0;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_ULong )
|
|
|
39671f |
FT_Stream_ReadULong( FT_Stream stream,
|
|
|
b3c194 |
FT_Error* error )
|
|
|
39671f |
@@ -671,6 +904,53 @@
|
|
|
39671f |
}
|
|
|
39671f |
|
|
|
39671f |
|
|
|
39671f |
+ FT_BASE_DEF( FT_Long )
|
|
|
39671f |
+ FT_Stream_ReadLong( FT_Stream stream,
|
|
|
39671f |
+ FT_Error* error )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte reads[4];
|
|
|
39671f |
+ FT_Byte* p = 0;
|
|
|
39671f |
+ FT_Long result = 0;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream );
|
|
|
39671f |
+
|
|
|
39671f |
+ *error = FT_Err_Ok;
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( stream->pos + 3 < stream->size )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read( stream, stream->pos, reads, 4L ) != 4L )
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ p = reads;
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ {
|
|
|
39671f |
+ p = stream->base + stream->pos;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( p )
|
|
|
39671f |
+ result = FT_NEXT_LONG( p );
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ stream->pos += 4;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+
|
|
|
39671f |
+ Fail:
|
|
|
39671f |
+ *error = FT_Err_Invalid_Stream_Operation;
|
|
|
39671f |
+ FT_ERROR(( "FT_Stream_ReadLong:"
|
|
|
39671f |
+ " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
|
|
39671f |
+ stream->pos, stream->size ));
|
|
|
39671f |
+
|
|
|
39671f |
+ return 0;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
FT_BASE_DEF( FT_ULong )
|
|
|
39671f |
FT_Stream_ReadULongLE( FT_Stream stream,
|
|
|
b3c194 |
FT_Error* error )
|
|
|
39671f |
@@ -714,6 +994,53 @@
|
|
|
39671f |
" invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
|
|
39671f |
stream->pos, stream->size ));
|
|
|
39671f |
|
|
|
39671f |
+ return 0;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_BASE_DEF( FT_Long )
|
|
|
39671f |
+ FT_Stream_ReadLongLE( FT_Stream stream,
|
|
|
39671f |
+ FT_Error* error )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ FT_Byte reads[4];
|
|
|
39671f |
+ FT_Byte* p = 0;
|
|
|
39671f |
+ FT_Long result = 0;
|
|
|
39671f |
+
|
|
|
39671f |
+
|
|
|
39671f |
+ FT_ASSERT( stream );
|
|
|
39671f |
+
|
|
|
39671f |
+ *error = FT_Err_Ok;
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( stream->pos + 3 < stream->size )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read )
|
|
|
39671f |
+ {
|
|
|
39671f |
+ if ( stream->read( stream, stream->pos, reads, 4L ) != 4L )
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ p = reads;
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ {
|
|
|
39671f |
+ p = stream->base + stream->pos;
|
|
|
39671f |
+ }
|
|
|
39671f |
+
|
|
|
39671f |
+ if ( p )
|
|
|
39671f |
+ result = FT_NEXT_LONG_LE( p );
|
|
|
39671f |
+ }
|
|
|
39671f |
+ else
|
|
|
39671f |
+ goto Fail;
|
|
|
39671f |
+
|
|
|
39671f |
+ stream->pos += 4;
|
|
|
39671f |
+
|
|
|
39671f |
+ return result;
|
|
|
39671f |
+
|
|
|
39671f |
+ Fail:
|
|
|
39671f |
+ *error = FT_Err_Invalid_Stream_Operation;
|
|
|
39671f |
+ FT_ERROR(( "FT_Stream_ReadLongLE:"
|
|
|
39671f |
+ " invalid i/o; pos = 0x%lx, size = 0x%lx\n",
|
|
|
39671f |
+ stream->pos, stream->size ));
|
|
|
39671f |
+
|
|
|
39671f |
return 0;
|
|
|
39671f |
}
|
|
|
39671f |
|