[Git][freetype/freetype-demos][master] TrueType mode v38 is gone.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs

Commits:

• 9843cd9d
  by Werner Lemberg at 2023-02-27T05:31:15+01:00

  TrueType mode v38 is gone.
  
  Synchronize with FreeType commit 'Hide Infinality.' from 2023-Feb-17.
  
  Both macros `TT_INTERPRETER_VERSION_38` and `TT_INTERPRETER_VERSION_40` have
  now the same value, leading to numerous compilation errors because we use
  these two macros as (different) case labels in switch statements.
  
  * src/ftbench.c (tt_interpreter_versions, header, usage, main): Don't use
  `TT_INTERPRETER_VERSION_38`.
  * src/ftcommon.c (FTDemo_Hinting_Engine_Change, FTDemo_Get_Info): Ditto.
  * src/ftdiff.c (ColumnStateRec, render_state_init, render_state_draw):
  Ditto.
  * src/ftmulti.c (tt_interpreter_versions, main): Ditto.
  * src/ttdebug.c (tt_interpreter_versions, Usage, main): Ditto.
  
  * src/ftinspect/engine/engine.hpp (EngineDefaultValues): Ditto.
  * src/ftinspect/engine/engine.cpp (Engine::queryEngine): Ditto.
  * src/ftinspect/models/customcomboboxmodels.hpp (HintingModeComboBoxModel):
  Ditto.
  * src/ftinspect/models/customcomboboxmodels.cpp
  (HintingModeComboBoxModel::HintingModeComboBoxModel): Ditto.
  * src/ftinspect/panels/settingpanel.cpp (SettingPanel::setDefaults): Ditto.
  

10 changed files:

• src/ftbench.c
• src/ftcommon.c
• src/ftdiff.c
• src/ftinspect/engine/engine.cpp
• src/ftinspect/engine/engine.hpp
• src/ftinspect/models/customcomboboxmodels.cpp
• src/ftinspect/models/customcomboboxmodels.hpp
• src/ftinspect/panels/settingpanel.cpp
• src/ftmulti.c
• src/ttdebug.c

Changes:

src/ftbench.c

---

...	...	@@ -159,7 +159,7 @@
159	159	static FT_Render_Mode render_mode = FT_RENDER_MODE_NORMAL;
160	160	static FT_Int32 load_flags = FT_LOAD_DEFAULT;
161	161
162		- static unsigned int tt_interpreter_versions[3];
	162	+ static unsigned int tt_interpreter_versions[2];
163	163	static int num_tt_interpreter_versions;
164	164	static unsigned int dflt_tt_interpreter_version;
165	165
...	...	@@ -856,9 +856,6 @@
856	856	case TT_INTERPRETER_VERSION_35:
857	857	hinting_engine = "v35";
858	858	break;
859		- case TT_INTERPRETER_VERSION_38:
860		- hinting_engine = "v38";
861		- break;
862	859	case TT_INTERPRETER_VERSION_40:
863	860	hinting_engine = "v40";
864	861	break;
...	...	@@ -968,17 +965,15 @@
968	965
969	966
970	967	/* we expect that at least one interpreter version is available */
971		- if ( num_tt_interpreter_versions == 2 )
	968	+ if ( num_tt_interpreter_versions == 1 )
972	969	snprintf( interpreter_versions, sizeof ( interpreter_versions ),
973		- "%u and %u",
974		- tt_interpreter_versions[0],
975		- tt_interpreter_versions[1] );
	970	+ "%u",
	971	+ tt_interpreter_versions[0]);
976	972	else
977	973	snprintf( interpreter_versions, sizeof ( interpreter_versions ),
978		- "%u, %u, and %u",
	974	+ "%u and %u",
979	975	tt_interpreter_versions[0],
980		- tt_interpreter_versions[1],
981		- tt_interpreter_versions[2] );
	976	+ tt_interpreter_versions[1] );
982	977
983	978	/* we expect that at least one hinting engine is available */
984	979	if ( num_ps_hinting_engines == 1 )
...	...	@@ -1070,8 +1065,7 @@
1070	1065	int compare_cached = 0;
1071	1066	int j;
1072	1067
1073		- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
1074		- TT_INTERPRETER_VERSION_38,
	1068	+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
