[Git][freetype/freetype][master] 2 commits: * src/*: Don't use more than one '\n' in `FT_TRACE` and `FT_ERROR`.

[Werner Lemberg]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• d924a66a
  by Werner Lemberg at 2021-02-04T07:46:46+01:00

  * src/*: Don't use more than one '\n' in `FT_TRACE` and `FT_ERROR`.
  
  This ensures good logging output, with all lines having a proper
  prefix (if requested).
  
  This is a continuation of a similar patch from 2020-12-02, which
  missed some locations.
  

• 947e4752
  by Werner Lemberg at 2021-02-04T10:19:26+01:00

  [base] Fix Netpbm tracing message.
  
  * src/base/ftobjs.c (FT_Render_Glyph_Internal): Don't emit Netpbm
  warning if there is nothing to output.
  

20 changed files:

• ChangeLog
• src/base/ftobjs.c
• src/cache/ftcbasic.c
• src/cff/cffdrivr.c
• src/cff/cffload.c
• src/cff/cffobjs.c
• src/cff/cffparse.c
• src/cid/cidload.c
• src/pcf/pcfread.c
• src/pfr/pfrsbit.c
• src/psaux/pshints.c
• src/psaux/psobjs.c
• src/sfnt/sfdriver.c
• src/sfnt/ttload.c
• src/sfnt/ttsbit.c
• src/truetype/ttgxvar.c
• src/truetype/ttobjs.c
• src/truetype/ttpload.c
• src/type1/t1load.c
• src/winfonts/winfnt.c

Changes:

ChangeLog

---

	1	+2021-02-04 Werner Lemberg <wl@gnu.org>
	2	+
	3	+ [base] Fix Netpbm tracing message.
	4	+
	5	+ * src/base/ftobjs.c (FT_Render_Glyph_Internal): Don't emit Netpbm
	6	+ warning if there is nothing to output.
	7	+
	8	+2021-02-04 Werner Lemberg <wl@gnu.org>
	9	+
	10	+ * src/*: Don't use more than one '\n' in `FT_TRACE` and `FT_ERROR`.
	11	+
	12	+ This ensures good logging output, with all lines having a proper
	13	+ prefix (if requested).
	14	+
	15	+ This is a continuation of a similar patch from 2020-12-02, which
	16	+ missed some locations.
	17	+
1	18	2021-02-03 Alexei Podtelezhnikov <apodtele@gmail.com>
2	19
3	20	* builds/unix/configure.raw [mmap]: Restore default path.

src/base/ftobjs.c

---

...	...	@@ -4733,11 +4733,11 @@
4733	4733
4734	4734	/* we use FT_TRACE7 in this block */
4735	4735	if ( !error &&
4736		- ft_trace_levels[trace_checksum] >= 7 )
	4736	+ ft_trace_levels[trace_checksum] >= 7 &&
	4737	+ slot->bitmap.buffer )
4737	4738	{
4738	4739	if ( slot->bitmap.rows < 128U &&
4739		- slot->bitmap.width < 128U &&
4740		- slot->bitmap.buffer )
	4740	+ slot->bitmap.width < 128U )
