mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 01:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix OT_Indirect handling

Browse Source
This commit is contained in:
Chris Young 2015-01-29 00:08:03 +00:00
parent 4865b1603b
commit 9a6e339ab2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
amiga/os3support.c
View File

@ -47,7 +47,8 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl
{ {
BPTR fh = 0; BPTR fh = 0;
int64 size = 0; int64 size = 0;
struct TagItem *buffer, *ti; struct TagItem *ti;
UBYTE *buffer;
STRPTR fname, otagpath; STRPTR fname, otagpath;
struct BulletBase *BulletBase; struct BulletBase *BulletBase;
struct OutlineFont *of = NULL; struct OutlineFont *of = NULL;
@ -78,7 +79,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl
Close(fh); Close(fh);
/* The first tag is supposed to be OT_FileIdent and should equal 'size' */ /* The first tag is supposed to be OT_FileIdent and should equal 'size' */
struct TagItem *tag = buffer; struct TagItem *tag = (struct TagItem *)buffer;
if((tag->ti_Tag != OT_FileIdent) || (tag->ti_Data != (ULONG)size)) { if((tag->ti_Tag != OT_FileIdent) || (tag->ti_Data != (ULONG)size)) {
LOG(("Invalid OTAG file")); LOG(("Invalid OTAG file"));
FreeVec(buffer); FreeVec(buffer);
@ -87,9 +88,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl
} }
/* Relocate all the OT_Indirect tags */ /* Relocate all the OT_Indirect tags */
struct TagItem *tstate = buffer; while (ti = NextTagItem(&tag)) {
while (ti = NextTagItem(&tstate)) {
if(ti->ti_Tag & OT_Indirect) { if(ti->ti_Tag & OT_Indirect) {
ti->ti_Data += buffer; ti->ti_Data += buffer;
} }
@ -131,6 +130,8 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl
of->olf_EEngine = eengine; of->olf_EEngine = eengine;
of->OTagPath = otagpath; of->OTagPath = otagpath;
of->olf_OTagList = buffer; of->olf_OTagList = buffer;
return of;
} }
void CloseOutlineFont(struct OutlineFont *of, struct List *list) void CloseOutlineFont(struct OutlineFont *of, struct List *list)