[Git][freetype/freetype][master] 2 commits: * src/type1/t1afm.c (T1

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

1b6dce84

by Alexei Podtelezhnikov at 2022-10-03T19:18:48-04:00

* 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.

0417527d

by Alexei Podtelezhnikov at 2022-10-03T19:23:26-04:00

[autofit] Reset the face charmap directly.

There is no need to validate the original charmap in `FT_Set_Charmap`.
It can be reset directly.

* src/autofit/afglobal.c (af_face_globals_compute_style_coverage):
Use direct assignment.
* src/autofit/af{latin,cjk,indic}.c (af_latin_metrics_init): Ditto.

5 changed files:

src/autofit/afcjk.c
src/autofit/afglobal.c
src/autofit/afindic.c
src/autofit/aflatin.c
src/type1/t1afm.c

Changes:

src/autofit/afcjk.c


       af_cjk_metrics_check_digits( metrics, face );
     }
 
-    FT_Set_Charmap( face, oldmap );
+    face->charmap = oldmap;
     return FT_Err_Ok;
   }
 

src/autofit/afglobal.c

@@ -317,7 +317,7 @@
  #endif /* FT_DEBUG_LEVEL_TRACE */
 -    FT_Set_Charmap( face, old_charmap );
 +    face->charmap = old_charmap;
      return error;
+   }

src/autofit/afindic.c


       af_cjk_metrics_check_digits( metrics, face );
     }
 
-    FT_Set_Charmap( face, oldmap );
-
+    face->charmap = oldmap;
     return FT_Err_Ok;
   }
 

src/autofit/aflatin.c


     }
 
   Exit:
-    FT_Set_Charmap( face, oldmap );
+    face->charmap = oldmap;
     return error;
   }
 

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 ),

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] 2 commits: * src/type1/t1afm.c (T1_Read_PFM): Set charmaps directly.
Date:	Mon, 03 Oct 2022 23:29:56 +0000

[Git][freetype/freetype][master] 2 commits: * src/type1/t1afm.c (T1_Read

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

5 changed files:

Changes: