minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[base] Fix up Mac resource forks and dfonts. 

* src/base/ftobjs.c (IsMacResource): Assign `face_index`.
* src/base/ftmac.c (FT_New_Face_From_Suitcase): Ditto after rework.
This commit is contained in:
Alexei Podtelezhnikov 2024-01-06 19:22:36 -05:00
parent 4a85ff0b79
commit cc081d7cce
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/base/ftmac.c
View File

@ -812,6 +812,7 @@
ResourceIndex res_index;
Handle fond;
short num_faces_in_res;
FT_Long count;
if ( noErr != FT_FSPathMakeRes( pathname, &res_ref ) )
@ -821,8 +822,10 @@
if ( ResError() )
return FT_THROW( Cannot_Open_Resource );
res_index = 1;
num_faces_in_res = 0;
for ( res_index = 1; ; res_index++ )
count = face_index;
while ( count >= 0 )
{
short num_faces_in_fond;
@ -834,15 +837,21 @@
num_faces_in_fond = count_faces( fond, pathname );
num_faces_in_res += num_faces_in_fond;
if ( 0 <= face_index && face_index < num_faces_in_fond && error )
error = FT_New_Face_From_FOND( library, fond, face_index, aface );
if ( count < num_faces_in_fond )
error = FT_New_Face_From_FOND( library, fond, count, aface );
face_index -= num_faces_in_fond;
res_index++;
count -= num_faces_in_fond;
}
CloseResFile( res_ref );
if ( !error && aface && *aface )
(*aface)->num_faces = num_faces_in_res;
{
(*aface)->num_faces = num_faces_in_res;
(*aface)->face_index = face_index;
}
return error;
}

5
src/base/ftobjs.c
View File

@ -2302,7 +2302,10 @@
face_index_internal, aface );
FT_FREE( data_offsets );
if ( !error )
(*aface)->num_faces = count;
{
(*aface)->num_faces = count;
(*aface)->face_index = face_index_internal;
}
}
return error;