[Git][freetype/freetype][master] Fix warnings in tracing messages for 32bit compilation.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• a20de84e
  by Werner Lemberg at 2023-08-12T11:47:41+02:00

  Fix warnings in tracing messages for 32bit compilation.
  
  Since we now require C99, use `%td` for `ptrdiff_t` and `%zu` for `size_t`.
  

8 changed files:

• src/autofit/afcjk.c
• src/autofit/aflatin.c
• src/psaux/cffdecode.c
• src/psaux/pshints.c
• src/psaux/t1decode.c
• src/smooth/ftgrays.c
• src/type1/t1load.c
• src/type42/t42parse.c

Changes:

src/autofit/afcjk.c

---

...	...	@@ -1634,7 +1634,7 @@
1634	1634
1635	1635	stem_edge->pos = base_edge->pos + fitted_width;
1636	1636
1637		- FT_TRACE5(( " CJKLINK: edge %ld @%d (opos=%.2f) linked to %.2f,"
	1637	+ FT_TRACE5(( " CJKLINK: edge %td @%d (opos=%.2f) linked to %.2f,"
1638	1638	" dist was %.2f, now %.2f\n",
1639	1639	stem_edge - hints->axis[dim].edges, stem_edge->fpos,
1640	1640	(double)stem_edge->opos / 64,
...	...	@@ -1858,7 +1858,7 @@
1858	1858	continue;
1859	1859
1860	1860	#ifdef FT_DEBUG_LEVEL_TRACE
1861		- FT_TRACE5(( " CJKBLUE: edge %ld @%d (opos=%.2f) snapped to %.2f,"
	1861	+ FT_TRACE5(( " CJKBLUE: edge %td @%d (opos=%.2f) snapped to %.2f,"
1862	1862	" was %.2f\n",
1863	1863	edge1 - edges, edge1->fpos, (double)edge1->opos / 64,
1864	1864	(double)blue->fit / 64, (double)edge1->pos / 64 ));
...	...	@@ -1922,7 +1922,7 @@
1922	1922	/* this should not happen, but it's better to be safe */
1923	1923	if ( edge2->blue_edge )
1924	1924	{
1925		- FT_TRACE5(( "ASSERTION FAILED for edge %ld\n", edge2-edges ));
	1925	+ FT_TRACE5(( "ASSERTION FAILED for edge %td\n", edge2 - edges ));
1926	1926
1927	1927	af_cjk_align_linked_edge( hints, dim, edge2, edge );
1928	1928	edge->flags |= AF_EDGE_DONE;

src/autofit/aflatin.c

---

...	...	@@ -1022,7 +1022,7 @@
1022	1022	{
1023	1023	*a = *b;
1024	1024	FT_TRACE5(( "blue zone overlap:"
1025		- " adjusting %s %ld to %ld\n",
	1025	+ " adjusting %s %td to %ld\n",
1026	1026	a_is_top ? "overshoot" : "reference",
1027	1027	blue_sorted[i] - axis->blues,
1028	1028	*a ));
...	...	@@ -2960,7 +2960,7 @@
2960	2960
2961	2961	stem_edge->pos = base_edge->pos + fitted_width;
2962	2962
2963		- FT_TRACE5(( " LINK: edge %ld (opos=%.2f) linked to %.2f,"
	2963	+ FT_TRACE5(( " LINK: edge %td (opos=%.2f) linked to %.2f,"
2964	2964	" dist was %.2f, now %.2f\n",
2965	2965	stem_edge - hints->axis[dim].edges,
2966	2966	(double)stem_edge->opos / 64, (double)stem_edge->pos / 64,
...	...	@@ -3085,13 +3085,13 @@
3085	3085
3086	3086	#ifdef FT_DEBUG_LEVEL_TRACE
3087	3087	if ( !anchor )
3088		- FT_TRACE5(( " BLUE_ANCHOR: edge %ld (opos=%.2f) snapped to %.2f,"
3089		- " was %.2f (anchor=edge %ld)\n",
	3088	+ FT_TRACE5(( " BLUE_ANCHOR: edge %td (opos=%.2f) snapped to %.2f,"
	3089	+ " was %.2f (anchor=edge %td)\n",
3090	3090	edge1 - edges,
3091	3091	(double)edge1->opos / 64, (double)blue->fit / 64,
3092	3092	(double)edge1->pos / 64, edge - edges ));
3093	3093	else
3094		- FT_TRACE5(( " BLUE: edge %ld (opos=%.2f) snapped to %.2f,"
	3094	+ FT_TRACE5(( " BLUE: edge %td (opos=%.2f) snapped to %.2f,"
3095	3095	" was %.2f\n",
3096	3096	edge1 - edges,
3097	3097	(double)edge1->opos / 64, (double)blue->fit / 64,
...	...	@@ -3141,7 +3141,7 @@
3141	3141	/* this should not happen, but it's better to be safe */
3142	3142	if ( edge2->blue_edge )
3143	3143	{
3144		- FT_TRACE5(( " ASSERTION FAILED for edge %ld\n", edge2 - edges ));
	3144	+ FT_TRACE5(( " ASSERTION FAILED for edge %td\n", edge2 - edges ));
3145	3145
3146	3146	af_latin_align_linked_edge( hints, dim, edge2, edge );
3147	3147	edge->flags |= AF_EDGE_DONE;
...	...	@@ -3209,7 +3209,7 @@
3209	3209	anchor = edge;
3210	3210	edge->flags |= AF_EDGE_DONE;
3211	3211
3212		- FT_TRACE5(( " ANCHOR: edge %ld (opos=%.2f) and %ld (opos=%.2f)"
	3212	+ FT_TRACE5(( " ANCHOR: edge %td (opos=%.2f) and %td (opos=%.2f)"
3213	3213	" snapped to %.2f and %.2f\n",
3214	3214	edge - edges, (double)edge->opos / 64,
3215	3215	edge2 - edges, (double)edge2->opos / 64,
...	...	@@ -3238,7 +3238,7 @@
3238	3238
3239	3239	if ( edge2->flags & AF_EDGE_DONE )
3240	3240	{
3241		- FT_TRACE5(( " ADJUST: edge %ld (pos=%.2f) moved to %.2f\n",
	3241	+ FT_TRACE5(( " ADJUST: edge %td (pos=%.2f) moved to %.2f\n",
3242	3242	edge - edges, (double)edge->pos / 64,
3243	3243	(double)( edge2->pos - cur_len ) / 64 ));
3244	3244
...	...	@@ -3279,7 +3279,7 @@
3279	3279	edge->pos = cur_pos1 - cur_len / 2;
3280	3280	edge2->pos = cur_pos1 + cur_len / 2;
3281	3281
3282		- FT_TRACE5(( " STEM: edge %ld (opos=%.2f) linked to %ld (opos=%.2f)"
	3282	+ FT_TRACE5(( " STEM: edge %td (opos=%.2f) linked to %td (opos=%.2f)"
3283	3283	" snapped to %.2f and %.2f\n",
3284	3284	edge - edges, (double)edge->opos / 64,
3285	3285	edge2 - edges, (double)edge2->opos / 64,
...	...	@@ -3310,7 +3310,7 @@
3310	3310	edge->pos = ( delta1 < delta2 ) ? cur_pos1 : cur_pos2;
3311	3311	edge2->pos = edge->pos + cur_len;
3312	3312
3313		- FT_TRACE5(( " STEM: edge %ld (opos=%.2f) linked to %ld (opos=%.2f)"
	3313	+ FT_TRACE5(( " STEM: edge %td (opos=%.2f) linked to %td (opos=%.2f)"
3314	3314	" snapped to %.2f and %.2f\n",
3315	3315	edge - edges, (double)edge->opos / 64,
3316	3316	edge2 - edges, (double)edge2->opos / 64,
...	...	@@ -3333,7 +3333,7 @@
3333	3333	if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
3334	3334	{
3335	3335	#ifdef FT_DEBUG_LEVEL_TRACE
3336		- FT_TRACE5(( " BOUND: edge %ld (pos=%.2f) moved to %.2f\n",
	3336	+ FT_TRACE5(( " BOUND: edge %td (pos=%.2f) moved to %.2f\n",
3337	3337	edge - edges,
3338	3338	(double)edge->pos / 64,
3339	3339	(double)edge[-1].pos / 64 ));
...	...	@@ -3435,7 +3435,7 @@
3435	3435	if ( delta < 64 + 16 )
3436	3436	{
3437	3437	af_latin_align_serif_edge( hints, edge->serif, edge );
3438		- FT_TRACE5(( " SERIF: edge %ld (opos=%.2f) serif to %ld (opos=%.2f)"
	3438	+ FT_TRACE5(( " SERIF: edge %td (opos=%.2f) serif to %td (opos=%.2f)"
3439	3439	" aligned to %.2f\n",
3440	3440	edge - edges, (double)edge->opos / 64,
3441	3441	edge->serif - edges, (double)edge->serif->opos / 64,
...	...	@@ -3445,9 +3445,9 @@
3445	3445	{
3446	3446	edge->pos = FT_PIX_ROUND( edge->opos );
3447	3447	anchor = edge;
3448		- FT_TRACE5(( " SERIF_ANCHOR: edge %ld (opos=%.2f)"
	3448	+ FT_TRACE5(( " SERIF_ANCHOR: edge %td (opos=%.2f)"
3449	3449	" snapped to %.2f\n",
3450		- edge-edges,
	3450	+ edge - edges,
3451	3451	(double)edge->opos / 64, (double)edge->pos / 64 ));
3452	3452	}
3453	3453	else
...	...	@@ -3474,8 +3474,8 @@
3474	3474	after->pos - before->pos,
3475	3475	after->opos - before->opos );
3476	3476
3477		- FT_TRACE5(( " SERIF_LINK1: edge %ld (opos=%.2f) snapped to %.2f"
3478		- " from %ld (opos=%.2f)\n",
	3477	+ FT_TRACE5(( " SERIF_LINK1: edge %td (opos=%.2f) snapped to %.2f"
	3478	+ " from %td (opos=%.2f)\n",
3479	3479	edge - edges, (double)edge->opos / 64,
3480	3480	(double)edge->pos / 64,
3481	3481	before - edges, (double)before->opos / 64 ));
...	...	@@ -3484,7 +3484,7 @@
3484	3484	{
3485	3485	edge->pos = anchor->pos +
3486	3486	( ( edge->opos - anchor->opos + 16 ) & ~31 );
3487		- FT_TRACE5(( " SERIF_LINK2: edge %ld (opos=%.2f)"
	3487	+ FT_TRACE5(( " SERIF_LINK2: edge %td (opos=%.2f)"
3488	3488	" snapped to %.2f\n",
3489	3489	edge - edges,
3490	3490	(double)edge->opos / 64, (double)edge->pos / 64 ));
...	...	@@ -3505,7 +3505,7 @@
3505	3505	if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
3506	3506	{
3507	3507	#ifdef FT_DEBUG_LEVEL_TRACE
3508		- FT_TRACE5(( " BOUND: edge %ld (pos=%.2f) moved to %.2f\n",
	3508	+ FT_TRACE5(( " BOUND: edge %td (pos=%.2f) moved to %.2f\n",
3509	3509	edge - edges,
3510	3510	(double)edge->pos / 64,
3511	3511	(double)edge[-1].pos / 64 ));
...	...	@@ -3526,7 +3526,7 @@
3526	3526	if ( edge->link && FT_ABS( edge->link->pos - edge[-1].pos ) > 16 )
3527	3527	{
3528	3528	#ifdef FT_DEBUG_LEVEL_TRACE
3529		- FT_TRACE5(( " BOUND: edge %ld (pos=%.2f) moved to %.2f\n",
	3529	+ FT_TRACE5(( " BOUND: edge %td (pos=%.2f) moved to %.2f\n",
3530	3530	edge - edges,
3531	3531	(double)edge->pos / 64,
3532	3532	(double)edge[1].pos / 64 ));

src/psaux/cffdecode.c

---

...	...	@@ -2153,7 +2153,7 @@
2153	2153	decoder->locals_bias );
2154	2154
2155	2155
2156		- FT_TRACE4(( " callsubr (idx %d, entering level %ld)\n",
	2156	+ FT_TRACE4(( " callsubr (idx %d, entering level %td)\n",
2157	2157	idx,
2158	2158	zone - decoder->zones + 1 ));
2159	2159
...	...	@@ -2197,7 +2197,7 @@
2197	2197	decoder->globals_bias );
2198	2198
2199	2199
2200		- FT_TRACE4(( " callgsubr (idx %d, entering level %ld)\n",
	2200	+ FT_TRACE4(( " callgsubr (idx %d, entering level %td)\n",
2201	2201	idx,
2202	2202	zone - decoder->zones + 1 ));
2203	2203
...	...	@@ -2236,7 +2236,7 @@
2236	2236	break;
2237	2237
2238	2238	case cff_op_return:
2239		- FT_TRACE4(( " return (leaving level %ld)\n",
	2239	+ FT_TRACE4(( " return (leaving level %td)\n",
2240	2240	decoder->zone - decoder->zones ));
2241	2241
2242	2242	if ( decoder->zone <= decoder->zones )

src/psaux/pshints.c

---

...	...	@@ -310,7 +310,7 @@
310	310	CF2_Hint hint = &hintmap->edge[i];
311	311
312	312
313		- FT_TRACE6(( " %3ld %7.2f %7.2f %5d %s%s%s%s\n",
	313	+ FT_TRACE6(( " %3zu %7.2f %7.2f %5d %s%s%s%s\n",
314	314	hint->index,
315	315	hint->csCoord / 65536.0,
316	316	hint->dsCoord / ( hint->scale * 1.0 ),

src/psaux/t1decode.c

---

...	...	@@ -520,7 +520,7 @@
520	520	#ifdef FT_DEBUG_LEVEL_TRACE
521	521	if ( bol )
522	522	{
523		- FT_TRACE5(( " (%ld)", decoder->top - decoder->stack ));
	523	+ FT_TRACE5(( " (%td)", decoder->top - decoder->stack ));
524	524	bol = FALSE;
525	525	}
526	526	#endif
...	...	@@ -1165,7 +1165,7 @@
1165	1165	if ( top - decoder->stack != num_args )
1166	1166	FT_TRACE0(( "t1_decoder_parse_charstrings:"
1167	1167	" too much operands on the stack"
1168		- " (seen %ld, expected %d)\n",
	1168	+ " (seen %td, expected %d)\n",
1169	1169	top - decoder->stack, num_args ));
1170	1170	break;
1171	1171	}

src/smooth/ftgrays.c

---

...	...	@@ -1934,7 +1934,7 @@ typedef ptrdiff_t FT_PtrDist;
1934	1934	if ( continued )
1935	1935	FT_Trace_Enable();
1936	1936
1937		- FT_TRACE7(( "band [%d..%d]: %ld cell%s remaining/\n",
	1937	+ FT_TRACE7(( "band [%d..%d]: %td cell%s remaining/\n",
1938	1938	ras.min_ey,
1939	1939	ras.max_ey,
1940	1940	ras.cell_null - ras.cell_free,

src/type1/t1load.c

---

...	...	@@ -1773,7 +1773,7 @@
1773	1773	*/
1774	1774
1775	1775	FT_TRACE0(( "parse_subrs: adjusting number of subroutines"
1776		- " (from %d to %ld)\n",
	1776	+ " (from %d to %zu)\n",
1777	1777	num_subrs,
1778	1778	( parser->root.limit - parser->root.cursor ) >> 3 ));
1779	1779	num_subrs = ( parser->root.limit - parser->root.cursor ) >> 3;
...	...	@@ -1948,7 +1948,7 @@
1948	1948	if ( num_glyphs > ( limit - cur ) >> 3 )
1949	1949	{
1950	1950	FT_TRACE0(( "parse_charstrings: adjusting number of glyphs"
1951		- " (from %d to %ld)\n",
	1951	+ " (from %d to %zu)\n",
1952	1952	num_glyphs, ( limit - cur ) >> 3 ));
1953	1953	num_glyphs = ( limit - cur ) >> 3;
1954	1954	}

src/type42/t42parse.c

---

...	...	@@ -872,7 +872,7 @@
872	872	if ( loader->num_glyphs > ( limit - parser->root.cursor ) >> 2 )
873	873	{
874	874	FT_TRACE0(( "t42_parse_charstrings: adjusting number of glyphs"
875		- " (from %d to %ld)\n",
	875	+ " (from %d to %zu)\n",
876	876	loader->num_glyphs,
877	877	( limit - parser->root.cursor ) >> 2 ));
878	878	loader->num_glyphs = ( limit - parser->root.cursor ) >> 2;

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