Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

[sfnt, truetype] More renamings for orthogonality.

Browse Source 
* src/sfnt/sfdriver.c, src/sfnt/sfntpic.h, src/sfnt/ttcmap.c,
src/truetype/ttdriver.c, src/truetype/ttpic.h: s/FT_SFNT_/SFNT_/,
s/FT_TT_/TT_/, s/GET_CMAP_INFO_GET/CMAP_INFO_GET/.
2.6.5
Werner Lemberg 13 years ago
parent d0841ea73b
commit 0c633e3fcd
6 changed files with 57 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ChangeLog
  2. 38
      src/sfnt/sfdriver.c
  3. 36
      src/sfnt/sfntpic.h
  4. 2
      src/sfnt/ttcmap.c
  5. 10
      src/truetype/ttdriver.c
  6. 12
      src/truetype/ttpic.h

8
ChangeLog
Unescape View File

@ -1,3 +1,11 @@
2012-08-27 Werner Lemberg <wl@gnu.org>
[sfnt, truetype] More renamings for orthogonality.
* src/sfnt/sfdriver.c, src/sfnt/sfntpic.h, src/sfnt/ttcmap.c,
src/truetype/ttdriver.c, src/truetype/ttpic.h: s/FT_SFNT_/SFNT_/,
s/FT_TT_/TT_/, s/GET_CMAP_INFO_GET/CMAP_INFO_GET/.
2012-08-27 Werner Lemberg <wl@gnu.org>
[autofit] Some macro and variable renamings for orthogonality.

38
src/sfnt/sfdriver.c
Unescape View File

@ -395,31 +395,31 @@
#if defined TT_CONFIG_OPTION_POSTSCRIPT_NAMES && defined TT_CONFIG_OPTION_BDF
FT_DEFINE_SERVICEDESCREC5(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_GLYPH_DICT, &FT_SFNT_SERVICE_GLYPH_DICT_GET,
FT_SERVICE_ID_BDF, &FT_SFNT_SERVICE_BDF_GET,
FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET )
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_GLYPH_DICT, &SFNT_SERVICE_GLYPH_DICT_GET,
FT_SERVICE_ID_BDF, &SFNT_SERVICE_BDF_GET,
FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET )
#elif defined TT_CONFIG_OPTION_POSTSCRIPT_NAMES
FT_DEFINE_SERVICEDESCREC4(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_GLYPH_DICT, &FT_SFNT_SERVICE_GLYPH_DICT_GET,
FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET )
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_GLYPH_DICT, &SFNT_SERVICE_GLYPH_DICT_GET,
FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET )
#elif defined TT_CONFIG_OPTION_BDF
FT_DEFINE_SERVICEDESCREC4(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_BDF, &FT_SFNT_SERVICE_BDF_GET,
FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET )
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_BDF, &SFNT_SERVICE_BDF_GET,
FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET )
#else
FT_DEFINE_SERVICEDESCREC3(
sfnt_services,
FT_SERVICE_ID_SFNT_TABLE, &FT_SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &FT_SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_TT_CMAP, &FT_TT_SERVICE_GET_CMAP_INFO_GET )
FT_SERVICE_ID_SFNT_TABLE, &SFNT_SERVICE_SFNT_TABLE_GET,
FT_SERVICE_ID_POSTSCRIPT_FONT_NAME, &SFNT_SERVICE_PS_NAME_GET,
FT_SERVICE_ID_TT_CMAP, &TT_SERVICE_CMAP_INFO_GET )
#endif
@ -427,7 +427,7 @@
sfnt_get_interface( FT_Module module,
const char* module_interface )
{
/* FT_SFNT_SERVICES_GET derefers `library' in PIC mode */
/* SFNT_SERVICES_GET derefers `library' in PIC mode */
#ifdef FT_CONFIG_OPTION_PIC
FT_Library library;
@ -441,7 +441,7 @@
FT_UNUSED( module );
#endif
return ft_service_list_lookup( FT_SFNT_SERVICES_GET, module_interface );
return ft_service_list_lookup( SFNT_SERVICES_GET, module_interface );
}
@ -666,7 +666,7 @@
0x10000L, /* driver version 1.0 */
0x20000L, /* driver requires FreeType 2.0 or higher */
(const void*)&FT_SFNT_INTERFACE_GET, /* module specific interface */
(const void*)&SFNT_INTERFACE_GET, /* module specific interface */
(FT_Module_Constructor)0,
(FT_Module_Destructor) 0,

36
src/sfnt/sfntpic.h
Unescape View File

