ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sfnt] Formatting.

This commit is contained in:
Werner Lemberg 2012-08-27 05:48:23 +02:00
parent b355b5693a
commit d77b1ea012
3 changed files with 87 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sfnt/sfobjs.c
View File

@ -508,7 +508,7 @@
FT_TRACE2(( "`" #x "' " )); \ FT_TRACE2(( "`" #x "' " )); \
FT_TRACE3(( "-->\n" )); \ FT_TRACE3(( "-->\n" )); \
\ \
error = sfnt->load_##x( face, stream ); \ error = sfnt->load_ ## x( face, stream ); \
\ \
FT_TRACE2(( "%s\n", ( !error ) \ FT_TRACE2(( "%s\n", ( !error ) \
? "loaded" \ ? "loaded" \
@ -524,7 +524,7 @@
vertical ? "vertical " : "" )); \ vertical ? "vertical " : "" )); \
FT_TRACE3(( "-->\n" )); \ FT_TRACE3(( "-->\n" )); \
\ \
error = sfnt->load_##x( face, stream, vertical ); \ error = sfnt->load_ ## x( face, stream, vertical ); \
\ \
FT_TRACE2(( "%s\n", ( !error ) \ FT_TRACE2(( "%s\n", ( !error ) \
? "loaded" \ ? "loaded" \
@ -534,11 +534,11 @@
FT_TRACE3(( "\n" )); \ FT_TRACE3(( "\n" )); \
} while ( 0 ) } while ( 0 )
#define GET_NAME( id, field ) \ #define GET_NAME( id, field ) \
do { \ do { \
error = tt_face_get_name( face, TT_NAME_ID_##id, field ); \ error = tt_face_get_name( face, TT_NAME_ID_ ## id, field ); \
if ( error ) \ if ( error ) \
goto Exit; \ goto Exit; \
} while ( 0 ) } while ( 0 )
@ -555,13 +555,14 @@
#endif #endif
FT_Bool has_outline; FT_Bool has_outline;
FT_Bool is_apple_sbit; FT_Bool is_apple_sbit;
FT_Bool ignore_preferred_family = FALSE; FT_Bool ignore_preferred_family = FALSE;
FT_Bool ignore_preferred_subfamily = FALSE; FT_Bool ignore_preferred_subfamily = FALSE;
SFNT_Service sfnt = (SFNT_Service)face->sfnt; SFNT_Service sfnt = (SFNT_Service)face->sfnt;
FT_UNUSED( face_index ); FT_UNUSED( face_index );
/* Check parameters */ /* Check parameters */
{ {
@ -667,7 +668,7 @@
get_glyph_metrics ) get_glyph_metrics )
{ {
face->horizontal.number_Of_HMetrics = 0; face->horizontal.number_Of_HMetrics = 0;
error = SFNT_Err_Ok; error = SFNT_Err_Ok;
} }
#endif #endif
} }
@ -694,7 +695,7 @@
get_glyph_metrics ) get_glyph_metrics )
{ {
face->horizontal.number_Of_HMetrics = 0; face->horizontal.number_Of_HMetrics = 0;
error = SFNT_Err_Ok; error = SFNT_Err_Ok;
} }
#endif #endif

99
src/sfnt/ttcmap.h
View File

@ -4,7 +4,7 @@
/* */ /* */
/* TrueType character mapping table (cmap) support (specification). */ /* TrueType character mapping table (cmap) support (specification). */
/* */ /* */
/* Copyright 2002, 2003, 2004, 2005 by */ /* Copyright 2002-2005, 2009, 2012 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -55,47 +55,80 @@ FT_BEGIN_HEADER
} TT_CMap_ClassRec; } TT_CMap_ClassRec;
#ifndef FT_CONFIG_OPTION_PIC #ifndef FT_CONFIG_OPTION_PIC
#define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_, \ #define FT_DEFINE_TT_CMAP( class_, \
char_next_, char_var_index_, char_var_default_, variant_list_, \ size_, \
charvariant_list_,variantchar_list_, \ init_, \
format_, validate_, get_cmap_info_) \ done_, \
FT_CALLBACK_TABLE_DEF \ char_index_, \
const TT_CMap_ClassRec class_ = \ char_next_, \
{ \ char_var_index_, \
{size_, init_, done_, char_index_, \ char_var_default_, \
char_next_, char_var_index_, char_var_default_, variant_list_, \ variant_list_, \
charvariant_list_, variantchar_list_}, \ charvariant_list_, \
format_, validate_, get_cmap_info_ \ variantchar_list_, \
format_, \
validate_, \
get_cmap_info_ ) \
FT_CALLBACK_TABLE_DEF \
const TT_CMap_ClassRec class_ = \
{ \
{ size_, \
init_, \
done_, \
char_index_, \
char_next_, \
char_var_index_, \
char_var_default_, \
variant_list_, \
charvariant_list_, \
variantchar_list_ \
}, \
\
format_, \
validate_, \
get_cmap_info_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_TT_CMAP(class_, size_, init_, done_, char_index_, \ #define FT_DEFINE_TT_CMAP( class_, \
char_next_, char_var_index_, char_var_default_, variant_list_, \ size_, \
charvariant_list_,variantchar_list_, \ init_, \
format_, validate_, get_cmap_info_) \ done_, \
void \ char_index_, \
FT_Init_Class_##class_( TT_CMap_ClassRec* clazz ) \ char_next_, \
{ \ char_var_index_, \
clazz->clazz.size = size_; \ char_var_default_, \
clazz->clazz.init = init_; \ variant_list_, \
clazz->clazz.done = done_; \ charvariant_list_, \
clazz->clazz.char_index = char_index_; \ variantchar_list_, \
clazz->clazz.char_next = char_next_; \ format_, \
clazz->clazz.char_var_index = char_var_index_; \ validate_, \
clazz->clazz.char_var_default = char_var_default_; \ get_cmap_info_ ) \
clazz->clazz.variant_list = variant_list_; \ void \
clazz->clazz.charvariant_list = charvariant_list_; \ FT_Init_Class_ ## class_( TT_CMap_ClassRec* clazz ) \
clazz->clazz.variantchar_list = variantchar_list_; \ { \
clazz->format = format_; \ clazz->clazz.size = size_; \
clazz->validate = validate_; \ clazz->clazz.init = init_; \
clazz->get_cmap_info = get_cmap_info_; \ clazz->clazz.done = done_; \
clazz->clazz.char_index = char_index_; \
clazz->clazz.char_next = char_next_; \
clazz->clazz.char_var_index = char_var_index_; \
clazz->clazz.char_var_default = char_var_default_; \
clazz->clazz.variant_list = variant_list_; \
clazz->clazz.charvariant_list = charvariant_list_; \
clazz->clazz.variantchar_list = variantchar_list_; \
clazz->format = format_; \
clazz->validate = validate_; \
clazz->get_cmap_info = get_cmap_info_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
typedef struct TT_ValidatorRec_ typedef struct TT_ValidatorRec_
{ {
FT_ValidatorRec validator; FT_ValidatorRec validator;
@ -104,7 +137,7 @@ FT_BEGIN_HEADER
} TT_ValidatorRec, *TT_Validator; } TT_ValidatorRec, *TT_Validator;
#define TT_VALIDATOR( x ) ((TT_Validator)( x )) #define TT_VALIDATOR( x ) ( (TT_Validator)( x ) )
#define TT_VALID_GLYPH_COUNT( x ) TT_VALIDATOR( x )->num_glyphs #define TT_VALID_GLYPH_COUNT( x ) TT_VALIDATOR( x )->num_glyphs

19
src/sfnt/ttcmapc.h
View File

@ -17,39 +17,40 @@
#ifdef TT_CONFIG_CMAP_FORMAT_0 #ifdef TT_CONFIG_CMAP_FORMAT_0
TTCMAPCITEM(tt_cmap0_class_rec) TTCMAPCITEM( tt_cmap0_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_2 #ifdef TT_CONFIG_CMAP_FORMAT_2
TTCMAPCITEM(tt_cmap2_class_rec) TTCMAPCITEM( tt_cmap2_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_4 #ifdef TT_CONFIG_CMAP_FORMAT_4
TTCMAPCITEM(tt_cmap4_class_rec) TTCMAPCITEM( tt_cmap4_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_6 #ifdef TT_CONFIG_CMAP_FORMAT_6
TTCMAPCITEM(tt_cmap6_class_rec) TTCMAPCITEM( tt_cmap6_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_8 #ifdef TT_CONFIG_CMAP_FORMAT_8
TTCMAPCITEM(tt_cmap8_class_rec) TTCMAPCITEM( tt_cmap8_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_10 #ifdef TT_CONFIG_CMAP_FORMAT_10
TTCMAPCITEM(tt_cmap10_class_rec) TTCMAPCITEM( tt_cmap10_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_12 #ifdef TT_CONFIG_CMAP_FORMAT_12
TTCMAPCITEM(tt_cmap12_class_rec) TTCMAPCITEM( tt_cmap12_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_13 #ifdef TT_CONFIG_CMAP_FORMAT_13
TTCMAPCITEM(tt_cmap13_class_rec) TTCMAPCITEM( tt_cmap13_class_rec )
#endif #endif
#ifdef TT_CONFIG_CMAP_FORMAT_14 #ifdef TT_CONFIG_CMAP_FORMAT_14
TTCMAPCITEM(tt_cmap14_class_rec) TTCMAPCITEM( tt_cmap14_class_rec )
#endif #endif
/* END */ /* END */