[Git][freetype/freetype][master] 2 commits: Whitespace.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 695d606a
  by Werner Lemberg at 2022-04-01T08:50:33+02:00

  Whitespace.
  

• 29818e7a
  by Eric Jing at 2022-04-01T08:54:38+02:00

  CMakeLists.txt: Fix `Info.plist` path.
  
  When building a framework using CMake with `add_subdirectory`, CMake must be
  able to find `freetype-Info.plist` when configuring the framework
  properties.
  

27 changed files:

• CMakeLists.txt
• src/base/ftmac.c
• src/base/ftrfork.c
• src/bzip2/ftbzip2.c
• src/cache/ftccache.h
• src/cache/ftcglyph.h
• src/cache/ftcimage.h
• src/cache/ftcsbits.c
• src/cache/ftcsbits.h
• src/cff/cffcmap.c
• src/cff/cffgload.c
• src/gxvalid/gxvcommn.c
• src/pfr/pfrobjs.c
• src/psaux/cffdecode.c
• src/psaux/psconv.c
• src/psaux/psobjs.c
• src/raster/ftraster.c
• src/sdf/ftsdf.c
• src/sfnt/pngshim.c
• src/sfnt/sfwoff2.c
• src/sfnt/ttcmap.c
• src/truetype/ttgload.c
• src/type1/t1afm.c
• src/type1/t1load.c
• src/type42/t42objs.c
• src/type42/t42parse.c
• src/winfonts/winfnt.c

Changes:

CMakeLists.txt

---

...	...	@@ -491,7 +491,7 @@ if (BUILD_FRAMEWORK)
491	491	)
492	492	set_target_properties(freetype PROPERTIES
493	493	FRAMEWORK TRUE
494		- MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist
	494	+ MACOSX_FRAMEWORK_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/builds/mac/freetype-Info.plist
495	495	PUBLIC_HEADER "${PUBLIC_HEADERS}"
496	496	XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
497	497	)

src/base/ftmac.c

---

...	...	@@ -314,7 +314,7 @@
314	314	NULL, NULL, NULL ) )
315	315	return ( OSType ) 0;
316	316
317		- return ((FInfo *)(info.finderInfo))->fdType;
	317	+ return ( (FInfo *)( info.finderInfo ) )->fdType;
318	318	}
319	319
320	320
...	...	@@ -462,7 +462,7 @@
462	462
463	463	if ( ps_name_len != 0 )
464	464	{
465		- ft_memcpy(ps_name, names[0] + 1, ps_name_len);
	465	+ ft_memcpy( ps_name, names[0] + 1, ps_name_len );
466	466	ps_name[ps_name_len] = 0;
467	467	}
468	468	if ( style->indexes[face_index] > 1 &&

src/base/ftrfork.c

---

...	...	@@ -402,17 +402,17 @@
402	402	FT_Long *result_offset );
403	403
404	404
405		- CONST_FT_RFORK_RULE_ARRAY_BEGIN(ft_raccess_guess_table,
406		- ft_raccess_guess_rec)
407		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(apple_double, apple_double)
408		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(apple_single, apple_single)
409		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(darwin_ufs_export, darwin_ufs_export)
410		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(darwin_newvfs, darwin_newvfs)
411		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(darwin_hfsplus, darwin_hfsplus)
412		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(vfat, vfat)
413		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(linux_cap, linux_cap)
414		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(linux_double, linux_double)
415		- CONST_FT_RFORK_RULE_ARRAY_ENTRY(linux_netatalk, linux_netatalk)
	405	+ CONST_FT_RFORK_RULE_ARRAY_BEGIN( ft_raccess_guess_table,
	406	+ ft_raccess_guess_rec )
	407	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( apple_double, apple_double )
	408	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( apple_single, apple_single )
	409	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( darwin_ufs_export, darwin_ufs_export )
	410	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( darwin_newvfs, darwin_newvfs )
	411	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( darwin_hfsplus, darwin_hfsplus )
	412	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( vfat, vfat )
	413	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( linux_cap, linux_cap )
	414	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( linux_double, linux_double )
	415	+ CONST_FT_RFORK_RULE_ARRAY_ENTRY( linux_netatalk, linux_netatalk )
