aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/base/ftpatent.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-21 15:22:51 +0000
committermarha <marha@users.sourceforge.net>2009-12-21 15:22:51 +0000
commit1ee02cd0419021c3d4950af2619da39c6e9c47f0 (patch)
treef5b61f7d9e151c7a64cff51399560ffb77800349 /freetype/src/base/ftpatent.c
parentd8432fdd4f13e9f9d1d44f5482faeb56562661a9 (diff)
downloadvcxsrv-1ee02cd0419021c3d4950af2619da39c6e9c47f0.tar.gz
vcxsrv-1ee02cd0419021c3d4950af2619da39c6e9c47f0.tar.bz2
vcxsrv-1ee02cd0419021c3d4950af2619da39c6e9c47f0.zip
Updated to freetype-2.3.11
Diffstat (limited to 'freetype/src/base/ftpatent.c')
-rw-r--r--freetype/src/base/ftpatent.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/freetype/src/base/ftpatent.c b/freetype/src/base/ftpatent.c
index 9f129d8f0..236d9a674 100644
--- a/freetype/src/base/ftpatent.c
+++ b/freetype/src/base/ftpatent.c
@@ -103,6 +103,7 @@
}
Exit:
+ FT_UNUSED( error );
FT_FRAME_EXIT();
return result;
}
@@ -113,7 +114,7 @@
FT_ULong tag )
{
FT_Stream stream = face->stream;
- FT_Error error;
+ FT_Error error = FT_Err_Ok;
FT_Service_SFNT_Table service;
FT_Bool result = FALSE;
@@ -122,15 +123,18 @@
if ( service )
{
- FT_ULong offset, size;
+ FT_UInt i = 0;
+ FT_ULong tag_i = 0, offset_i, length_i;
+ for ( i = 0; !error && tag_i != tag ; i++ )
+ error = service->table_info( face, i,
+ &tag_i, &offset_i, &length_i );
- error = service->table_info( face, tag, &offset, &size );
if ( error ||
- FT_STREAM_SEEK( offset ) )
+ FT_STREAM_SEEK( offset_i ) )
goto Exit;
- result = _tt_check_patents_in_range( stream, size );
+ result = _tt_check_patents_in_range( stream, length_i );
}
Exit: