[Git][freetype/freetype][master] 2 commits: [woff2] Optimize table tagging.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• a577bbcb
  by Alexei Podtelezhnikov at 2021-10-27T22:24:27-04:00

  [woff2] Optimize table tagging.
  
  Fixes #1107.
  
  * include/freetype/internal/wofftypes.h (WOFF2_TableRec): Use
  32-bit tag.
  * src/sfnt/sfwoff2.c (compare_tags, find_table, woff2_open_font):
  Use 32-bit tag.
  * src/sfnt/woff2tags.[ch] (woff2_known_tags): Use static storage and
  return 32-bit tag.
  

• 793c0126
  by Alexei Podtelezhnikov at 2021-10-27T22:36:11-04:00

  [woff] Optimize table tagging.
  
  * include/freetype/internal/wofftypes.h (WOFF_TableRec): Use
  32-bit tag.
  * src/sfnt/sfwoff.c (woff_open_font): Use 32-bit tag.
  

5 changed files:

• include/freetype/internal/wofftypes.h
• src/sfnt/sfwoff.c
• src/sfnt/sfwoff2.c
• src/sfnt/woff2tags.c
• src/sfnt/woff2tags.h

Changes:

include/freetype/internal/wofftypes.h

---

...	...	@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
92	92	*/
93	93	typedef struct WOFF_TableRec_
94	94	{
95		- FT_ULong Tag; /* table ID */
	95	+ FT_Tag Tag; /* table ID */
96	96	FT_ULong Offset; /* table file offset */
97	97	FT_ULong CompLength; /* compressed table length */
98	98	FT_ULong OrigLength; /* uncompressed table length */
...	...	@@ -191,7 +191,7 @@ FT_BEGIN_HEADER
191	191	typedef struct WOFF2_TableRec_
192	192	{
193	193	FT_Byte FlagByte; /* table type and flags */
194		- FT_ULong Tag; /* table file offset */
	194	+ FT_Tag Tag; /* table file offset */
195	195	FT_ULong dst_length; /* uncompressed table length */
196	196	FT_ULong TransformLength; /* transformed length */
197	197

src/sfnt/sfwoff.c

---

...	...	@@ -109,7 +109,7 @@
109	109	FT_ULong sfnt_offset;
110	110
111	111	FT_Int nn;
112		- FT_ULong old_tag = 0;
	112	+ FT_Tag old_tag = 0;
113	113
114	114	static const FT_Frame_Field woff_header_fields[] =
115	115	{

src/sfnt/sfwoff2.c

---

...	...	@@ -108,8 +108,8 @@
108	108	WOFF2_Table table1 = *(WOFF2_Table*)a;
109	109	WOFF2_Table table2 = *(WOFF2_Table*)b;
110	110
111		- FT_ULong tag1 = table1->Tag;
112		- FT_ULong tag2 = table2->Tag;
	111	+ FT_Tag tag1 = table1->Tag;
	112	+ FT_Tag tag2 = table2->Tag;
113	113
114	114
115	115	if ( tag1 > tag2 )
...	...	@@ -356,7 +356,7 @@
356	356	static WOFF2_Table
357	357	find_table( WOFF2_Table* tables,
358	358	FT_UShort num_tables,
359		- FT_ULong tag )
	359	+ FT_Tag tag )
360	360	{
361	361	FT_Int i;
362	362
...	...	@@ -2216,7 +2216,7 @@
2216	2216	/* reject fonts that have multiple tables with the same tag */
2217	2217	for ( nn = 1; nn < woff2.num_tables; nn++ )
2218	2218	{
2219		- FT_ULong tag = indices[nn]->Tag;
	2219	+ FT_Tag tag = indices[nn]->Tag;
2220	2220
2221	2221
2222	2222	if ( tag == indices[nn - 1]->Tag )

src/sfnt/woff2tags.c

---

...	...	@@ -28,10 +28,10 @@
28	28	*
29	29	* for details.
30	30	*/
31		- FT_LOCAL_DEF( FT_ULong )
	31	+ FT_LOCAL_DEF( FT_Tag )
32	32	woff2_known_tags( FT_Byte index )
33	33	{
34		- const FT_ULong known_tags[63] =
	34	+ static const FT_Tag known_tags[63] =
35	35	{
36	36	FT_MAKE_TAG('c', 'm', 'a', 'p'), /* 0 */
37	37	FT_MAKE_TAG('h', 'e', 'a', 'd'), /* 1 */

src/sfnt/woff2tags.h

---

...	...	@@ -27,7 +27,7 @@
27	27	FT_BEGIN_HEADER
28	28
29	29
30		- FT_LOCAL( FT_ULong )
	30	+ FT_LOCAL( FT_Tag )
31	31	woff2_known_tags( FT_Byte index );
32	32
33	33

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.