[Git][freetype/freetype][master] [bdf,pcf,winfonts,sfnt] Remove barely used marcros.

[Alexei Podtelezhnikov (@apodtele)]

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

• 24888540
  by Alexei Podtelezhnikov (Алексей Подтележников) at 2024-07-28T19:42:49-04:00

  [bdf,pcf,winfonts,sfnt] Remove barely used marcros.
  
  * include/freetype/internal/ftobjs.h (FT_FACE_SIZE, FT_SIZE_FACE):
  Removed.
  * src/bdf/bdfdrivr.c (BDF_Glyph_Load): Updated.
  * src/pcf/pcfdrivr.c (PCF_Glyph_Load): Ditto.
  * src/winfonts/winfnt.c (FNT_Load_Glyph): Ditto
  * src/sfnt/ttbdf.c (tt_face_find_bdf_prop): Ditto.
  

5 changed files:

• include/freetype/internal/ftobjs.h
• src/bdf/bdfdrivr.c
• src/pcf/pcfdrivr.c
• src/sfnt/ttbdf.c
• src/winfonts/winfnt.c

Changes:

include/freetype/internal/ftobjs.h

---

...	...	@@ -604,12 +604,6 @@ FT_BEGIN_HEADER
604	604	#define FT_FACE_MEMORY( x ) FT_FACE( x )->memory
605	605	#define FT_FACE_STREAM( x ) FT_FACE( x )->stream
606	606
607		-#define FT_SIZE_FACE( x ) FT_SIZE( x )->face
608		-#define FT_SLOT_FACE( x ) FT_SLOT( x )->face
609		-
610		-#define FT_FACE_SLOT( x ) FT_FACE( x )->glyph
611		-#define FT_FACE_SIZE( x ) FT_FACE( x )->size
612		-
613	607
614	608	/**************************************************************************
615	609	*

src/bdf/bdfdrivr.c

---

...	...	@@ -780,8 +780,8 @@ THE SOFTWARE.
780	780	FT_UInt glyph_index,
781	781	FT_Int32 load_flags )
782	782	{
783		- BDF_Face bdf = (BDF_Face)FT_SIZE_FACE( size );
784		- FT_Face face = FT_FACE( bdf );
	783	+ FT_Face face = size->face;
	784	+ BDF_Face bdf = (BDF_Face)face;
785	785	FT_Error error = FT_Err_Ok;
786	786	FT_Bitmap* bitmap = &slot->bitmap;
787	787	bdf_glyph_t glyph;

src/pcf/pcfdrivr.c

---

...	...	@@ -453,7 +453,7 @@ THE SOFTWARE.
453	453	FT_UInt glyph_index,
454	454	FT_Int32 load_flags )
455	455	{
456		- PCF_Face face = (PCF_Face)FT_SIZE_FACE( size );
	456	+ PCF_Face face = (PCF_Face)size->face;
457	457	FT_Stream stream;
458	458	FT_Error error = FT_Err_Ok;
459	459	FT_Bitmap* bitmap = &slot->bitmap;

src/sfnt/ttbdf.c

---

...	...	@@ -142,7 +142,7 @@
142	142	{
143	143	TT_Face ttface = (TT_Face)face;
144	144	TT_BDF bdf = &ttface->bdf;
145		- FT_Size size = FT_FACE_SIZE( face );
	145	+ FT_Size size = face->size;
146	146	FT_Error error = FT_Err_Ok;
147	147	FT_Byte* p;
148	148	FT_UInt count;

src/winfonts/winfnt.c

---

...	...	@@ -1006,7 +1006,7 @@
1006	1006	FT_UInt glyph_index,
1007	1007	FT_Int32 load_flags )
1008	1008	{
1009		- FNT_Face face = (FNT_Face)FT_SIZE_FACE( size );
	1009	+ FNT_Face face = (FNT_Face)size->face;
1010	1010	FNT_Font font;
1011	1011	FT_Error error = FT_Err_Ok;
1012	1012	FT_Byte* p;

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