fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2025-12-20 04:10:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove some declare/define macros (pt 3).

Browse source 
* include/freetype/internal/ftobjs.h (FT_CMap_ClassRec): Make const.
(FT_DECLARE_CMAP_CLASS, FT_DEFINE_CMAP_CLASS): Removed.
* src/*: Update all users.
This commit is contained in:
Alexei Podtelezhnikov 2025-09-01 23:28:07 -04:00
parent 821e87b1ff
commit b27dc88c4a
10 changed files with 38 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
include/freetype/internal/ftobjs.h
View file

@ -205,7 +205,7 @@ FT_BEGIN_HEADER
FT_UInt32 variant_selector );
typedef struct FT_CMap_ClassRec_
typedef const struct FT_CMap_ClassRec_
{
FT_ULong size;
@ -226,37 +226,6 @@ FT_BEGIN_HEADER
} FT_CMap_ClassRec;
#define FT_DECLARE_CMAP_CLASS( class_ ) \
FT_CALLBACK_TABLE const FT_CMap_ClassRec class_;
#define FT_DEFINE_CMAP_CLASS( \
class_, \
size_, \
init_, \
done_, \
char_index_, \
char_next_, \
char_var_index_, \
char_var_default_, \
variant_list_, \
charvariant_list_, \
variantchar_list_ ) \
FT_CALLBACK_TABLE_DEF \
const FT_CMap_ClassRec class_ = \
{ \
size_, \
init_, \
done_, \
char_index_, \
char_next_, \
char_var_index_, \
char_var_default_, \
variant_list_, \
charvariant_list_, \
variantchar_list_ \
};
/* create a new charmap and add it to charmap->face */
FT_BASE( FT_Error )
FT_CMap_New( FT_CMap_Class clazz,

2
src/bdf/bdfdrivr.c
View file

@ -187,7 +187,7 @@ THE SOFTWARE.
static
const FT_CMap_ClassRec bdf_cmap_class =
FT_CMap_ClassRec bdf_cmap_class =
{
sizeof ( BDF_CMapRec ),
bdf_cmap_init,

16
src/cff/cffcmap.c
View file

@ -97,9 +97,9 @@
}
FT_DEFINE_CMAP_CLASS(
cff_cmap_encoding_class_rec,
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec cff_cmap_encoding_class_rec =
{
sizeof ( CFF_CMapStdRec ),
(FT_CMap_InitFunc) cff_cmap_encoding_init, /* init */
@ -112,7 +112,7 @@
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
)
};
/*************************************************************************/
@ -209,9 +209,9 @@
}
FT_DEFINE_CMAP_CLASS(
cff_cmap_unicode_class_rec,
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec cff_cmap_unicode_class_rec =
{
sizeof ( PS_UnicodesRec ),
(FT_CMap_InitFunc) cff_cmap_unicode_init, /* init */
@ -224,7 +224,7 @@
(FT_CMap_VariantListFunc) NULL, /* variant_list */
(FT_CMap_CharVariantListFunc) NULL, /* charvariant_list */
(FT_CMap_VariantCharListFunc) NULL /* variantchar_list */
)
};
/* END */

6
src/cff/cffcmap.h
View file

@ -43,7 +43,8 @@ FT_BEGIN_HEADER
} CFF_CMapStdRec;
FT_DECLARE_CMAP_CLASS( cff_cmap_encoding_class_rec )
FT_CALLBACK_TABLE
FT_CMap_ClassRec cff_cmap_encoding_class_rec;
/*************************************************************************/
@ -56,7 +57,8 @@ FT_BEGIN_HEADER
/* unicode (synthetic) cmaps */
FT_DECLARE_CMAP_CLASS( cff_cmap_unicode_class_rec )
FT_CALLBACK_TABLE
FT_CMap_ClassRec cff_cmap_unicode_class_rec;
FT_END_HEADER

2
src/pcf/pcfdrivr.c
View file

@ -157,7 +157,7 @@ THE SOFTWARE.
static
const FT_CMap_ClassRec pcf_cmap_class =
FT_CMap_ClassRec pcf_cmap_class =
{
sizeof ( PCF_CMapRec ),
pcf_cmap_init,

4
src/pfr/pfrcmap.c
View file

@ -167,8 +167,8 @@
}
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
pfr_cmap_class_rec =
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec pfr_cmap_class_rec =
{
sizeof ( PFR_CMapRec ),

3
src/pfr/pfrcmap.h
View file

@ -34,7 +34,8 @@ FT_BEGIN_HEADER
} PFR_CMapRec, *PFR_CMap;
FT_CALLBACK_TABLE const FT_CMap_ClassRec pfr_cmap_class_rec;
FT_CALLBACK_TABLE
FT_CMap_ClassRec pfr_cmap_class_rec;
FT_END_HEADER

16
src/psaux/t1cmap.c
View file

@ -136,8 +136,8 @@
}
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_standard_class_rec =
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec t1_cmap_standard_class_rec =
{
sizeof ( T1_CMapStdRec ),
@ -166,8 +166,8 @@
return 0;
}
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_expert_class_rec =
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec t1_cmap_expert_class_rec =
{
sizeof ( T1_CMapStdRec ),
@ -272,8 +272,8 @@
}
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_custom_class_rec =
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec t1_cmap_custom_class_rec =
{
sizeof ( T1_CMapCustomRec ),
@ -372,8 +372,8 @@
}
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_unicode_class_rec =
FT_CALLBACK_TABLE_DEF
FT_CMap_ClassRec t1_cmap_unicode_class_rec =
{
sizeof ( PS_UnicodesRec ),

16
src/psaux/t1cmap.h
View file

@ -49,11 +49,11 @@ FT_BEGIN_HEADER
} T1_CMapStdRec;
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_standard_class_rec;
FT_CALLBACK_TABLE
FT_CMap_ClassRec t1_cmap_standard_class_rec;
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_expert_class_rec;
FT_CALLBACK_TABLE
FT_CMap_ClassRec t1_cmap_expert_class_rec;
/*************************************************************************/
@ -76,8 +76,8 @@ FT_BEGIN_HEADER
} T1_CMapCustomRec;
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_custom_class_rec;
FT_CALLBACK_TABLE
FT_CMap_ClassRec t1_cmap_custom_class_rec;
/*************************************************************************/
@ -90,8 +90,8 @@ FT_BEGIN_HEADER
/* unicode (synthetic) cmaps */
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_unicode_class_rec;
FT_CALLBACK_TABLE
FT_CMap_ClassRec t1_cmap_unicode_class_rec;
/* */

7
src/winfonts/winfnt.c
View file

@ -689,7 +689,8 @@
}
static const FT_CMap_ClassRec fnt_cmap_class_rec =
static
FT_CMap_ClassRec fnt_cmap_class =
{
sizeof ( FNT_CMapRec ),
@ -701,8 +702,6 @@
NULL, NULL, NULL, NULL, NULL
};
static FT_CMap_Class const fnt_cmap_class = &fnt_cmap_class_rec;
static void
FNT_Face_Done( FT_Face fntface ) /* FNT_Face */
@ -871,7 +870,7 @@
/* charmap.encoding_id = TT_MAC_ID_ROMAN; */
}
error = FT_CMap_New( fnt_cmap_class,
error = FT_CMap_New( &fnt_cmap_class,
NULL,
&charmap,
NULL );