416	416	CONST_FT_RFORK_RULE_ARRAY_END
417	417
418	418

src/bzip2/ftbzip2.c

---

...	...	@@ -57,8 +57,9 @@
57	57	/* it is better to use FreeType memory routines instead of raw
58	58	'malloc/free' */
59	59
60		- typedef void *(* alloc_func)(void*, int, int);
61		- typedef void (* free_func)(void*, void*);
	60	+ typedef void* (*alloc_func)( void*, int, int );
	61	+ typedef void (*free_func) ( void*, void* );
	62	+
62	63
63	64	static void*
64	65	ft_bzip2_alloc( FT_Memory memory,

src/cache/ftccache.h

---

...	...	@@ -210,7 +210,7 @@ FT_BEGIN_HEADER
210	210	#define FTC_CACHE_LOOKUP_CMP( cache, nodecmp, hash, query, node, error ) \
211	211	FT_BEGIN_STMNT \
212	212	FTC_Node *_bucket, *_pnode, _node; \
213		- FTC_Cache _cache = FTC_CACHE(cache); \
	213	+ FTC_Cache _cache = FTC_CACHE( cache ); \
214	214	FT_Offset _hash = (FT_Offset)(hash); \
215	215	FTC_Node_CompareFunc _nodcomp = (FTC_Node_CompareFunc)(nodecmp); \
216	216	FT_Bool _list_changed = FALSE; \

src/cache/ftcglyph.h

---

...	...	@@ -140,8 +140,8 @@ FT_BEGIN_HEADER
140	140
141	141	} FTC_FamilyRec, *FTC_Family;
142	142
143		-#define FTC_FAMILY(x) ( (FTC_Family)(x) )
144		-#define FTC_FAMILY_P(x) ( (FTC_Family*)(x) )
	143	+#define FTC_FAMILY( x ) ( (FTC_Family)(x) )
	144	+#define FTC_FAMILY_P( x ) ( (FTC_Family*)(x) )
145	145
146	146
147	147	typedef struct FTC_GNodeRec_
...	...	@@ -245,7 +245,7 @@ FT_BEGIN_HEADER
245	245	#define FTC_GCACHE_CLASS( x ) ((FTC_GCacheClass)(x))
246	246
247	247	#define FTC_CACHE_GCACHE_CLASS( x ) \
248		- FTC_GCACHE_CLASS( FTC_CACHE(x)->org_class )
	248	+ FTC_GCACHE_CLASS( FTC_CACHE( x )->org_class )
249	249	#define FTC_CACHE_FAMILY_CLASS( x ) \
250	250	( (FTC_MruListClass)FTC_CACHE_GCACHE_CLASS( x )->family_class )
251	251

src/cache/ftcimage.h

---

...	...	@@ -51,8 +51,8 @@ FT_BEGIN_HEADER
51	51	} FTC_INodeRec, *FTC_INode;
52	52
53	53	#define FTC_INODE( x ) ( (FTC_INode)( x ) )
54		-#define FTC_INODE_GINDEX( x ) FTC_GNODE(x)->gindex
55		-#define FTC_INODE_FAMILY( x ) FTC_GNODE(x)->family
	54	+#define FTC_INODE_GINDEX( x ) FTC_GNODE( x )->gindex
	55	+#define FTC_INODE_FAMILY( x ) FTC_GNODE( x )->family
