Commit 0417527d5b5abc3ee9426f31bd95209ca97502a5
2022-10-03T19:23:26
[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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index 950f659..3130b2a 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -650,7 +650,7 @@
af_cjk_metrics_check_digits( metrics, face );
}
- FT_Set_Charmap( face, oldmap );
+ face->charmap = oldmap;
return FT_Err_Ok;
}
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index c395f64..8ae8592 100644
--- a/src/autofit/afglobal.c
+++ b/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;
}
diff --git a/src/autofit/afindic.c b/src/autofit/afindic.c
index 5bf0b5f..e8b5027 100644
--- a/src/autofit/afindic.c
+++ b/src/autofit/afindic.c
@@ -49,8 +49,7 @@
af_cjk_metrics_check_digits( metrics, face );
}
- FT_Set_Charmap( face, oldmap );
-
+ face->charmap = oldmap;
return FT_Err_Ok;
}
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 7ebac25..9a8885d 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -1157,7 +1157,7 @@
}
Exit:
- FT_Set_Charmap( face, oldmap );
+ face->charmap = oldmap;
return error;
}