4741	4741	{
4742	4742	int rows = (int)slot->bitmap.rows;
4743	4743	int width = (int)slot->bitmap.width;

src/cache/ftcbasic.c

---

...	...	@@ -108,12 +108,16 @@
108	108	if ( error || !face )
109	109	return result;
110	110
	111	+#ifdef FT_DEBUG_LEVEL_TRACE
111	112	if ( (FT_ULong)face->num_glyphs > FT_UINT_MAX || 0 > face->num_glyphs )
	113	+ {
112	114	FT_TRACE1(( "ftc_basic_family_get_count:"
113		- " the number of glyphs in this face is %ld,\n"
114		- " "
115		- " which is too much and thus truncated\n",
	115	+ " the number of glyphs in this face is %ld,\n",
116	116	face->num_glyphs ));
	117	+ FT_TRACE1(( " "
	118	+ " which is too much and thus truncated\n" ));
	119	+ }
	120	+#endif
117	121
118	122	if ( !error )
119	123	result = (FT_UInt)face->num_glyphs;

src/cff/cffdrivr.c

---

...	...	@@ -345,8 +345,8 @@
345	345	else
346	346	{
347	347	FT_ERROR(( "cff_get_glyph_name:"
348		- " cannot get glyph name from a CFF2 font\n"
349		- " "
	348	+ " cannot get glyph name from a CFF2 font\n" ));
	349	+ FT_ERROR(( " "
350	350	" without the `psnames' module\n" ));
351	351	error = FT_THROW( Missing_Module );
352	352	goto Exit;
...	...	@@ -356,8 +356,8 @@
356	356	if ( !font->psnames )
357	357	{
358	358	FT_ERROR(( "cff_get_glyph_name:"
359		- " cannot get glyph name from CFF & CEF fonts\n"
360		- " "
	359	+ " cannot get glyph name from CFF & CEF fonts\n" ));
	360	+ FT_ERROR(( " "
361	361	" without the `psnames' module\n" ));
362	362	error = FT_THROW( Missing_Module );
363	363	goto Exit;
...	...	@@ -412,8 +412,8 @@
412	412	else
413	413	{
414	414	FT_ERROR(( "cff_get_name_index:"
415		- " cannot get glyph index from a CFF2 font\n"
416		- " "
	415	+ " cannot get glyph index from a CFF2 font\n" ));
	416	+ FT_ERROR(( " "
417	417	" without the `psnames' module\n" ));
418	418	return 0;
419	419	}

src/cff/cffload.c

---

...	...	@@ -2361,8 +2361,8 @@
2361	2361	if ( font->name_index.count > 1 )
2362	2362	{
2363	2363	FT_ERROR(( "cff_font_load:"
2364		- " invalid CFF font with multiple subfonts\n"
2365		- " "
	2364	+ " invalid CFF font with multiple subfonts\n" ));
	2365	+ FT_ERROR(( " "
2366	2366	" in SFNT wrapper\n" ));
2367	2367	error = FT_THROW( Invalid_File_Format );
2368	2368	goto Exit;

src/cff/cffobjs.c

---

...	...	@@ -659,8 +659,8 @@
659	659	if ( dict->cid_registry == 0xFFFFU && !psnames )
660	660	{
661	661	FT_ERROR(( "cff_face_init:"
662		- " cannot open CFF & CEF fonts\n"
663		- " "
	662	+ " cannot open CFF & CEF fonts\n" ));
	663	+ FT_ERROR(( " "
664	664	" without the `psnames' module\n" ));
665	665	error = FT_THROW( Missing_Module );
666	666	goto Exit;

src/cff/cffparse.c

---

...	...	@@ -713,9 +713,10 @@
713	713	( max_scaling - min_scaling ) > 9 )
714	714	{
715	715	FT_TRACE1(( "cff_parse_font_matrix:"
716		- " strange scaling values (minimum %ld, maximum %ld),\n"
717		- " "
718		- " using default matrix\n", min_scaling, max_scaling ));
	716	+ " strange scaling values (minimum %ld, maximum %ld),\n",
	717	+ min_scaling, max_scaling ));
	718	+ FT_TRACE1(( " "
	719	+ " using default matrix\n" ));
719	720	goto Unlikely;
720	721	}
721	722

src/cid/cidload.c

---

...	...	@@ -843,8 +843,8 @@
843	843	if ( cid->fd_bytes > 4 || cid->gd_bytes > 4 )
844	844	{
845	845	FT_ERROR(( "cid_face_open:"
846		- " Values of `FDBytes' or `GDBytes' larger than 4\n"
847		- " "
	846	+ " Values of `FDBytes' or `GDBytes' larger than 4\n" ));
	847	+ FT_ERROR(( " "
848	848	" are not supported\n" ));
849	849	error = FT_THROW( Invalid_File_Format );
850	850	goto Exit;

src/pcf/pcfread.c

---

...	...	@@ -1087,8 +1087,8 @@ THE SOFTWARE.
1087	1087	if ( defaultCharEncodingOffset == 0xFFFF )
1088	1088	{
1089	1089	FT_TRACE0(( "pcf_get_encodings:"
1090		- " No glyph for default character,\n"
1091		- " "
	1090	+ " No glyph for default character,\n" ));
	1091	+ FT_TRACE0(( " "
1092	1092	" setting it to the first glyph of the font\n" ));
1093	1093	defaultCharEncodingOffset = 1;
1094	1094	}
...	...	@@ -1099,8 +1099,8 @@ THE SOFTWARE.
1099	1099	if ( defaultCharEncodingOffset >= face->nmetrics )
1100	1100	{
1101	1101	FT_TRACE0(( "pcf_get_encodings:"
1102		- " Invalid glyph index for default character,\n"
1103		- " "
	1102	+ " Invalid glyph index for default character,\n" ));
	1103	+ FT_TRACE0(( " "
1104	1104	" setting it to the first glyph of the font\n" ));
1105	1105	defaultCharEncodingOffset = 1;
1106	1106	}
...	...	@@ -1232,16 +1232,16 @@ THE SOFTWARE.
1232	1232	}
1233	1233
1234	1234	FT_TRACE5(( " noOverlap=%s, constantMetrics=%s,"
1235		- " terminalFont=%s, constantWidth=%s\n"
1236		- " inkInside=%s, inkMetrics=%s, drawDirection=%s\n"
1237		- " fontAscent=%ld, fontDescent=%ld, maxOverlap=%ld\n",
	1235	+ " terminalFont=%s, constantWidth=%s\n",
1238	1236	accel->noOverlap ? "yes" : "no",
1239	1237	accel->constantMetrics ? "yes" : "no",
1240	1238	accel->terminalFont ? "yes" : "no",
1241		- accel->constantWidth ? "yes" : "no",
	1239	+ accel->constantWidth ? "yes" : "no" ));
	1240	+ FT_TRACE5(( " inkInside=%s, inkMetrics=%s, drawDirection=%s\n",
1242	1241	accel->inkInside ? "yes" : "no",
1243	1242	accel->inkMetrics ? "yes" : "no",
1244		- accel->drawDirection ? "RTL" : "LTR",
	1243	+ accel->drawDirection ? "RTL" : "LTR" ));
	1244	+ FT_TRACE5(( " fontAscent=%ld, fontDescent=%ld, maxOverlap=%ld\n",
1245	1245	accel->fontAscent,
1246	1246	accel->fontDescent,
1247	1247	accel->maxOverlap ));

src/pfr/pfrsbit.c

---

...	...	@@ -310,8 +310,8 @@
310	310	if ( lim > limit )
311	311	{
312	312	FT_TRACE0(( "pfr_lookup_bitmap_data:"
313		- " number of bitmap records too large,\n"
314		- " "
	313	+ " number of bitmap records too large,\n" ));
	314	+ FT_TRACE0(( " "
315	315	" thus ignoring all bitmaps in this strike\n" ));
316	316	*flags &= ~PFR_BITMAP_VALID_CHARCODES;
317	317	}
...	...	@@ -328,8 +328,8 @@
328	328	if ( (FT_Long)code <= prev_code )
329	329	{
330	330	FT_TRACE0(( "pfr_lookup_bitmap_data:"
331		- " bitmap records are not sorted,\n"
332		- " "
	331	+ " bitmap records are not sorted,\n" ));
	332	+ FT_TRACE0(( " "
333	333	" thus ignoring all bitmaps in this strike\n" ));
334	334	*flags &= ~PFR_BITMAP_VALID_CHARCODES;
335	335	break;

src/psaux/pshints.c

---

...	...	@@ -1022,10 +1022,17 @@
1022	1022	}
1023	1023	}
1024	1024
1025		- FT_TRACE6(( "%s\n", initialMap ? "flags: [p]air [g]host [t]op"
1026		- " [b]ottom [L]ocked [S]ynthetic\n"
1027		- "Initial hintmap"
1028		- : "Hints:" ));
	1025	+#ifdef FT_DEBUG_LEVEL_TRACE
	1026	+ if ( initialMap )
	1027	+ {
	1028	+ FT_TRACE6(( "flags: [p]air [g]host [t]op"
	1029	+ " [b]ottom [L]ocked [S]ynthetic\n" ));
	1030	+ FT_TRACE6(( "Initial hintmap" ));
	1031	+ }
	1032	+ else
	1033	+ FT_TRACE6(( "Hints:" ));
	1034	+#endif
	1035	+
1029	1036	cf2_hintmap_dump( hintmap );
1030	1037
1031	1038	/*

src/psaux/psobjs.c

---

...	...	@@ -595,10 +595,10 @@
595	595	if ( cur < limit && cur == parser->cursor )
596	596	{
597	597	FT_ERROR(( "ps_parser_skip_PS_token:"
598		- " current token is `%c' which is self-delimiting\n"
599		- " "
600		- " but invalid at this point\n",
	598	+ " current token is `%c' which is self-delimiting\n",
601	599	*cur ));
	600	+ FT_ERROR(( " "
	601	+ " but invalid at this point\n" ));
602	602
603	603	error = FT_THROW( Invalid_File_Format );
604	604	}
...	...	@@ -1175,8 +1175,8 @@
1175	1175	else
1176	1176	{
1177	1177	FT_ERROR(( "ps_parser_load_field:"
1178		- " expected a name or string\n"
1179		- " "
	1178	+ " expected a name or string\n" ));
	1179	+ FT_ERROR(( " "
1180	1180	" but found token of type %d instead\n",
1181	1181	token.type ));
1182	1182	error = FT_THROW( Invalid_File_Format );
...	...	@@ -1258,14 +1258,14 @@
1258	1258	if ( result < 0 || (FT_UInt)result < max_objects )
1259	1259	{
1260	1260	FT_ERROR(( "ps_parser_load_field:"
1261		- " expected %d integer%s in the %s subarray\n"
1262		- " "
1263		- " of /FontBBox in the /Blend dictionary\n",
	1261	+ " expected %d integer%s in the %s subarray\n",
1264	1262	max_objects, max_objects > 1 ? "s" : "",
1265	1263	i == 0 ? "first"
1266	1264	: ( i == 1 ? "second"
1267	1265	: ( i == 2 ? "third"
1268	1266	: "fourth" ) ) ));
	1267	+ FT_ERROR(( " "
	1268	+ " of /FontBBox in the /Blend dictionary\n" ));
1269	1269	error = FT_THROW( Invalid_File_Format );
1270	1270
1271	1271	FT_FREE( temp );

src/sfnt/sfdriver.c

---

...	...	@@ -868,8 +868,8 @@
868	868	result[len] = '\0';
869	869
870	870	FT_TRACE0(( "sfnt_get_var_ps_name:"
871		- " Shortening variation PS name prefix\n"
872		- " "
	871	+ " Shortening variation PS name prefix\n" ));
	872	+ FT_TRACE0(( " "
873	873	" to %d characters\n", len ));
874	874	}
875	875
...	...	@@ -920,8 +920,8 @@
920	920	if ( !subfamily_name )
921	921	{
922	922	FT_TRACE1(( "sfnt_get_var_ps_name:"
923		- " can't construct named instance PS name;\n"
924		- " "
	923	+ " can't construct named instance PS name;\n" ));
	924	+ FT_TRACE1(( " "
925	925	" trying to construct normal instance PS name\n" ));
926	926	goto construct_instance_name;
927	927	}

src/sfnt/ttload.c

---

...	...	@@ -795,8 +795,8 @@
795	795	if ( maxProfile->maxTwilightPoints > ( 0xFFFFU - 4 ) )
796	796	{
797	797	FT_TRACE0(( "tt_face_load_maxp:"
798		- " too much twilight points in `maxp' table;\n"
799		- " "
	798	+ " too much twilight points in `maxp' table;\n" ));
	799	+ FT_TRACE0(( " "
800	800	" some glyphs might be rendered incorrectly\n" ));
801	801
802	802	maxProfile->maxTwilightPoints = 0xFFFFU - 4;

src/sfnt/ttsbit.c

---

...	...	@@ -172,13 +172,17 @@
172	172	goto Exit;
173	173	}
174	174
	175	+#ifdef FT_DEBUG_LEVEL_TRACE
175	176	/* we currently don't support bit 1; however, it is better to */
176	177	/* draw at least something... */
177	178	if ( flags == 3 )
	179	+ {
178	180	FT_TRACE1(( "tt_face_load_sbit_strikes:"
179		- " sbix overlay not supported yet\n"
180		- " "
	181	+ " sbix overlay not supported yet\n" ));
	182	+ FT_TRACE1(( " "
181	183	" expect bad rendering results\n" ));
	184	+ }
	185	+#endif
182	186
183	187	/*
184	188	* Count the number of strikes available in the table. We are a bit
...	...	@@ -240,8 +244,8 @@
240	244	if ( !face->ebdt_size )
241	245	{
242	246	FT_TRACE2(( "tt_face_load_sbit_strikes:"
243		- " no embedded bitmap data table found;\n"
244		- " "
	247	+ " no embedded bitmap data table found;\n" ));
	248	+ FT_TRACE2(( " "
245	249	" resetting number of strikes to zero\n" ));
246	250	face->sbit_num_strikes = 0;
247	251	}
...	...	@@ -345,8 +349,8 @@
345	349	if ( metrics->ascender == 0 )
346	350	{
347	351	FT_TRACE2(( "tt_face_load_strike_metrics:"
348		- " sanitizing invalid ascender and descender\n"
349		- " "
	352	+ " sanitizing invalid ascender and descender\n" ));
	353	+ FT_TRACE2(( " "
350	354	" values for strike %ld (%dppem, %dppem)\n",
351	355	strike_index,
352	356	metrics->x_ppem, metrics->y_ppem ));
...	...	@@ -374,8 +378,8 @@
374	378	if ( metrics->height == 0 )
375	379	{
376	380	FT_TRACE2(( "tt_face_load_strike_metrics:"
377		- " sanitizing invalid height value\n"
378		- " "
	381	+ " sanitizing invalid height value\n" ));
	382	+ FT_TRACE2(( " "
379	383	" for strike (%d, %d)\n",
380	384	metrics->x_ppem, metrics->y_ppem ));
381	385	metrics->height = metrics->y_ppem * 64;

src/truetype/ttgxvar.c

---

...	...	@@ -487,8 +487,8 @@
487	487	if ( itemStore->axisCount != (FT_Long)blend->mmvar->num_axis )
488	488	{
489	489	FT_TRACE2(( "ft_var_load_item_variation_store:"
490		- " number of axes in item variation store\n"
491		- " "
	490	+ " number of axes in item variation store\n" ));
	491	+ FT_TRACE2(( " "
492	492	" and `fvar' table are different\n" ));
493	493	error = FT_THROW( Invalid_Table );
494	494	goto Exit;

src/truetype/ttobjs.c

---

...	...	@@ -712,8 +712,8 @@
712	712	tt_check_single_notdef( ttface ) )
713	713	{
714	714	FT_TRACE5(( "tt_face_init:"
715		- " Only the `.notdef' glyph has an outline.\n"
716		- " "
	715	+ " Only the `.notdef' glyph has an outline.\n" ));
	716	+ FT_TRACE5(( " "
717	717	" Resetting scalable flag to FALSE.\n" ));
718	718
719	719	ttface->face_flags &= ~FT_FACE_FLAG_SCALABLE;

src/truetype/ttpload.c

---

...	...	@@ -237,10 +237,11 @@
237	237	if ( pos1 > face->glyf_len )
238	238	{
239	239	FT_TRACE1(( "tt_face_get_location:"
240		- " too large offset (0x%08lx) found for glyph index %d,\n"
241		- " "
	240	+ " too large offset (0x%08lx) found for glyph index %d,\n",
	241	+ pos1, gindex ));
	242	+ FT_TRACE1(( " "
242	243	" exceeding the end of `glyf' table (0x%08lx)\n",
243		- pos1, gindex, face->glyf_len ));
	244	+ face->glyf_len ));
244	245	*asize = 0;
245	246	return 0;
246	247	}
...	...	@@ -251,19 +252,21 @@
251	252	if ( gindex == face->num_locations - 2 )
252	253	{
253	254	FT_TRACE1(( "tt_face_get_location:"
254		- " too large size (%ld bytes) found for glyph index %d,\n"
255		- " "
	255	+ " too large size (%ld bytes) found for glyph index %d,\n",
	256	+ pos2 - pos1, gindex ));
	257	+ FT_TRACE1(( " "
256	258	" truncating at the end of `glyf' table to %ld bytes\n",
257		- pos2 - pos1, gindex, face->glyf_len - pos1 ));
	259	+ face->glyf_len - pos1 ));
258	260	pos2 = face->glyf_len;
259	261	}
260	262	else
261	263	{
262	264	FT_TRACE1(( "tt_face_get_location:"
263		- " too large offset (0x%08lx) found for glyph index %d,\n"
264		- " "
	265	+ " too large offset (0x%08lx) found for glyph index %d,\n",
	266	+ pos2, gindex + 1 ));
	267	+ FT_TRACE1(( " "
265	268	" exceeding the end of `glyf' table (0x%08lx)\n",
266		- pos2, gindex + 1, face->glyf_len ));
	269	+ face->glyf_len ));
267	270	*asize = 0;
268	271	return 0;
269	272	}

src/type1/t1load.c

---

...	...	@@ -1122,8 +1122,8 @@
1122	1122	else if ( blend->num_designs != (FT_UInt)num_designs )
1123	1123	{
1124	1124	FT_ERROR(( "parse_weight_vector:"
1125		- " /BlendDesignPosition and /WeightVector have\n"
1126		- " "
	1125	+ " /BlendDesignPosition and /WeightVector have\n" ));
	1126	+ FT_ERROR(( " "
1127	1127	" different number of elements\n" ));
1128	1128	error = FT_THROW( Invalid_File_Format );
1129	1129	goto Exit;
...	...	@@ -1307,9 +1307,9 @@
1307	1307	else
1308	1308	{
1309	1309	FT_TRACE1(( "t1_load_keyword: ignoring keyword `%s'"
1310		- " which is not valid at this point\n"
1311		- " (probably due to missing keywords)\n",
	1310	+ " which is not valid at this point\n",
1312	1311	field->ident ));
	1312	+ FT_TRACE1(( " (probably due to missing keywords)\n" ));
1313	1313	error = FT_Err_Ok;
1314	1314	}
1315	1315

src/winfonts/winfnt.c

---

...	...	@@ -420,12 +420,12 @@
420	420	goto Exit;
421	421
422	422	FT_TRACE2(( "magic %04lx, machine %02x, number_of_sections %u, "
423		- "size_of_optional_header %02x\n"
424		- "magic32 %02x, rsrc_virtual_address %04lx, "
425		- "rsrc_size %04lx\n",
	423	+ "size_of_optional_header %02x\n",
426	424	pe32_header.magic, pe32_header.machine,
427	425	pe32_header.number_of_sections,
428		- pe32_header.size_of_optional_header,
	426	+ pe32_header.size_of_optional_header ));
	427	+ FT_TRACE2(( "magic32 %02x, rsrc_virtual_address %04lx, "
	428	+ "rsrc_size %04lx\n",
429	429	pe32_header.magic32, pe32_header.rsrc_virtual_address,
430	430	pe32_header.rsrc_size ));
431	431

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