1075	1069	TT_INTERPRETER_VERSION_40 };
1076	1070	unsigned int engines[2] = { FT_HINTING_FREETYPE,
1077	1071	FT_HINTING_ADOBE };
...	...	@@ -1098,7 +1092,7 @@
1098	1092	FT_Property_Get( lib,
1099	1093	"truetype",
1100	1094	"interpreter-version", &dflt_tt_interpreter_version );
1101		- for ( j = 0; j < 3; j++ )
	1095	+ for ( j = 0; j < 2; j++ )
1102	1096	{
1103	1097	error = FT_Property_Set( lib,
1104	1098	"truetype",

src/ftcommon.c

---

...	...	@@ -996,12 +996,6 @@
996	996	{
997	997	S1:
998	998	case TT_INTERPRETER_VERSION_35:
999		- prop = TT_INTERPRETER_VERSION_38;
1000		- if ( !FT_Property_Set( library, module_name,
1001		- "interpreter-version", &prop ) )
1002		- break;
1003		- /* fall through */
1004		- case TT_INTERPRETER_VERSION_38:
1005	999	prop = TT_INTERPRETER_VERSION_40;
1006	1000	if ( !FT_Property_Set( library, module_name,
1007	1001	"interpreter-version", &prop ) )
...	...	@@ -1084,9 +1078,6 @@
1084	1078	case TT_INTERPRETER_VERSION_35:
1085	1079	hinting_engine = "\372v35";
1086	1080	break;
1087		- case TT_INTERPRETER_VERSION_38:
1088		- hinting_engine = "\372v38";
1089		- break;
1090	1081	case TT_INTERPRETER_VERSION_40:
1091	1082	hinting_engine = "\372v40";
1092	1083	break;

src/ftdiff.c

---

...	...	@@ -181,7 +181,7 @@
181	181	unsigned int cff_hinting_engine;
182	182	unsigned int type1_hinting_engine;
183	183	unsigned int t1cid_hinting_engine;
184		- unsigned int tt_interpreter_versions[3];
	184	+ unsigned int tt_interpreter_versions[2];
185	185	int num_tt_interpreter_versions;
186	186	int tt_interpreter_version_idx;
187	187
...	...	@@ -229,14 +229,13 @@
229	229	FT_UInt type1_hinting_engine;
230	230	FT_UInt t1cid_hinting_engine;
231	231
232		- unsigned int tt_interpreter_versions[3] = { 0, 0, 0 };
	232	+ unsigned int tt_interpreter_versions[2] = { 0, 0 };
233	233	int num_tt_interpreter_versions = 0;
234	234	int tt_interpreter_version_idx = 0;
235	235
236	236	unsigned int dflt_tt_interpreter_version;
237	237	int i;
238		- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
239		- TT_INTERPRETER_VERSION_38,
	238	+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
240	239	TT_INTERPRETER_VERSION_40 };
241	240
242	241
...	...	@@ -267,7 +266,7 @@
267	266	FT_Property_Get( library,
268	267	"truetype",
269	268	"interpreter-version", &dflt_tt_interpreter_version );
270		- for ( i = 0; i < 3; i++ )
	269	+ for ( i = 0; i < 2; i++ )
271	270	{
272	271	error = FT_Property_Set( library,
273	272	"truetype",
...	...	@@ -295,8 +294,6 @@
295	294	tt_interpreter_versions[0];
296	295	state->columns[0].tt_interpreter_versions[1] =
297	296	tt_interpreter_versions[1];
298		- state->columns[0].tt_interpreter_versions[2] =
299		- tt_interpreter_versions[2];
300	297	state->columns[0].num_tt_interpreter_versions =
301	298	num_tt_interpreter_versions;
302	299	state->columns[0].tt_interpreter_version_idx =
...	...	@@ -845,9 +842,6 @@
845	842	case TT_INTERPRETER_VERSION_35:
846	843	extra = " (TT v35)";
847	844	break;
848		- case TT_INTERPRETER_VERSION_38:
849		- extra = " (TT v38)";
850		- break;
851	845	case TT_INTERPRETER_VERSION_40:
852	846	extra = " (TT v40)";
853	847	break;

src/ftinspect/engine/engine.cpp

---

...	...	@@ -981,23 +981,21 @@ Engine::queryEngine()
981	981	// No TrueType engine.
982	982	engineDefaults_.ttInterpreterVersionDefault = -1;
983	983	engineDefaults_.ttInterpreterVersionOther = -1;
984		- engineDefaults_.ttInterpreterVersionOther1 = -1;
985	984	}
986	985	else
987	986	{
988	987	int interpreters[] =
989	988	{
990	989	TT_INTERPRETER_VERSION_35,
991		- TT_INTERPRETER_VERSION_38,
992	990	TT_INTERPRETER_VERSION_40
993	991	};
994	992
995	993	int i;
996		- for (i = 0; i < 3; i++)
	994	+ for (i = 0; i < 2; i++)
997	995	if (engineDefaults_.ttInterpreterVersionDefault == interpreters[i])
998	996	break;
999	997
1000		- engineDefaults_.ttInterpreterVersionOther = interpreters[(i + 1) % 3];
	998	+ engineDefaults_.ttInterpreterVersionOther = interpreters[(i + 1) % 2];
1001	999
1002	1000	error = FT_Property_Set(library_,
1003	1001	"truetype",
...	...	@@ -1006,15 +1004,6 @@ Engine::queryEngine()
1006	1004	if (error)
1007	1005	engineDefaults_.ttInterpreterVersionOther = -1;
1008	1006
1009		- engineDefaults_.ttInterpreterVersionOther1 = interpreters[(i + 2) % 3];
1010		-
1011		- error = FT_Property_Set(library_,
1012		- "truetype",
1013		- "interpreter-version",
1014		- &engineDefaults_.ttInterpreterVersionOther1);
1015		- if (error)
1016		- engineDefaults_.ttInterpreterVersionOther1 = -1;
1017		-
1018	1007	// Reset.
1019	1008	FT_Property_Set(library_,
1020	1009	"truetype",

src/ftinspect/engine/engine.hpp

---

...	...	@@ -63,7 +63,6 @@ public:
63	63
64	64	int ttInterpreterVersionDefault;
65	65	int ttInterpreterVersionOther;
66		- int ttInterpreterVersionOther1;
67	66	};
68	67
69	68	//////// Ctors & Dtors

src/ftinspect/models/customcomboboxmodels.cpp

---

...	...	@@ -29,13 +29,6 @@ HintingModeComboBoxModel::HintingModeComboBoxModel(QObject* parent)
29	29	false, false,
30	30	"TrueType v35"
31	31	};
32		- items_[HintingMode_TrueType_v38] = {
33		- HintingEngineType_TrueType,
34		- HintingMode_TrueType_v38,
35		- TT_INTERPRETER_VERSION_38,
36		- false, false,
37		- "TrueType v38"
38		- };
39	32	items_[HintingMode_TrueType_v40] = {
40	33	HintingEngineType_TrueType,
41	34	HintingMode_TrueType_v40,

src/ftinspect/models/customcomboboxmodels.hpp

---

...	...	@@ -64,7 +64,6 @@ public:
64	64	enum HintingMode : int
65	65	{
66	66	HintingMode_TrueType_v35 = 0,
67		- HintingMode_TrueType_v38,
68	67	HintingMode_TrueType_v40,
69	68	HintingMode_CFF_FreeType,
70	69	HintingMode_CFF_Adobe

src/ftinspect/panels/settingpanel.cpp

---

...	...	@@ -758,8 +758,7 @@ SettingPanel::setDefaults()
758	758
759	759	hintingModeComboBoxModel_->setSupportedModes(
760	760	{ defaults.ttInterpreterVersionDefault,
761		- defaults.ttInterpreterVersionOther,
762		- defaults.ttInterpreterVersionOther1 },
	761	+ defaults.ttInterpreterVersionOther },
763	762	{ defaults.cffHintingEngineDefault,
764	763	defaults.cffHintingEngineOther });
765	764

src/ftmulti.c

---

...	...	@@ -74,7 +74,7 @@
74	74	static unsigned int cff_hinting_engine;
75	75	static unsigned int type1_hinting_engine;
76	76	static unsigned int t1cid_hinting_engine;
77		- static unsigned int tt_interpreter_versions[3];
	77	+ static unsigned int tt_interpreter_versions[2];
78	78	static unsigned int num_tt_interpreter_versions;
79	79	static unsigned int tt_interpreter_version_idx;
80	80
...	...	@@ -911,8 +911,7 @@
911	911	unsigned int n;
912	912
913	913	unsigned int dflt_tt_interpreter_version;
914		- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
915		- TT_INTERPRETER_VERSION_38,
	914	+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
916	915	TT_INTERPRETER_VERSION_40 };
917	916	const char* execname = ft_basename( argv[0] );
918	917
...	...	@@ -937,7 +936,7 @@
937	936	FT_Property_Get( library,
938	937	"truetype",
939	938	"interpreter-version", &dflt_tt_interpreter_version );
940		- for ( n = 0; n < 3; n++ )
	939	+ for ( n = 0; n < 2; n++ )
941	940	{
942	941	error = FT_Property_Set( library,
943	942	"truetype",
...	...	@@ -1205,10 +1204,8 @@
1205	1204	: "CID Type 1 (Adobe)" );
1206	1205	else if ( !strcmp( font_format, "TrueType" ) )
1207	1206	format_str = ( tt_ver == TT_INTERPRETER_VERSION_35
1208		- ? "TrueType (v35)"
1209		- : ( tt_ver == TT_INTERPRETER_VERSION_38
1210		- ? "TrueType (v38)"
1211		- : "TrueType (v40)" ) );
	1207	+ ? "TrueType (v35)"
	1208	+ : "TrueType (v40)" );
1212	1209
1213	1210	strbuf_reset( header );
1214	1211	strbuf_format(

src/ttdebug.c

---

...	...	@@ -85,7 +85,7 @@
85	85	static FT_Fixed* requested_pos;
86	86	static unsigned int requested_cnt;
87	87
88		- static unsigned int tt_interpreter_versions[3];
	88	+ static unsigned int tt_interpreter_versions[2];
89	89	static int num_tt_interpreter_versions;
90	90	static unsigned int dflt_tt_interpreter_version;
91	91
...	...	@@ -2860,17 +2860,15 @@
2860	2860
2861	2861
2862	2862	/* we expect that at least one interpreter version is available */
2863		- if ( num_tt_interpreter_versions == 2 )
	2863	+ if ( num_tt_interpreter_versions == 1 )
2864	2864	snprintf( versions, sizeof ( versions ),
2865		- "%d and %d",
2866		- tt_interpreter_versions[0],
2867		- tt_interpreter_versions[1] );
	2865	+ "%d",
	2866	+ tt_interpreter_versions[0] );
2868	2867	else
2869	2868	snprintf( versions, sizeof ( versions ),
2870		- "%d, %d, and %d",
	2869	+ "%d and %d",
2871	2870	tt_interpreter_versions[0],
2872		- tt_interpreter_versions[1],
2873		- tt_interpreter_versions[2] );
	2871	+ tt_interpreter_versions[1] );
2874	2872
2875	2873	fprintf( stderr,
2876	2874	"\n"
...	...	@@ -2916,8 +2914,7 @@
2916	2914
2917	2915	int i;
2918	2916	const char* execname;
2919		- unsigned int versions[3] = { TT_INTERPRETER_VERSION_35,
2920		- TT_INTERPRETER_VERSION_38,
	2917	+ unsigned int versions[2] = { TT_INTERPRETER_VERSION_35,
2921	2918	TT_INTERPRETER_VERSION_40 };
2922	2919	int version;
2923	2920	int face_index = 0;
...	...	@@ -2955,7 +2952,7 @@
2955	2952	FT_Property_Get( library,
2956	2953	"truetype",
2957	2954	"interpreter-version", &dflt_tt_interpreter_version );
2958		- for ( i = 0; i < 3; i++ )
	2955	+ for ( i = 0; i < 2; i++ )
2959	2956	{
2960	2957	error = FT_Property_Set( library,
2961	2958	"truetype",

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help