diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2022-10-03 19:18:48 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2022-10-03 19:18:48 -0400 |
| commit | 1b6dce84f946fd784bf0882c8f6e20dc04a3110a (patch) | |
| tree | 4a285e0b03e0799d702813743f81e9f8c5016cda | |
| parent | 8faf57dd17088c37fa947fd565870648bbdbad18 (diff) | |
| download | freetype2-1b6dce84f946fd784bf0882c8f6e20dc04a3110a.tar.gz | |
* src/type1/t1afm.c (T1_Read_PFM): Set charmaps directly.
As with the previous commit, we can avoid the validation checks
of `FT_Set_Charmap` and set it directly when choosing from the
available list.
| -rw-r--r-- | src/type1/t1afm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 6009e9ee2..db608799c 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -178,7 +178,6 @@ /* temporarily. If we find no PostScript charmap, then just use */ /* the default and hope it is the right one. */ oldcharmap = t1_face->charmap; - charmap = NULL; for ( n = 0; n < t1_face->num_charmaps; n++ ) { @@ -186,9 +185,7 @@ /* check against PostScript pseudo platform */ if ( charmap->platform_id == 7 ) { - error = FT_Set_Charmap( t1_face, charmap ); - if ( error ) - goto Exit; + t1_face->charmap = charmap; break; } } @@ -209,10 +206,7 @@ kp++; } - if ( oldcharmap ) - error = FT_Set_Charmap( t1_face, oldcharmap ); - if ( error ) - goto Exit; + t1_face->charmap = oldcharmap; /* now, sort the kern pairs according to their glyph indices */ ft_qsort( fi->KernPairs, fi->NumKernPair, sizeof ( AFM_KernPairRec ), |