diff --git a/ChangeLog b/ChangeLog index 4433a09e7..6b1170420 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-01-16 suzuki toshiya + + Remove trailing spaces. + 2012-01-16 suzuki toshiya Formatting PIC related sources. diff --git a/include/freetype/ftgasp.h b/include/freetype/ftgasp.h index 5e978e5c1..453d4fa42 100644 --- a/include/freetype/ftgasp.h +++ b/include/freetype/ftgasp.h @@ -62,12 +62,12 @@ * It is up to the client to decide what to do. * * FT_GASP_DO_GRIDFIT :: - * Grid-fitting and hinting should be performed at the specified ppem. + * Grid-fitting and hinting should be performed at the specified ppem. * This *really* means TrueType bytecode interpretation. If this bit * is not set, no hinting gets applied. * * FT_GASP_DO_GRAY :: - * Anti-aliased rendering should be performed at the specified ppem. + * Anti-aliased rendering should be performed at the specified ppem. * If not set, do monochrome rendering. * * FT_GASP_SYMMETRIC_SMOOTHING :: diff --git a/include/freetype/ftstroke.h b/include/freetype/ftstroke.h index dbda6d23d..49ae2bc06 100644 --- a/include/freetype/ftstroke.h +++ b/include/freetype/ftstroke.h @@ -85,25 +85,25 @@ FT_BEGIN_HEADER * miter limit is exceeded. The outer edges of the strokes * for the two segments are extended until they meet at an * angle. If the segments meet at too sharp an angle (such - * that the miter would extend from the intersection of the - * segments a distance greater than the product of the miter - * limit value and the border radius), then a bevel join (see - * above) is used instead. This prevents long spikes being - * created. FT_STROKER_LINEJOIN_MITER_FIXED generates a miter + * that the miter would extend from the intersection of the + * segments a distance greater than the product of the miter + * limit value and the border radius), then a bevel join (see + * above) is used instead. This prevents long spikes being + * created. FT_STROKER_LINEJOIN_MITER_FIXED generates a miter * line join as used in PostScript and PDF. * * FT_STROKER_LINEJOIN_MITER_VARIABLE :: * FT_STROKER_LINEJOIN_MITER :: * Used to render mitered line joins, with variable bevels if - * the miter limit is exceeded. The intersection of the - * strokes is clipped at a line perpendicular to the bisector - * of the angle between the strokes, at the distance from the - * intersection of the segments equal to the product of the - * miter limit value and the border radius. This prevents - * long spikes being created. - * FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line - * join as used in XPS. FT_STROKER_LINEJOIN_MITER is an alias - * for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for + * the miter limit is exceeded. The intersection of the + * strokes is clipped at a line perpendicular to the bisector + * of the angle between the strokes, at the distance from the + * intersection of the segments equal to the product of the + * miter limit value and the border radius. This prevents + * long spikes being created. + * FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line + * join as used in XPS. FT_STROKER_LINEJOIN_MITER is an alias + * for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for * backwards compatibility. */ typedef enum FT_Stroker_LineJoin_ diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h index 7e3a08a05..231bdd4a5 100644 --- a/include/freetype/internal/autohint.h +++ b/include/freetype/internal/autohint.h @@ -206,7 +206,7 @@ FT_BEGIN_HEADER reset_face_, get_global_hints_, done_global_hints_, load_glyph_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \ done_global_hints_, load_glyph_) \ @@ -219,9 +219,9 @@ FT_BEGIN_HEADER clazz->get_global_hints = get_global_hints_; \ clazz->done_global_hints = done_global_hints_; \ clazz->load_glyph = load_glyph_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ FT_END_HEADER diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h index 4d541cfc8..6f6b20622 100644 --- a/include/freetype/internal/ftdriver.h +++ b/include/freetype/internal/ftdriver.h @@ -286,7 +286,7 @@ FT_BEGIN_HEADER #define FT_DECLARE_DRIVER(class_) \ FT_CALLBACK_TABLE \ - const FT_Driver_ClassRec class_; + const FT_Driver_ClassRec class_; #define FT_DEFINE_DRIVER(class_, \ flags_, size_, name_, version_, requires_, \ @@ -328,7 +328,7 @@ FT_BEGIN_HEADER select_size_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #ifdef FT_CONFIG_OPTION_OLD_INTERNALS #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \ @@ -408,7 +408,7 @@ FT_BEGIN_HEADER \ *output_class = (FT_Module_Class*)clazz; \ return FT_Err_Ok; \ - } + } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index b38b41ee9..5c227e19e 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h @@ -243,7 +243,7 @@ FT_BEGIN_HEADER clazz->variant_list = variant_list_; \ clazz->charvariant_list = charvariant_list_; \ clazz->variantchar_list = variantchar_list_; \ - } + } #endif /* FT_CONFIG_OPTION_PIC */ /* create a new charmap and add it to charmap->face */ @@ -976,7 +976,7 @@ FT_BEGIN_HEADER move_to_, line_to_, conic_to_, cubic_to_, shift_, delta_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_, \ cubic_to_, shift_, delta_) \ @@ -990,9 +990,9 @@ FT_BEGIN_HEADER clazz->shift = shift_; \ clazz->delta = delta_; \ return FT_Err_Ok; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /*************************************************************************/ /* */ @@ -1018,7 +1018,7 @@ FT_BEGIN_HEADER raster_set_mode_, raster_render_, raster_done_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_, \ raster_reset_, raster_set_mode_, raster_render_, raster_done_) \ @@ -1031,9 +1031,9 @@ FT_BEGIN_HEADER clazz->raster_set_mode = raster_set_mode_; \ clazz->raster_render = raster_render_; \ clazz->raster_done = raster_done_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /*************************************************************************/ /*************************************************************************/ @@ -1072,7 +1072,7 @@ FT_BEGIN_HEADER size_, format_, init_, done_, copy_, transform_, bbox_, prepare_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_, \ transform_, bbox_, prepare_) \ @@ -1087,9 +1087,9 @@ FT_BEGIN_HEADER clazz->glyph_transform = transform_; \ clazz->glyph_bbox = bbox_; \ clazz->glyph_prepare = prepare_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /*************************************************************************/ /* */ @@ -1152,7 +1152,7 @@ FT_BEGIN_HEADER raster_class_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DECLARE_RENDERER(class_) FT_DECLARE_MODULE(class_) @@ -1205,11 +1205,11 @@ FT_BEGIN_HEADER \ *output_class = (FT_Module_Class*)clazz; \ return FT_Err_Ok; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /*************************************************************************/ /*************************************************************************/ @@ -1369,7 +1369,7 @@ FT_BEGIN_HEADER \ clazz->root.module_init = init_; \ clazz->root.module_done = done_; \ - clazz->root.get_interface = get_interface_; + clazz->root.get_interface = get_interface_; #define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_, \ interface_, init_, done_, get_interface_) \ @@ -1415,7 +1415,7 @@ FT_BEGIN_HEADER \ *output_class = clazz; \ return FT_Err_Ok; \ - } + } #endif /* FT_CONFIG_OPTION_PIC */ diff --git a/include/freetype/internal/ftpic.h b/include/freetype/internal/ftpic.h index 1b31957d7..5b674e6a5 100644 --- a/include/freetype/internal/ftpic.h +++ b/include/freetype/internal/ftpic.h @@ -26,7 +26,7 @@ #ifndef __FTPIC_H__ #define __FTPIC_H__ - + FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC @@ -36,14 +36,14 @@ FT_BEGIN_HEADER /* pic containers for base */ void* base; /* pic containers for modules */ - void* autofit; - void* cff; - void* pshinter; - void* psnames; - void* raster; - void* sfnt; - void* smooth; - void* truetype; + void* autofit; + void* cff; + void* pshinter; + void* psnames; + void* raster; + void* sfnt; + void* smooth; + void* truetype; } FT_PIC_Container; /* Initialize the various function tables, structs, etc. stored in the container. */ diff --git a/include/freetype/internal/ftserv.h b/include/freetype/internal/ftserv.h index 569b9f7e0..7dd031f4a 100644 --- a/include/freetype/internal/ftserv.h +++ b/include/freetype/internal/ftserv.h @@ -246,7 +246,7 @@ FT_BEGIN_HEADER {NULL, NULL} \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1) \ void \ @@ -274,7 +274,7 @@ FT_BEGIN_HEADER clazz[1].serv_data = NULL; \ *output_class = clazz; \ return FT_Err_Ok; \ - } + } #define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1, \ serv_id_2, serv_data_2) \ @@ -305,7 +305,7 @@ FT_BEGIN_HEADER clazz[2].serv_data = NULL; \ *output_class = clazz; \ return FT_Err_Ok; \ - } + } #define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1, \ serv_id_2, serv_data_2, serv_id_3, serv_data_3) \ @@ -338,7 +338,7 @@ FT_BEGIN_HEADER clazz[3].serv_data = NULL; \ *output_class = clazz; \ return FT_Err_Ok; \ - } + } #define FT_DEFINE_SERVICEDESCREC4(class_, serv_id_1, serv_data_1, \ serv_id_2, serv_data_2, serv_id_3, serv_data_3, \ @@ -374,7 +374,7 @@ FT_BEGIN_HEADER clazz[4].serv_data = NULL; \ *output_class = clazz; \ return FT_Err_Ok; \ - } + } #define FT_DEFINE_SERVICEDESCREC5(class_, serv_id_1, serv_data_1, \ serv_id_2, serv_data_2, serv_id_3, serv_data_3, serv_id_4, \ @@ -412,7 +412,7 @@ FT_BEGIN_HEADER clazz[5].serv_data = NULL; \ *output_class = clazz; \ return FT_Err_Ok; \ - } + } #define FT_DEFINE_SERVICEDESCREC6(class_, serv_id_1, serv_data_1, \ serv_id_2, serv_data_2, serv_id_3, serv_data_3, \ @@ -453,8 +453,8 @@ FT_BEGIN_HEADER clazz[6].serv_data = NULL; \ *output_class = clazz; \ return FT_Err_Ok; \ - } -#endif /* FT_CONFIG_OPTION_PIC */ + } +#endif /* FT_CONFIG_OPTION_PIC */ /* * Parse a list of FT_ServiceDescRec descriptors and look for diff --git a/include/freetype/internal/pshints.h b/include/freetype/internal/pshints.h index 0c357651b..5b7b6984c 100644 --- a/include/freetype/internal/pshints.h +++ b/include/freetype/internal/pshints.h @@ -688,7 +688,7 @@ FT_BEGIN_HEADER get_globals_funcs_, get_t1_funcs_, get_t2_funcs_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_, \ get_t1_funcs_, get_t2_funcs_) \ @@ -700,9 +700,9 @@ FT_BEGIN_HEADER clazz->get_globals_funcs = get_globals_funcs_; \ clazz->get_t1_funcs = get_t1_funcs_; \ clazz->get_t2_funcs = get_t2_funcs_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ FT_END_HEADER diff --git a/include/freetype/internal/services/svbdf.h b/include/freetype/internal/services/svbdf.h index 926423914..2aae41fa4 100644 --- a/include/freetype/internal/services/svbdf.h +++ b/include/freetype/internal/services/svbdf.h @@ -53,7 +53,7 @@ FT_BEGIN_HEADER get_charset_id_, get_property_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_BDFRec(class_, get_charset_id_, get_property_) \ void \ @@ -61,9 +61,9 @@ FT_BEGIN_HEADER { \ clazz->get_charset_id = get_charset_id_; \ clazz->get_property = get_property_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svcid.h b/include/freetype/internal/services/svcid.h index 9b874b5e7..e176f9b40 100644 --- a/include/freetype/internal/services/svcid.h +++ b/include/freetype/internal/services/svcid.h @@ -55,7 +55,7 @@ FT_BEGIN_HEADER get_ros_, get_is_cid_, get_cid_from_glyph_index_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \ get_is_cid_, get_cid_from_glyph_index_ ) \ @@ -67,9 +67,9 @@ FT_BEGIN_HEADER clazz->get_ros = get_ros_; \ clazz->get_is_cid = get_is_cid_; \ clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svgldict.h b/include/freetype/internal/services/svgldict.h index d66a41d5a..d49ca25ca 100644 --- a/include/freetype/internal/services/svgldict.h +++ b/include/freetype/internal/services/svgldict.h @@ -59,7 +59,7 @@ FT_BEGIN_HEADER get_name_, name_index_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \ void \ @@ -69,9 +69,9 @@ FT_BEGIN_HEADER FT_UNUSED(library); \ clazz->get_name = get_name_; \ clazz->name_index = name_index_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svmm.h b/include/freetype/internal/services/svmm.h index 66e1da22f..358ba74ab 100644 --- a/include/freetype/internal/services/svmm.h +++ b/include/freetype/internal/services/svmm.h @@ -77,7 +77,7 @@ FT_BEGIN_HEADER get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_MULTIMASTERSREC(class_, get_mm_, set_mm_design_, \ set_mm_blend_, get_mm_var_, set_var_design_) \ @@ -89,9 +89,9 @@ FT_BEGIN_HEADER clazz->set_mm_blend = set_mm_blend_; \ clazz->get_mm_var = get_mm_var_; \ clazz->set_var_design = set_var_design_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svpostnm.h b/include/freetype/internal/services/svpostnm.h index 106c54f85..5d8729fd9 100644 --- a/include/freetype/internal/services/svpostnm.h +++ b/include/freetype/internal/services/svpostnm.h @@ -54,7 +54,7 @@ FT_BEGIN_HEADER get_ps_font_name_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \ void \ @@ -63,9 +63,9 @@ FT_BEGIN_HEADER { \ FT_UNUSED(library); \ clazz->get_ps_font_name = get_ps_font_name_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svpscmap.h b/include/freetype/internal/services/svpscmap.h index 961030cc3..fdfa588da 100644 --- a/include/freetype/internal/services/svpscmap.h +++ b/include/freetype/internal/services/svpscmap.h @@ -130,7 +130,7 @@ FT_BEGIN_HEADER adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_PSCMAPSREC(class_, unicode_value_, unicodes_init_, \ unicodes_char_index_, unicodes_char_next_, macintosh_name_, \ @@ -148,9 +148,9 @@ FT_BEGIN_HEADER clazz->adobe_std_strings = adobe_std_strings_; \ clazz->adobe_std_encoding = adobe_std_encoding_; \ clazz->adobe_expert_encoding = adobe_expert_encoding_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svpsinfo.h b/include/freetype/internal/services/svpsinfo.h index 84d6a78a1..59b626bb8 100644 --- a/include/freetype/internal/services/svpsinfo.h +++ b/include/freetype/internal/services/svpsinfo.h @@ -72,7 +72,7 @@ FT_BEGIN_HEADER get_font_private_, get_font_value_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \ ps_get_font_extra_, has_glyph_names_, get_font_private_, \ @@ -87,9 +87,9 @@ FT_BEGIN_HEADER clazz->ps_has_glyph_names = has_glyph_names_; \ clazz->ps_get_font_private = get_font_private_; \ clazz->ps_get_font_value = get_font_value_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svsfnt.h b/include/freetype/internal/services/svsfnt.h index 30bb1620f..b4c1e0fce 100644 --- a/include/freetype/internal/services/svsfnt.h +++ b/include/freetype/internal/services/svsfnt.h @@ -77,7 +77,7 @@ FT_BEGIN_HEADER load_, get_, info_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_SFNT_TABLEREC(class_, load_, get_, info_) \ void \ @@ -86,9 +86,9 @@ FT_BEGIN_HEADER clazz->load_table = load_; \ clazz->get_table = get_; \ clazz->table_info = info_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svttcmap.h b/include/freetype/internal/services/svttcmap.h index 8af00351d..cab3d248a 100644 --- a/include/freetype/internal/services/svttcmap.h +++ b/include/freetype/internal/services/svttcmap.h @@ -82,7 +82,7 @@ FT_BEGIN_HEADER get_cmap_info_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_TTCMAPSREC(class_, get_cmap_info_) \ void \ @@ -91,9 +91,9 @@ FT_BEGIN_HEADER { \ FT_UNUSED(library); \ clazz->get_cmap_info = get_cmap_info_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/services/svttglyf.h b/include/freetype/internal/services/svttglyf.h index ab2dc9a9f..f7bcabbd8 100644 --- a/include/freetype/internal/services/svttglyf.h +++ b/include/freetype/internal/services/svttglyf.h @@ -45,16 +45,16 @@ FT_BEGIN_HEADER get_location_ \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #define FT_DEFINE_SERVICE_TTGLYFREC(class_, get_location_ ) \ void \ FT_Init_Class_##class_( FT_Service_TTGlyfRec* clazz ) \ { \ clazz->get_location = get_location_; \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ /* */ diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h index 6326debd0..905ca8ccd 100644 --- a/include/freetype/internal/sfnt.h +++ b/include/freetype/internal/sfnt.h @@ -757,12 +757,12 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_OLD_INTERNALS #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) \ - a, + a, #else #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) #endif #define FT_INTERNAL(a) \ - a, + a, #define FT_DEFINE_SFNT_INTERFACE(class_, \ goto_table_, init_face_, load_face_, done_face_, get_interface_, \ @@ -819,7 +819,7 @@ FT_BEGIN_HEADER FT_INTERNAL(get_metrics_) \ }; -#else /* FT_CONFIG_OPTION_PIC */ +#else /* FT_CONFIG_OPTION_PIC */ #ifdef FT_CONFIG_OPTION_OLD_INTERNALS #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a, a_) \ @@ -885,9 +885,9 @@ FT_BEGIN_HEADER FT_INTERNAL(set_sbit_strike,set_sbit_strike_) \ FT_INTERNAL(load_strike_metrics,load_strike_metrics_) \ FT_INTERNAL(get_metrics,get_metrics_) \ - } + } -#endif /* FT_CONFIG_OPTION_PIC */ +#endif /* FT_CONFIG_OPTION_PIC */ FT_END_HEADER diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h index acbb863b0..57b1731ca 100644 --- a/include/freetype/internal/tttypes.h +++ b/include/freetype/internal/tttypes.h @@ -1401,7 +1401,7 @@ FT_BEGIN_HEADER FT_Byte* vert_metrics; FT_ULong vert_metrics_size; - FT_ULong num_locations; /* in broken TTF, gid > 0xFFFF */ + FT_ULong num_locations; /* in broken TTF, gid > 0xFFFF */ FT_Byte* glyph_locations; FT_Byte* hdmx_table; diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c index 3c5f02ec6..3e0c02d3f 100644 --- a/src/autofit/afglobal.c +++ b/src/autofit/afglobal.c @@ -43,7 +43,7 @@ #endif &af_latin_script_class, &af_cjk_script_class, - &af_indic_script_class, + &af_indic_script_class, NULL /* do not remove */ }; diff --git a/src/autofit/afpic.c b/src/autofit/afpic.c index 966fdd313..87074afcf 100644 --- a/src/autofit/afpic.c +++ b/src/autofit/afpic.c @@ -77,7 +77,7 @@ &container->af_script_classes_rec[ss]; } container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL; - + /* add call to initialization function when you add new scripts */ ss = 0; FT_Init_Class_af_dummy_script_class( diff --git a/src/autofit/afpic.h b/src/autofit/afpic.h index 69e442f69..21b0ff988 100644 --- a/src/autofit/afpic.h +++ b/src/autofit/afpic.h @@ -19,7 +19,7 @@ #ifndef __AFPIC_H__ #define __AFPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H @@ -38,9 +38,9 @@ FT_BEGIN_HEADER #ifdef FT_OPTION_AUTOFIT2 #define AF_SCRIPT_CLASSES_COUNT 6 #else -#define AF_SCRIPT_CLASSES_COUNT 5 +#define AF_SCRIPT_CLASSES_COUNT 5 #endif -#define AF_SCRIPT_CLASSES_REC_COUNT ( AF_SCRIPT_CLASSES_COUNT - 1 ) +#define AF_SCRIPT_CLASSES_REC_COUNT ( AF_SCRIPT_CLASSES_COUNT - 1 ) typedef struct AFModulePIC_ { diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h index 44997d1e2..21e442c23 100644 --- a/src/autofit/aftypes.h +++ b/src/autofit/aftypes.h @@ -231,7 +231,7 @@ extern void* _af_debug_hints; AF_SCRIPT_NONE = 0, AF_SCRIPT_LATIN = 1, AF_SCRIPT_CJK = 2, - AF_SCRIPT_INDIC = 3, + AF_SCRIPT_INDIC = 3, #ifdef FT_OPTION_AUTOFIT2 AF_SCRIPT_LATIN2, #endif diff --git a/src/autofit/afwarp.c b/src/autofit/afwarp.c index d0d4850bd..34a97ffc5 100644 --- a/src/autofit/afwarp.c +++ b/src/autofit/afwarp.c @@ -352,7 +352,7 @@ { FT_Fixed best_scale = warper->best_scale; FT_Pos best_delta = warper->best_delta; - + hints->xmin_delta = FT_MulFix( X1, best_scale - org_scale ) + best_delta; diff --git a/src/base/basepic.h b/src/base/basepic.h index f551cb6cb..0ed555448 100644 --- a/src/base/basepic.h +++ b/src/base/basepic.h @@ -19,7 +19,7 @@ #ifndef __BASEPIC_H__ #define __BASEPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index 15c9d6559..84fa32275 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -231,7 +231,7 @@ if ( ( ( FT_PIX_ROUND( xStrength ) >> 6 ) > FT_INT_MAX ) || ( ( FT_PIX_ROUND( yStrength ) >> 6 ) > FT_INT_MAX ) ) return FT_Err_Invalid_Argument; - + xstr = (FT_Int)FT_PIX_ROUND( xStrength ) >> 6; ystr = (FT_Int)FT_PIX_ROUND( yStrength ) >> 6; diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 3892fabfe..6ff01ee99 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -464,7 +464,7 @@ * Unfortunately, it doesn't work (at least not portably). * * It makes the assumption that right-shift on a negative signed value - * fills the leftmost bits by copying the sign bit. This is wrong. + * fills the leftmost bits by copying the sign bit. This is wrong. * According to K&R 2nd ed, section `A7.8 Shift Operators' on page 206, * the result of right-shift of a negative signed value is * implementation-defined. At least one implementation fills the diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 3d7cf3626..591b57a75 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -254,7 +254,7 @@ } - FT_DEFINE_GLYPH( ft_outline_glyph_class, + FT_DEFINE_GLYPH( ft_outline_glyph_class, sizeof ( FT_OutlineGlyphRec ), FT_GLYPH_FORMAT_OUTLINE, diff --git a/src/base/ftinit.c b/src/base/ftinit.c index 6711b6e9c..5774658e0 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -104,7 +104,7 @@ FT_NUM_MODULE_CLASSES }; - /* destroy all module classes */ + /* destroy all module classes */ #undef FT_USE_MODULE #define FT_USE_MODULE( type, x ) \ if ( classes[i] ) { FT_Destroy_Class_##x(library, classes[i]); } \ @@ -148,7 +148,7 @@ FT_UInt i; BasePIC* pic_container = (BasePIC*)library->pic_container.base; - memory = library->memory; + memory = library->memory; pic_container->default_module_classes = 0; if ( FT_ALLOC(classes, sizeof(FT_Module_Class*) * (FT_NUM_MODULE_CLASSES + 1) ) ) @@ -162,11 +162,11 @@ #include FT_CONFIG_MODULES_H -Exit: +Exit: if (error) ft_destroy_default_module_classes( library ); else pic_container->default_module_classes = classes; - return error; + return error; } diff --git a/src/base/ftmac.c b/src/base/ftmac.c index d892bf16f..f2007485d 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -146,7 +146,7 @@ { #if defined( MAC_OS_X_VERSION_10_5 ) && \ ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ) - + OSStatus err; err = ATSFontGetFileReference( ats_font_id, ats_font_ref ); diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 01114269d..0edcc77b6 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -30,7 +30,7 @@ THE SOFTWARE. #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_OBJECTS_H #include FT_BDF_H -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #include FT_SERVICE_BDF_H #include FT_SERVICE_XFREE86_NAME_H diff --git a/src/bdf/bdfdrivr.h b/src/bdf/bdfdrivr.h index db7093bb4..ca0dae50d 100644 --- a/src/bdf/bdfdrivr.h +++ b/src/bdf/bdfdrivr.h @@ -38,7 +38,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif typedef struct BDF_encoding_el_ diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c index 8bed6be08..d4fc353c4 100644 --- a/src/cache/ftcbasic.c +++ b/src/cache/ftcbasic.c @@ -467,7 +467,7 @@ } - + #ifdef FT_CONFIG_OPTION_OLD_INTERNALS /* yet another backwards-legacy structure */ diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c index b7bd2919d..ad436ef0c 100644 --- a/src/cache/ftccmap.c +++ b/src/cache/ftccmap.c @@ -320,7 +320,7 @@ /* * If cmap_index is greater than the maximum number of cachable - * charmaps, we assume the request is from a legacy rogue client + * charmaps, we assume the request is from a legacy rogue client * using old internal header. See include/config/ftoption.h. */ if ( cmap_index > FT_MAX_CHARMAP_CACHEABLE && !no_cmap_change ) diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 548ebe951..76a510d04 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -28,7 +28,7 @@ #ifdef FT_CONFIG_OPTION_PIC #error "cache system does not support PIC yet" -#endif +#endif #undef FT_COMPONENT diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index 49453f116..583b4578a 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -466,7 +466,7 @@ dict->cid_registry ); *registry = cff->registry; } - + if ( ordering ) { if ( cff->ordering == NULL ) @@ -489,7 +489,7 @@ *supplement = (FT_Int)dict->cid_supplement; } } - + Fail: return error; } diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index f1f06a799..f01342585 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -2706,7 +2706,7 @@ FT_Byte fd_index = cff_fd_select_get( &cff->fd_select, glyph_index ); - if ( fd_index >= cff->num_subfonts ) + if ( fd_index >= cff->num_subfonts ) fd_index = (FT_Byte)( cff->num_subfonts - 1 ); top_upm = cff->top_font.font_dict.units_per_em; @@ -2962,7 +2962,7 @@ if ( has_vertical_info ) metrics->vertBearingX = metrics->horiBearingX - metrics->horiAdvance / 2; - else + else { if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) ft_synthesize_vertical_metrics( metrics, diff --git a/src/cff/cffload.h b/src/cff/cffload.h index c755de9a2..804961964 100644 --- a/src/cff/cffload.h +++ b/src/cff/cffload.h @@ -60,7 +60,7 @@ FT_BEGIN_HEADER FT_LOCAL( FT_Error ) - cff_font_load( FT_Library library, + cff_font_load( FT_Library library, FT_Stream stream, FT_Int face_index, CFF_Font font, diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index ea12c95e1..1eb85fea0 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -403,7 +403,7 @@ FT_Int32 idx = 0; FT_Int32 length = strlen( name ) + 1; FT_Bool continue_search = 1; - + while ( continue_search ) { @@ -780,7 +780,7 @@ char* family_name = NULL; - remove_subset_prefix( cffface->family_name ); + remove_subset_prefix( cffface->family_name ); if ( dict->family_name ) { @@ -827,7 +827,7 @@ style_name = cff_strcpy( memory, fullp ); /* remove the style part from the family name (if present) */ - remove_style( cffface->family_name, style_name ); + remove_style( cffface->family_name, style_name ); } break; } diff --git a/src/cff/cffpic.h b/src/cff/cffpic.h index 342bf31d3..342edd845 100644 --- a/src/cff/cffpic.h +++ b/src/cff/cffpic.h @@ -19,7 +19,7 @@ #ifndef __CFFPIC_H__ #define __CFFPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/cff/cfftypes.h b/src/cff/cfftypes.h index cae368956..7c99036b5 100644 --- a/src/cff/cfftypes.h +++ b/src/cff/cfftypes.h @@ -269,7 +269,7 @@ FT_BEGIN_HEADER /* since version 2.3.6 */ FT_String* registry; FT_String* ordering; - + } CFF_FontRec, *CFF_Font; diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 81742d167..bd8402340 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -426,7 +426,7 @@ metrics->horiBearingX = cbox.xMin; metrics->horiBearingY = cbox.yMax; - if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) + if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) { /* make up vertical ones */ ft_synthesize_vertical_metrics( metrics, diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index eefcc234b..694070aab 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -111,13 +111,13 @@ if ( registry ) *registry = cid->registry; - + if ( ordering ) *ordering = cid->ordering; if ( supplement ) *supplement = cid->supplement; - + return CID_Err_Ok; } diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h index c7f424bb3..3c45e0688 100644 --- a/src/cid/cidriver.h +++ b/src/cid/cidriver.h @@ -28,7 +28,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_CALLBACK_TABLE diff --git a/src/gxvalid/gxvmod.h b/src/gxvalid/gxvmod.h index d912a8f83..22732ba99 100644 --- a/src/gxvalid/gxvmod.h +++ b/src/gxvalid/gxvmod.h @@ -36,7 +36,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Module_Class ) gxv_module_class; diff --git a/src/gzip/ftgzip.c b/src/gzip/ftgzip.c index 52966ece7..dbba3ef5f 100644 --- a/src/gzip/ftgzip.c +++ b/src/gzip/ftgzip.c @@ -42,7 +42,7 @@ #ifdef FT_CONFIG_OPTION_PIC #error "gzip code does not support PIC yet" -#endif +#endif #ifdef FT_CONFIG_OPTION_SYSTEM_ZLIB diff --git a/src/lzw/ftlzw.c b/src/lzw/ftlzw.c index 7f254999a..547431782 100644 --- a/src/lzw/ftlzw.c +++ b/src/lzw/ftlzw.c @@ -44,7 +44,7 @@ #ifdef FT_CONFIG_OPTION_PIC #error "lzw code does not support PIC yet" -#endif +#endif #include "ftzopen.h" diff --git a/src/otvalid/otvmod.h b/src/otvalid/otvmod.h index 573b2a0c4..f7e155078 100644 --- a/src/otvalid/otvmod.h +++ b/src/otvalid/otvmod.h @@ -29,7 +29,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Module_Class ) otv_module_class; diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c index 40245635d..ba5448842 100644 --- a/src/pcf/pcfdrivr.c +++ b/src/pcf/pcfdrivr.c @@ -35,7 +35,7 @@ THE SOFTWARE. #include FT_BZIP2_H #include FT_ERRORS_H #include FT_BDF_H -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #include "pcf.h" #include "pcfdrivr.h" diff --git a/src/pcf/pcfdrivr.h b/src/pcf/pcfdrivr.h index a81d7309e..54614951b 100644 --- a/src/pcf/pcfdrivr.h +++ b/src/pcf/pcfdrivr.h @@ -35,7 +35,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class; diff --git a/src/pfr/pfrdrivr.h b/src/pfr/pfrdrivr.h index da0a1aa63..75f86c5cd 100644 --- a/src/pfr/pfrdrivr.h +++ b/src/pfr/pfrdrivr.h @@ -28,7 +28,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Driver_ClassRec ) pfr_driver_class; diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c index 07ad22651..c65cf2990 100644 --- a/src/pfr/pfrobjs.c +++ b/src/pfr/pfrobjs.c @@ -23,7 +23,7 @@ #include "pfrsbit.h" #include FT_OUTLINE_H #include FT_INTERNAL_DEBUG_H -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #include "pfrerror.h" diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h index 35e042dbc..121723692 100644 --- a/src/psaux/psauxmod.h +++ b/src/psaux/psauxmod.h @@ -28,7 +28,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Module_Class ) psaux_driver_class; diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index a46469f92..341de9f55 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -199,7 +199,7 @@ #ifdef FT_CONFIG_OPTION_INCREMENTAL T1_Face face = (T1_Face)decoder->builder.face; -#endif +#endif if ( decoder->seac ) diff --git a/src/pshinter/pshpic.c b/src/pshinter/pshpic.c index 5ac5a83b8..1e0f9a9dc 100644 --- a/src/pshinter/pshpic.c +++ b/src/pshinter/pshpic.c @@ -58,7 +58,7 @@ return error; FT_MEM_SET( container, 0, sizeof ( *container ) ); pic_container->pshinter = container; - + /* add call to initialization function when you add new scripts */ FT_Init_Class_pshinter_interface( library, &container->pshinter_interface ); diff --git a/src/pshinter/pshpic.h b/src/pshinter/pshpic.h index 317a2df7f..c10bdd999 100644 --- a/src/pshinter/pshpic.h +++ b/src/pshinter/pshpic.h @@ -19,7 +19,7 @@ #ifndef __PSHPIC_H__ #define __PSHPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index 2577382ec..361917415 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -521,7 +521,7 @@ #ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST - FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, + FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, (PS_Unicode_ValueFunc) ps_unicode_value, (PS_Unicodes_InitFunc) ps_unicodes_init, (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index, @@ -536,7 +536,7 @@ #else - FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, + FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, 0, 0, 0, @@ -552,7 +552,7 @@ #endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */ - FT_DEFINE_SERVICEDESCREC1(pscmaps_services, + FT_DEFINE_SERVICEDESCREC1(pscmaps_services, FT_SERVICE_ID_POSTSCRIPT_CMAPS, &FT_PSCMAPS_INTERFACE_GET ) @@ -590,7 +590,7 @@ #endif FT_DEFINE_MODULE(psnames_module_class, - + 0, /* this is not a font driver, nor a renderer */ sizeof ( FT_ModuleRec ), diff --git a/src/psnames/pspic.c b/src/psnames/pspic.c index ae9175d66..467ab7329 100644 --- a/src/psnames/pspic.c +++ b/src/psnames/pspic.c @@ -80,7 +80,7 @@ goto Exit; FT_Init_Class_pscmaps_interface( library, &container->pscmaps_interface ); - + Exit: if ( error ) psnames_module_class_pic_free( library ); diff --git a/src/psnames/pspic.h b/src/psnames/pspic.h index e585e8565..1169b89f0 100644 --- a/src/psnames/pspic.h +++ b/src/psnames/pspic.h @@ -19,7 +19,7 @@ #ifndef __PSPIC_H__ #define __PSPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/raster/rastpic.c b/src/raster/rastpic.c index 70398bf4f..2883e3fde 100644 --- a/src/raster/rastpic.c +++ b/src/raster/rastpic.c @@ -55,7 +55,7 @@ FT_Memory memory = library->memory; - /* since this function also serve raster5 renderer, + /* since this function also serve raster5 renderer, it implements reference counting */ if ( pic_container->raster ) { diff --git a/src/raster/rastpic.h b/src/raster/rastpic.h index ee39f2a50..7822a24b4 100644 --- a/src/raster/rastpic.h +++ b/src/raster/rastpic.h @@ -19,7 +19,7 @@ #ifndef __RASTPIC_H__ #define __RASTPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index fadb15b76..847d83d2e 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -430,7 +430,7 @@ if ( !module ) return NULL; library = module->library; - if ( !library ) + if ( !library ) return NULL; #else FT_UNUSED( module ); @@ -567,14 +567,14 @@ #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS -#define PUT_EMBEDDED_BITMAPS(a) a +#define PUT_EMBEDDED_BITMAPS(a) a #else -#define PUT_EMBEDDED_BITMAPS(a) 0 +#define PUT_EMBEDDED_BITMAPS(a) 0 #endif #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES -#define PUT_PS_NAMES(a) a +#define PUT_PS_NAMES(a) a #else -#define PUT_PS_NAMES(a) 0 +#define PUT_PS_NAMES(a) 0 #endif FT_DEFINE_SFNT_INTERFACE(sfnt_interface, @@ -648,7 +648,7 @@ FT_DEFINE_MODULE(sfnt_module_class, - + 0, /* not a font driver or renderer */ sizeof ( FT_ModuleRec ), diff --git a/src/sfnt/sfntpic.h b/src/sfnt/sfntpic.h index 11a78f775..f7993d193 100644 --- a/src/sfnt/sfntpic.h +++ b/src/sfnt/sfntpic.h @@ -19,7 +19,7 @@ #ifndef __SFNTPIC_H__ #define __SFNTPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 544750ab1..1dfd9876f 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -3363,7 +3363,7 @@ return error; /* the location of the class instances follows the array of pointers */ - recs = (TT_CMap_ClassRec*) (((char*)clazz)+(sizeof(*clazz)*(i+1))); + recs = (TT_CMap_ClassRec*) (((char*)clazz)+(sizeof(*clazz)*(i+1))); i=0; #undef TTCMAPCITEM diff --git a/src/sfnt/ttcmap.h b/src/sfnt/ttcmap.h index 15a4a21e5..94f797897 100644 --- a/src/sfnt/ttcmap.h +++ b/src/sfnt/ttcmap.h @@ -70,7 +70,7 @@ FT_BEGIN_HEADER 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_, \ char_next_, char_var_index_, char_var_default_, variant_list_, \ @@ -92,9 +92,9 @@ FT_BEGIN_HEADER 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_ { diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 7db79b0a3..7d35cf272 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -449,7 +449,7 @@ FT_DEFINE_RENDERER( ft_smooth_lcd_renderer_class, - + FT_MODULE_RENDERER, sizeof ( FT_RendererRec ), diff --git a/src/smooth/ftspic.c b/src/smooth/ftspic.c index 407749ae2..601bcf98a 100644 --- a/src/smooth/ftspic.c +++ b/src/smooth/ftspic.c @@ -57,7 +57,7 @@ FT_Memory memory = library->memory; - /* since this function also serve smooth_lcd and smooth_lcdv renderers, + /* since this function also serve smooth_lcd and smooth_lcdv renderers, it implements reference counting */ if ( pic_container->smooth ) { diff --git a/src/smooth/ftspic.h b/src/smooth/ftspic.h index e83e4579d..4686f5e35 100644 --- a/src/smooth/ftspic.h +++ b/src/smooth/ftspic.h @@ -19,7 +19,7 @@ #ifndef __FTSPIC_H__ #define __FTSPIC_H__ - + FT_BEGIN_HEADER #include FT_INTERNAL_PIC_H diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 3305c977c..6ac4be58c 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -8254,7 +8254,7 @@ if ( CUR.error && !CUR.instruction_trap ) { FT_TRACE1(( " The interpreter returned error 0x%x\n", CUR.error )); - exc->size->cvt_ready = FALSE; + exc->size->cvt_ready = FALSE; } return CUR.error; diff --git a/src/truetype/ttpic.h b/src/truetype/ttpic.h index d9ea9d18c..48f43a5f9 100644 --- a/src/truetype/ttpic.h +++ b/src/truetype/ttpic.h @@ -19,7 +19,7 @@ #ifndef __TTPIC_H__ #define __TTPIC_H__ - + FT_BEGIN_HEADER #ifndef FT_CONFIG_OPTION_PIC diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h index 9fecbeb0f..639cd4a7a 100644 --- a/src/type1/t1driver.h +++ b/src/type1/t1driver.h @@ -28,7 +28,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Driver_ClassRec ) t1_driver_class; diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 4c625ef4c..80e545331 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -403,7 +403,7 @@ FIXED_TO_INT( decoder.builder.advance.x ); t1glyph->internal->glyph_transformed = 0; - if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) + if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) { /* make up vertical ones */ metrics->vertAdvance = ( face->type1.font_bbox.yMax - @@ -476,7 +476,7 @@ metrics->horiBearingX = cbox.xMin; metrics->horiBearingY = cbox.yMax; - if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) + if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) { /* make up vertical ones */ ft_synthesize_vertical_metrics( metrics, diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 23d6f366f..d7b2ca53e 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -404,7 +404,7 @@ /* characters... So skip now all whitespace character codes. */ while ( cur < limit && ( *cur == ' ' || - *cur == '\t' || + *cur == '\t' || *cur == '\r' || *cur == '\n' ) ) ++cur; diff --git a/src/type1/t1tokens.h b/src/type1/t1tokens.h index 2d692f0e6..e37276b90 100644 --- a/src/type1/t1tokens.h +++ b/src/type1/t1tokens.h @@ -96,7 +96,7 @@ T1_FIELD_DICT_PRIVATE ) T1_FIELD_BOOL ( "ForceBold", force_bold, T1_FIELD_DICT_PRIVATE ) - + #undef FT_STRUCTURE #define FT_STRUCTURE T1_FontRec diff --git a/src/type42/t42drivr.h b/src/type42/t42drivr.h index 4717e4613..9a1e97e30 100644 --- a/src/type42/t42drivr.h +++ b/src/type42/t42drivr.h @@ -27,7 +27,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif FT_EXPORT_VAR( const FT_Driver_ClassRec ) t42_driver_class; diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c index 54d399c1c..c6053afed 100644 --- a/src/type42/t42objs.c +++ b/src/type42/t42objs.c @@ -21,7 +21,7 @@ #include "t42error.h" #include FT_INTERNAL_DEBUG_H #include FT_LIST_H -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #undef FT_COMPONENT diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 7a9798a9c..92604cd44 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -23,7 +23,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_STREAM_H #include FT_INTERNAL_OBJECTS_H -#include FT_TRUETYPE_IDS_H +#include FT_TRUETYPE_IDS_H #include "winfnt.h" #include "fnterrs.h" diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h index 70a90861a..b7a80736d 100644 --- a/src/winfonts/winfnt.h +++ b/src/winfonts/winfnt.h @@ -30,7 +30,7 @@ FT_BEGIN_HEADER #ifdef FT_CONFIG_OPTION_PIC #error "this module does not support PIC yet" -#endif +#endif typedef struct WinMZ_HeaderRec_ {