@ -27,15 +27,15 @@ FT_BEGIN_HEADER
#ifndef FT_CONFIG_OPTION_PIC
#define FT_SFNT_SERVICES_GET sfnt_services
#define FT_SFNT_SERVICE_GLYPH_DICT_GET sfnt_service_glyph_dict
#define FT_SFNT_SERVICE_PS_NAME_GET sfnt_service_ps_name
#define FT_TT_SERVICE_GET_CMAP_INFO_GET tt_service_get_cmap_info
#define FT_SFNT_SERVICES_GET sfnt_services
#define FT_TT_CMAP_CLASSES_GET tt_cmap_classes
#define FT_SFNT_SERVICE_SFNT_TABLE_GET sfnt_service_sfnt_table
#define FT_SFNT_SERVICE_BDF_GET sfnt_service_bdf
#define FT_SFNT_INTERFACE_GET sfnt_interface
#define SFNT_SERVICES_GET sfnt_services
#define SFNT_SERVICE_GLYPH_DICT_GET sfnt_service_glyph_dict
#define SFNT_SERVICE_PS_NAME_GET sfnt_service_ps_name
#define TT_SERVICE_CMAP_INFO_GET tt_service_get_cmap_info
#define SFNT_SERVICES_GET sfnt_services
#define TT_CMAP_CLASSES_GET tt_cmap_classes
#define SFNT_SERVICE_SFNT_TABLE_GET sfnt_service_sfnt_table
#define SFNT_SERVICE_BDF_GET sfnt_service_bdf
#define SFNT_INTERFACE_GET sfnt_interface
#else /* FT_CONFIG_OPTION_PIC */
@ -75,23 +75,23 @@ FT_BEGIN_HEADER
#define GET_PIC( lib ) \
( (sfntModulePIC*)((lib)->pic_container.sfnt) )
#define FT_SFNT_SERVICES_GET \
#define SFNT_SERVICES_GET \
( GET_PIC( library )->sfnt_services )
#define FT_SFNT_SERVICE_GLYPH_DICT_GET \
#define SFNT_SERVICE_GLYPH_DICT_GET \
( GET_PIC( library )->sfnt_service_glyph_dict )
#define FT_SFNT_SERVICE_PS_NAME_GET \
#define SFNT_SERVICE_PS_NAME_GET \
( GET_PIC( library )->sfnt_service_ps_name )
#define FT_TT_SERVICE_GET_CMAP_INFO_GET \
#define TT_SERVICE_CMAP_INFO_GET \
( GET_PIC( library )->tt_service_get_cmap_info )
#define FT_SFNT_SERVICES_GET \
#define SFNT_SERVICES_GET \
( GET_PIC( library )->sfnt_services )
#define FT_TT_CMAP_CLASSES_GET \
#define TT_CMAP_CLASSES_GET \
( GET_PIC( library )->tt_cmap_classes )
#define FT_SFNT_SERVICE_SFNT_TABLE_GET \
#define SFNT_SERVICE_SFNT_TABLE_GET \
( GET_PIC( library )->sfnt_service_sfnt_table )
#define FT_SFNT_SERVICE_BDF_GET \
#define SFNT_SERVICE_BDF_GET \
( GET_PIC( library )->sfnt_service_bdf )
#define FT_SFNT_INTERFACE_GET \
#define SFNT_INTERFACE_GET \
( GET_PIC( library )->sfnt_interface )

2
src/sfnt/ttcmap.c
Unescape View File

@ -3480,7 +3480,7 @@
{
FT_Byte* volatile cmap = table + offset;
volatile FT_UInt format = TT_PEEK_USHORT( cmap );
const TT_CMap_Class* volatile pclazz = FT_TT_CMAP_CLASSES_GET;
const TT_CMap_Class* volatile pclazz = TT_CMAP_CLASSES_GET;
TT_CMap_Class volatile clazz;

10
src/truetype/ttdriver.c
Unescape View File

@ -387,15 +387,15 @@
FT_DEFINE_SERVICEDESCREC4(
tt_services,
FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_TRUETYPE,
FT_SERVICE_ID_MULTI_MASTERS, &FT_TT_SERVICE_GX_MULTI_MASTERS_GET,
FT_SERVICE_ID_MULTI_MASTERS, &TT_SERVICE_GX_MULTI_MASTERS_GET,
FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine,
FT_SERVICE_ID_TT_GLYF, &FT_TT_SERVICE_TRUETYPE_GLYF_GET )
FT_SERVICE_ID_TT_GLYF, &TT_SERVICE_TRUETYPE_GLYF_GET )
#else
FT_DEFINE_SERVICEDESCREC3(
tt_services,
FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_TRUETYPE,
FT_SERVICE_ID_TRUETYPE_ENGINE, &tt_service_truetype_engine,
FT_SERVICE_ID_TT_GLYF, &FT_TT_SERVICE_TRUETYPE_GLYF_GET )
FT_SERVICE_ID_TT_GLYF, &TT_SERVICE_TRUETYPE_GLYF_GET )
#endif
@ -409,7 +409,7 @@
SFNT_Service sfnt;
/* FT_TT_SERVICES_GET derefers `library' in PIC mode */
/* TT_SERVICES_GET derefers `library' in PIC mode */
#ifdef FT_CONFIG_OPTION_PIC
if ( !driver )
return NULL;
@ -418,7 +418,7 @@
return NULL;
#endif
result = ft_service_list_lookup( FT_TT_SERVICES_GET, tt_interface );
result = ft_service_list_lookup( TT_SERVICES_GET, tt_interface );
if ( result != NULL )
return result;

12
src/truetype/ttpic.h
Unescape View File

@ -24,9 +24,9 @@ FT_BEGIN_HEADER
#ifndef FT_CONFIG_OPTION_PIC
#define FT_TT_SERVICES_GET tt_services
#define FT_TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters
#define FT_TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf
#define TT_SERVICES_GET tt_services
#define TT_SERVICE_GX_MULTI_MASTERS_GET tt_service_gx_multi_masters
#define TT_SERVICE_TRUETYPE_GLYF_GET tt_service_truetype_glyf
#else /* FT_CONFIG_OPTION_PIC */
@ -48,11 +48,11 @@ FT_BEGIN_HEADER
#define GET_PIC( lib ) \
( (TTModulePIC*)((lib)->pic_container.truetype) )
#define FT_TT_SERVICES_GET \
#define TT_SERVICES_GET \
( GET_PIC( library )->tt_services )
#define FT_TT_SERVICE_GX_MULTI_MASTERS_GET \
#define TT_SERVICE_GX_MULTI_MASTERS_GET \
( GET_PIC( library )->tt_service_gx_multi_masters )
#define FT_TT_SERVICE_TRUETYPE_GLYF_GET \
#define TT_SERVICE_TRUETYPE_GLYF_GET \
( GET_PIC( library )->tt_service_truetype_glyf )

Write Preview
Loading…
Cancel
Save