56	56
57	57	typedef FT_Error
58	58	(*FTC_IFamily_LoadGlyphFunc)( FTC_Family family,
...	...	@@ -72,7 +72,7 @@ FT_BEGIN_HEADER
72	72	#define FTC_IFAMILY_CLASS( x ) ((FTC_IFamilyClass)(x))
73	73
74	74	#define FTC_CACHE_IFAMILY_CLASS( x ) \
75		- FTC_IFAMILY_CLASS( FTC_CACHE_GCACHE_CLASS(x)->family_class )
	75	+ FTC_IFAMILY_CLASS( FTC_CACHE_GCACHE_CLASS( x )->family_class )
76	76
77	77
78	78	/* can be used as a @FTC_Node_FreeFunc */

src/cache/ftcsbits.c

---

...	...	@@ -171,7 +171,7 @@
171	171	sbit->xadvance = (FT_Char)xadvance;
172	172	sbit->yadvance = (FT_Char)yadvance;
173	173	sbit->format = (FT_Byte)bitmap->pixel_mode;
174		- sbit->max_grays = (FT_Byte)(bitmap->num_grays - 1);
	174	+ sbit->max_grays = (FT_Byte)( bitmap->num_grays - 1 );
175	175
176	176	if ( slot->internal->flags & FT_GLYPH_OWN_BITMAP )
177	177	{

src/cache/ftcsbits.h

---

...	...	@@ -61,7 +61,7 @@ FT_BEGIN_HEADER
61	61
62	62	typedef const FTC_SFamilyClassRec* FTC_SFamilyClass;
63	63
64		-#define FTC_SFAMILY_CLASS( x ) ((FTC_SFamilyClass)(x))
	64	+#define FTC_SFAMILY_CLASS( x ) ( (FTC_SFamilyClass)(x) )
65	65
66	66	#define FTC_CACHE_SFAMILY_CLASS( x ) \
67	67	FTC_SFAMILY_CLASS( FTC_CACHE_GCACHE_CLASS( x )->family_class )

src/cff/cffcmap.c

---

...	...	@@ -81,7 +81,7 @@
81	81
82	82	if ( char_code < 255 )
83	83	{
84		- FT_UInt code = (FT_UInt)(char_code + 1);
	84	+ FT_UInt code = (FT_UInt)( char_code + 1 );
85	85
86	86
87	87	for (;;)

src/cff/cffgload.c

---

...	...	@@ -75,7 +75,7 @@
75	75	#endif /* FT_CONFIG_OPTION_INCREMENTAL */
76	76
77	77	{
78		- CFF_Font cff = (CFF_Font)(face->extra.data);
	78	+ CFF_Font cff = (CFF_Font)( face->extra.data );
79	79
80	80
81	81	return cff_index_access_element( &cff->charstrings_index, glyph_index,
...	...	@@ -111,7 +111,7 @@
111	111	#endif /* FT_CONFIG_OPTION_INCREMENTAL */
112	112
113	113	{
114		- CFF_Font cff = (CFF_Font)(face->extra.data);
	114	+ CFF_Font cff = (CFF_Font)( face->extra.data );
115	115
116	116
117	117	cff_index_forget_element( &cff->charstrings_index, pointer );

src/gxvalid/gxvcommn.c

---

...	...	@@ -1033,7 +1033,7 @@
1033	1033	GXV_NAME_ENTER( "StateArray" );
1034	1034
1035	1035	GXV_TRACE(( "parse %d bytes by stateSize=%d maxClassID=%d\n",
1036		- (int)(*length_p), stateSize, (int)(maxClassID) ));
	1036	+ (int)( *length_p ), stateSize, (int)maxClassID ));
1037	1037
1038	1038	/*
1039	1039	* 2 states are predefined and must be described in StateArray:
...	...	@@ -1418,7 +1418,7 @@
1418	1418	GXV_NAME_ENTER( "XStateArray" );
1419	1419
1420	1420	GXV_TRACE(( "parse % 3d bytes by stateSize=% 3d maxClassID=% 3d\n",
1421		- (int)(*length_p), (int)stateSize, (int)(maxClassID) ));
	1421	+ (int)( *length_p ), (int)stateSize, (int)maxClassID ));
1422	1422
1423	1423	/*
1424	1424	* 2 states are predefined and must be described:

src/pfr/pfrobjs.c

---

...	...	@@ -207,7 +207,7 @@
207	207
208	208	pfrface->height = (FT_Short)( ( pfrface->units_per_EM * 12 ) / 10 );
209	209	if ( pfrface->height < pfrface->ascender - pfrface->descender )
210		- pfrface->height = (FT_Short)(pfrface->ascender - pfrface->descender);
	210	+ pfrface->height = (FT_Short)( pfrface->ascender - pfrface->descender );
211	211
212	212	if ( phy_font->num_strikes > 0 )
213	213	{

src/psaux/cffdecode.c

---

...	...	@@ -248,7 +248,7 @@
248	248	else
249	249	#endif /* FT_CONFIG_OPTION_INCREMENTAL */
250	250	{
251		- CFF_Font cff = (CFF_Font)(face->extra.data);
	251	+ CFF_Font cff = (CFF_Font)( face->extra.data );
252	252
253	253
254	254	bchar_index = cff_lookup_glyph_by_stdcharcode( cff, bchar );

src/psaux/psconv.c

---

...	...	@@ -535,11 +535,11 @@
535	535
536	536	if ( r & 1 )
537	537	{
538		- *buffer = (FT_Byte)(*buffer + c);
	538	+ *buffer = (FT_Byte)( *buffer + c );
539	539	buffer++;
540	540	}
541	541	else
542		- *buffer = (FT_Byte)(c << 4);
	542	+ *buffer = (FT_Byte)( c << 4 );
543	543
544	544	r++;
545	545	}
...	...	@@ -572,8 +572,8 @@
572	572	if ( p >= limit )
573	573	return 0;
574	574
575		- if ( n > (FT_UInt)(limit - p) )
576		- n = (FT_UInt)(limit - p);
	575	+ if ( n > (FT_UInt)( limit - p ) )
	576	+ n = (FT_UInt)( limit - p );
577	577
578	578	for ( r = 0; r < n; r++ )
579	579	{

src/psaux/psobjs.c

---

...	...	@@ -518,7 +518,7 @@
518	518
519	519	if ( *cur == '<' ) /* <...> */
520	520	{
521		- if ( cur + 1 < limit && *(cur + 1) == '<' ) /* << */
	521	+ if ( cur + 1 < limit && *( cur + 1 ) == '<' ) /* << */
522	522	{
523	523	cur++;
524	524	cur++;

src/raster/ftraster.c

---

...	...	@@ -2269,7 +2269,7 @@
2269	2269	/* This is due to the fact that, in the vast majority of cases, */
2270	2270	/* the span length in bytes is relatively small. */
2271	2271	while ( --c2 > 0 )
2272		- *(++target) = 0xFF;
	2272	+ *( ++target ) = 0xFF;
2273	2273
2274	2274	target[1] |= f2;
2275	2275	}

src/sdf/ftsdf.c

---

...	...	@@ -3014,7 +3014,7 @@
3014	3014	diff = current_dist.distance - min_dist.distance;
3015	3015
3016	3016
3017		- if ( FT_ABS(diff ) < CORNER_CHECK_EPSILON )
	3017	+ if ( FT_ABS( diff ) < CORNER_CHECK_EPSILON )
3018	3018	min_dist = resolve_corner( min_dist, current_dist );
3019	3019	else if ( diff < 0 )
3020	3020	min_dist = current_dist;

src/sfnt/pngshim.c

---

...	...	@@ -367,7 +367,7 @@
367	367	}
368	368
369	369	/* transform transparency to alpha */
370		- if ( png_get_valid(png, info, PNG_INFO_tRNS ) )
	370	+ if ( png_get_valid( png, info, PNG_INFO_tRNS ) )
371	371	png_set_tRNS_to_alpha( png );
372	372
373	373	if ( bitdepth == 16 )
...	...	@@ -387,7 +387,7 @@
387	387	png_set_filler( png, 0xFF, PNG_FILLER_AFTER );
388	388
389	389	/* recheck header after setting EXPAND options */
390		- png_read_update_info(png, info );
	390	+ png_read_update_info( png, info );
391	391	png_get_IHDR( png, info,
392	392	&imgWidth, &imgHeight,
393	393	&bitdepth, &color_type, &interlace,

src/sfnt/sfwoff2.c

---

...	...	@@ -2104,7 +2104,7 @@
2104	2104	error = FT_THROW( Invalid_Table );
2105	2105	goto Exit;
2106	2106	}
2107		- file_offset = ROUND4(woff2.metaOffset + woff2.metaLength);
	2107	+ file_offset = ROUND4( woff2.metaOffset + woff2.metaLength );
2108	2108	}
2109	2109
2110	2110	if ( woff2.privOffset )
...	...	@@ -2114,7 +2114,7 @@
2114	2114	error = FT_THROW( Invalid_Table );
2115	2115	goto Exit;
2116	2116	}
2117		- file_offset = ROUND4(woff2.privOffset + woff2.privLength);
	2117	+ file_offset = ROUND4( woff2.privOffset + woff2.privLength );
2118	2118	}
2119	2119
2120	2120	if ( file_offset != ( ROUND4( woff2.length ) ) )

src/sfnt/ttcmap.c

---

...	...	@@ -465,7 +465,7 @@
465	465	if ( subheader )
466	466	{
467	467	FT_Byte* p = subheader;
468		- FT_UInt idx = (FT_UInt)(char_code & 0xFF);
	468	+ FT_UInt idx = (FT_UInt)( char_code & 0xFF );
469	469	FT_UInt start, count;
470	470	FT_Int delta;
471	471	FT_UInt offset;

src/truetype/ttgload.c

---

...	...	@@ -1228,8 +1228,8 @@
1228	1228	p1 = gloader->base.outline.points + k;
1229	1229	p2 = gloader->base.outline.points + l;
1230	1230
1231		- x = SUB_LONG(p1->x, p2->x);
1232		- y = SUB_LONG(p1->y, p2->y);
	1231	+ x = SUB_LONG( p1->x, p2->x );
	1232	+ y = SUB_LONG( p1->y, p2->y );
1233	1233	}
1234	1234	else
1235	1235	{
...	...	@@ -2255,7 +2255,7 @@
2255	2255	if ( loader->widthp )
2256	2256	glyph->metrics.horiAdvance = loader->widthp[glyph_index] * 64;
2257	2257	else
2258		- glyph->metrics.horiAdvance = SUB_LONG(loader->pp2.x, loader->pp1.x);
	2258	+ glyph->metrics.horiAdvance = SUB_LONG( loader->pp2.x, loader->pp1.x );
2259	2259
2260	2260	/* set glyph dimensions */
2261	2261	glyph->metrics.width = SUB_LONG( bbox.xMax, bbox.xMin );

src/type1/t1afm.c

---

...	...	@@ -203,7 +203,7 @@
203	203	kp->index1 = FT_Get_Char_Index( t1_face, p[0] );
204	204	kp->index2 = FT_Get_Char_Index( t1_face, p[1] );
205	205
206		- kp->x = (FT_Int)FT_PEEK_SHORT_LE(p + 2);
	206	+ kp->x = (FT_Int)FT_PEEK_SHORT_LE( p + 2 );
207	207	kp->y = 0;
208	208
209	209	kp++;

src/type1/t1load.c

---

...	...	@@ -2057,9 +2057,9 @@
2057	2057	name_table->elements[n][len] = '\0';
2058	2058
2059	2059	/* record index of /.notdef */
2060		- if ( *cur == '.' &&
	2060	+ if ( *cur == '.' &&
2061	2061	ft_strcmp( ".notdef",
2062		- (const char*)(name_table->elements[n]) ) == 0 )
	2062	+ (const char*)( name_table->elements[n] ) ) == 0 )
2063	2063	{
2064	2064	notdef_index = n;
2065	2065	notdef_found = 1;
...	...	@@ -2331,8 +2331,8 @@
2331	2331	/* in valid Type 1 fonts we don't see `RD' or `-|' directly */
2332	2332	/* since those tokens are handled by parse_subrs and */
2333	2333	/* parse_charstrings */
2334		- else if ( *cur == 'R' && cur + 6 < limit && *(cur + 1) == 'D' &&
2335		- have_integer )
	2334	+ else if ( *cur == 'R' && cur + 6 < limit && *( cur + 1 ) == 'D' &&
	2335	+ have_integer )
2336	2336	{
2337	2337	FT_ULong s;
2338	2338	FT_Byte* b;
...	...	@@ -2344,8 +2344,8 @@
2344	2344	have_integer = 0;
2345	2345	}
2346	2346
2347		- else if ( *cur == '-' && cur + 6 < limit && *(cur + 1) == '|' &&
2348		- have_integer )
	2347	+ else if ( *cur == '-' && cur + 6 < limit && *( cur + 1 ) == '|' &&
	2348	+ have_integer )
2349	2349	{
2350	2350	FT_ULong s;
2351	2351	FT_Byte* b;

src/type42/t42objs.c

---

...	...	@@ -148,7 +148,7 @@
148	148	t42_loader_done( &loader );
149	149	if ( error )
150	150	{
151		- FT_FREE(face->ttf_data);
	151	+ FT_FREE( face->ttf_data );
152	152	face->ttf_size = 0;
153	153	}
154	154	return error;

src/type42/t42parse.c

---

...	...	@@ -92,7 +92,7 @@
92	92	#undef T1CODE
93	93	#define T1CODE T1_FIELD_LOCATION_BBOX
94	94
95		- T1_FIELD_BBOX("FontBBox", xMin, 0 )
	95	+ T1_FIELD_BBOX( "FontBBox", xMin, 0 )
96	96
97	97	T1_FIELD_CALLBACK( "FontMatrix", t42_parse_font_matrix, 0 )
98	98	T1_FIELD_CALLBACK( "Encoding", t42_parse_encoding, 0 )
...	...	@@ -1008,9 +1008,9 @@
1008	1008	name_table->elements[n][len] = '\0';
1009	1009
1010	1010	/* record index of /.notdef */
1011		- if ( *cur == '.' &&
	1011	+ if ( *cur == '.' &&
1012	1012	ft_strcmp( ".notdef",
1013		- (const char*)(name_table->elements[n]) ) == 0 )
	1013	+ (const char*)( name_table->elements[n] ) ) == 0 )
1014	1014	{
1015	1015	notdef_index = n;
1016	1016	notdef_found = 1;

src/winfonts/winfnt.c

---

...	...	@@ -489,7 +489,7 @@
489	489	&dir_entry1 ) )
490	490	goto Exit;
491	491
492		- if ( !(dir_entry1.offset & 0x80000000UL ) /* DataIsDirectory */ )
	492	+ if ( !( dir_entry1.offset & 0x80000000UL ) /* DataIsDirectory */ )
493	493	{
494	494	error = FT_THROW( Invalid_File_Format );
495	495	goto Exit;
...	...	@@ -513,7 +513,7 @@
513	513	&dir_entry2 ) )
514	514	goto Exit;
515	515
516		- if ( !(dir_entry2.offset & 0x80000000UL ) /* DataIsDirectory */ )
	516	+ if ( !( dir_entry2.offset & 0x80000000UL ) /* DataIsDirectory */ )
517	517	{
518	518	error = FT_THROW( Invalid_File_Format );
519	519	goto Exit;

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