rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove trailing spaces.

This commit is contained in:
suzuki toshiya 2012-01-17 02:00:24 +09:00
parent c24f77ac76
commit 1749d8bc6a
80 changed files with 177 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2012-01-16 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Remove trailing spaces.
2012-01-16 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2012-01-16 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Formatting PIC related sources. Formatting PIC related sources.

4
include/freetype/ftgasp.h
View File

@ -62,12 +62,12 @@
* It is up to the client to decide what to do. * It is up to the client to decide what to do.
* *
* FT_GASP_DO_GRIDFIT :: * 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 * This *really* means TrueType bytecode interpretation. If this bit
* is not set, no hinting gets applied. * is not set, no hinting gets applied.
* *
* FT_GASP_DO_GRAY :: * 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. * If not set, do monochrome rendering.
* *
* FT_GASP_SYMMETRIC_SMOOTHING :: * FT_GASP_SYMMETRIC_SMOOTHING ::

28
include/freetype/ftstroke.h
View File

@ -85,25 +85,25 @@ FT_BEGIN_HEADER
* miter limit is exceeded. The outer edges of the strokes * miter limit is exceeded. The outer edges of the strokes
* for the two segments are extended until they meet at an * for the two segments are extended until they meet at an
* angle. If the segments meet at too sharp an angle (such * angle. If the segments meet at too sharp an angle (such
* that the miter would extend from the intersection of the * that the miter would extend from the intersection of the
* segments a distance greater than the product of the miter * segments a distance greater than the product of the miter
* limit value and the border radius), then a bevel join (see * limit value and the border radius), then a bevel join (see
* above) is used instead. This prevents long spikes being * above) is used instead. This prevents long spikes being
* created. FT_STROKER_LINEJOIN_MITER_FIXED generates a miter * created. FT_STROKER_LINEJOIN_MITER_FIXED generates a miter
* line join as used in PostScript and PDF. * line join as used in PostScript and PDF.
* *
* FT_STROKER_LINEJOIN_MITER_VARIABLE :: * FT_STROKER_LINEJOIN_MITER_VARIABLE ::
* FT_STROKER_LINEJOIN_MITER :: * FT_STROKER_LINEJOIN_MITER ::
* Used to render mitered line joins, with variable bevels if * Used to render mitered line joins, with variable bevels if
* the miter limit is exceeded. The intersection of the * the miter limit is exceeded. The intersection of the
* strokes is clipped at a line perpendicular to the bisector * strokes is clipped at a line perpendicular to the bisector
* of the angle between the strokes, at the distance from the * of the angle between the strokes, at the distance from the
* intersection of the segments equal to the product of the * intersection of the segments equal to the product of the
* miter limit value and the border radius. This prevents * miter limit value and the border radius. This prevents
* long spikes being created. * long spikes being created.
* FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line * FT_STROKER_LINEJOIN_MITER_VARIABLE generates a mitered line
* join as used in XPS. FT_STROKER_LINEJOIN_MITER is an alias * join as used in XPS. FT_STROKER_LINEJOIN_MITER is an alias
* for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for * for FT_STROKER_LINEJOIN_MITER_VARIABLE, retained for
* backwards compatibility. * backwards compatibility.
*/ */
typedef enum FT_Stroker_LineJoin_ typedef enum FT_Stroker_LineJoin_

6
include/freetype/internal/autohint.h
View File

@ -206,7 +206,7 @@ FT_BEGIN_HEADER
reset_face_, get_global_hints_, done_global_hints_, load_glyph_ \ 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_, \ #define FT_DEFINE_AUTOHINTER_SERVICE(class_, reset_face_, get_global_hints_, \
done_global_hints_, load_glyph_) \ done_global_hints_, load_glyph_) \
@ -219,9 +219,9 @@ FT_BEGIN_HEADER
clazz->get_global_hints = get_global_hints_; \ clazz->get_global_hints = get_global_hints_; \
clazz->done_global_hints = done_global_hints_; \ clazz->done_global_hints = done_global_hints_; \
clazz->load_glyph = load_glyph_; \ clazz->load_glyph = load_glyph_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
FT_END_HEADER FT_END_HEADER

6
include/freetype/internal/ftdriver.h
View File

@ -286,7 +286,7 @@ FT_BEGIN_HEADER
#define FT_DECLARE_DRIVER(class_) \ #define FT_DECLARE_DRIVER(class_) \
FT_CALLBACK_TABLE \ FT_CALLBACK_TABLE \
const FT_Driver_ClassRec class_; const FT_Driver_ClassRec class_;
#define FT_DEFINE_DRIVER(class_, \ #define FT_DEFINE_DRIVER(class_, \
flags_, size_, name_, version_, requires_, \ flags_, size_, name_, version_, requires_, \
@ -328,7 +328,7 @@ FT_BEGIN_HEADER
select_size_ \ select_size_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
#define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \ #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \
@ -408,7 +408,7 @@ FT_BEGIN_HEADER
\ \
*output_class = (FT_Module_Class*)clazz; \ *output_class = (FT_Module_Class*)clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */

30
include/freetype/internal/ftobjs.h
View File

@ -243,7 +243,7 @@ FT_BEGIN_HEADER
clazz->variant_list = variant_list_; \ clazz->variant_list = variant_list_; \
clazz->charvariant_list = charvariant_list_; \ clazz->charvariant_list = charvariant_list_; \
clazz->variantchar_list = variantchar_list_; \ clazz->variantchar_list = variantchar_list_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* create a new charmap and add it to charmap->face */ /* 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_ \ 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_, \ #define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_, \
cubic_to_, shift_, delta_) \ cubic_to_, shift_, delta_) \
@ -990,9 +990,9 @@ FT_BEGIN_HEADER
clazz->shift = shift_; \ clazz->shift = shift_; \
clazz->delta = delta_; \ clazz->delta = delta_; \
return FT_Err_Ok; \ 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_ \ 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_, \ #define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_, \
raster_reset_, raster_set_mode_, raster_render_, raster_done_) \ 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_set_mode = raster_set_mode_; \
clazz->raster_render = raster_render_; \ clazz->raster_render = raster_render_; \
clazz->raster_done = raster_done_; \ 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_ \ 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_, \ #define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_, \
transform_, bbox_, prepare_) \ transform_, bbox_, prepare_) \
@ -1087,9 +1087,9 @@ FT_BEGIN_HEADER
clazz->glyph_transform = transform_; \ clazz->glyph_transform = transform_; \
clazz->glyph_bbox = bbox_; \ clazz->glyph_bbox = bbox_; \
clazz->glyph_prepare = prepare_; \ clazz->glyph_prepare = prepare_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/*************************************************************************/ /*************************************************************************/
/* */ /* */
@ -1152,7 +1152,7 @@ FT_BEGIN_HEADER
raster_class_ \ raster_class_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DECLARE_RENDERER(class_) FT_DECLARE_MODULE(class_) #define FT_DECLARE_RENDERER(class_) FT_DECLARE_MODULE(class_)
@ -1205,11 +1205,11 @@ FT_BEGIN_HEADER
\ \
*output_class = (FT_Module_Class*)clazz; \ *output_class = (FT_Module_Class*)clazz; \
return FT_Err_Ok; \ 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_init = init_; \
clazz->root.module_done = done_; \ 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_, \ #define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_, \
interface_, init_, done_, get_interface_) \ interface_, init_, done_, get_interface_) \
@ -1415,7 +1415,7 @@ FT_BEGIN_HEADER
\ \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */

18
include/freetype/internal/ftpic.h
View File

@ -26,7 +26,7 @@
#ifndef __FTPIC_H__ #ifndef __FTPIC_H__
#define __FTPIC_H__ #define __FTPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
@ -36,14 +36,14 @@ FT_BEGIN_HEADER
/* pic containers for base */ /* pic containers for base */
void* base; void* base;
/* pic containers for modules */ /* pic containers for modules */
void* autofit; void* autofit;
void* cff; void* cff;
void* pshinter; void* pshinter;
void* psnames; void* psnames;
void* raster; void* raster;
void* sfnt; void* sfnt;
void* smooth; void* smooth;
void* truetype; void* truetype;
} FT_PIC_Container; } FT_PIC_Container;
/* Initialize the various function tables, structs, etc. stored in the container. */ /* Initialize the various function tables, structs, etc. stored in the container. */

16
include/freetype/internal/ftserv.h
View File

@ -246,7 +246,7 @@ FT_BEGIN_HEADER
{NULL, NULL} \ {NULL, NULL} \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1) \ #define FT_DEFINE_SERVICEDESCREC1(class_, serv_id_1, serv_data_1) \
void \ void \
@ -274,7 +274,7 @@ FT_BEGIN_HEADER
clazz[1].serv_data = NULL; \ clazz[1].serv_data = NULL; \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1, \ #define FT_DEFINE_SERVICEDESCREC2(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2) \ serv_id_2, serv_data_2) \
@ -305,7 +305,7 @@ FT_BEGIN_HEADER
clazz[2].serv_data = NULL; \ clazz[2].serv_data = NULL; \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1, \ #define FT_DEFINE_SERVICEDESCREC3(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3) \ serv_id_2, serv_data_2, serv_id_3, serv_data_3) \
@ -338,7 +338,7 @@ FT_BEGIN_HEADER
clazz[3].serv_data = NULL; \ clazz[3].serv_data = NULL; \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#define FT_DEFINE_SERVICEDESCREC4(class_, serv_id_1, serv_data_1, \ #define FT_DEFINE_SERVICEDESCREC4(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3, \ serv_id_2, serv_data_2, serv_id_3, serv_data_3, \
@ -374,7 +374,7 @@ FT_BEGIN_HEADER
clazz[4].serv_data = NULL; \ clazz[4].serv_data = NULL; \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#define FT_DEFINE_SERVICEDESCREC5(class_, serv_id_1, serv_data_1, \ #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, \ 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; \ clazz[5].serv_data = NULL; \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#define FT_DEFINE_SERVICEDESCREC6(class_, serv_id_1, serv_data_1, \ #define FT_DEFINE_SERVICEDESCREC6(class_, serv_id_1, serv_data_1, \
serv_id_2, serv_data_2, serv_id_3, serv_data_3, \ serv_id_2, serv_data_2, serv_id_3, serv_data_3, \
@ -453,8 +453,8 @@ FT_BEGIN_HEADER
clazz[6].serv_data = NULL; \ clazz[6].serv_data = NULL; \
*output_class = clazz; \ *output_class = clazz; \
return FT_Err_Ok; \ return FT_Err_Ok; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* /*
* Parse a list of FT_ServiceDescRec descriptors and look for * Parse a list of FT_ServiceDescRec descriptors and look for

6
include/freetype/internal/pshints.h
View File

@ -688,7 +688,7 @@ FT_BEGIN_HEADER
get_globals_funcs_, get_t1_funcs_, get_t2_funcs_ \ 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_, \ #define FT_DEFINE_PSHINTER_INTERFACE(class_, get_globals_funcs_, \
get_t1_funcs_, get_t2_funcs_) \ get_t1_funcs_, get_t2_funcs_) \
@ -700,9 +700,9 @@ FT_BEGIN_HEADER
clazz->get_globals_funcs = get_globals_funcs_; \ clazz->get_globals_funcs = get_globals_funcs_; \
clazz->get_t1_funcs = get_t1_funcs_; \ clazz->get_t1_funcs = get_t1_funcs_; \
clazz->get_t2_funcs = get_t2_funcs_; \ clazz->get_t2_funcs = get_t2_funcs_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
FT_END_HEADER FT_END_HEADER

6
include/freetype/internal/services/svbdf.h
View File

@ -53,7 +53,7 @@ FT_BEGIN_HEADER
get_charset_id_, get_property_ \ 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_) \ #define FT_DEFINE_SERVICE_BDFRec(class_, get_charset_id_, get_property_) \
void \ void \
@ -61,9 +61,9 @@ FT_BEGIN_HEADER
{ \ { \
clazz->get_charset_id = get_charset_id_; \ clazz->get_charset_id = get_charset_id_; \
clazz->get_property = get_property_; \ clazz->get_property = get_property_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svcid.h
View File

@ -55,7 +55,7 @@ FT_BEGIN_HEADER
get_ros_, get_is_cid_, get_cid_from_glyph_index_ \ 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_, \ #define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \
get_is_cid_, get_cid_from_glyph_index_ ) \ get_is_cid_, get_cid_from_glyph_index_ ) \
@ -67,9 +67,9 @@ FT_BEGIN_HEADER
clazz->get_ros = get_ros_; \ clazz->get_ros = get_ros_; \
clazz->get_is_cid = get_is_cid_; \ clazz->get_is_cid = get_is_cid_; \
clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_; \ clazz->get_cid_from_glyph_index = get_cid_from_glyph_index_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svgldict.h
View File

@ -59,7 +59,7 @@ FT_BEGIN_HEADER
get_name_, name_index_ \ get_name_, name_index_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \ #define FT_DEFINE_SERVICE_GLYPHDICTREC(class_, get_name_, name_index_) \
void \ void \
@ -69,9 +69,9 @@ FT_BEGIN_HEADER
FT_UNUSED(library); \ FT_UNUSED(library); \
clazz->get_name = get_name_; \ clazz->get_name = get_name_; \
clazz->name_index = name_index_; \ clazz->name_index = name_index_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svmm.h
View File

@ -77,7 +77,7 @@ FT_BEGIN_HEADER
get_mm_, set_mm_design_, set_mm_blend_, get_mm_var_, set_var_design_ \ 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_, \ #define FT_DEFINE_SERVICE_MULTIMASTERSREC(class_, get_mm_, set_mm_design_, \
set_mm_blend_, get_mm_var_, set_var_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->set_mm_blend = set_mm_blend_; \
clazz->get_mm_var = get_mm_var_; \ clazz->get_mm_var = get_mm_var_; \
clazz->set_var_design = set_var_design_; \ clazz->set_var_design = set_var_design_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svpostnm.h
View File

@ -54,7 +54,7 @@ FT_BEGIN_HEADER
get_ps_font_name_ \ get_ps_font_name_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \ #define FT_DEFINE_SERVICE_PSFONTNAMEREC(class_, get_ps_font_name_) \
void \ void \
@ -63,9 +63,9 @@ FT_BEGIN_HEADER
{ \ { \
FT_UNUSED(library); \ FT_UNUSED(library); \
clazz->get_ps_font_name = get_ps_font_name_; \ clazz->get_ps_font_name = get_ps_font_name_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svpscmap.h
View File

@ -130,7 +130,7 @@ FT_BEGIN_HEADER
adobe_std_strings_, adobe_std_encoding_, adobe_expert_encoding_ \ 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_, \ #define FT_DEFINE_SERVICE_PSCMAPSREC(class_, unicode_value_, unicodes_init_, \
unicodes_char_index_, unicodes_char_next_, macintosh_name_, \ 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_strings = adobe_std_strings_; \
clazz->adobe_std_encoding = adobe_std_encoding_; \ clazz->adobe_std_encoding = adobe_std_encoding_; \
clazz->adobe_expert_encoding = adobe_expert_encoding_; \ clazz->adobe_expert_encoding = adobe_expert_encoding_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svpsinfo.h
View File

@ -72,7 +72,7 @@ FT_BEGIN_HEADER
get_font_private_, get_font_value_ \ 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_, \ #define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \
ps_get_font_extra_, has_glyph_names_, get_font_private_, \ 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_has_glyph_names = has_glyph_names_; \
clazz->ps_get_font_private = get_font_private_; \ clazz->ps_get_font_private = get_font_private_; \
clazz->ps_get_font_value = get_font_value_; \ clazz->ps_get_font_value = get_font_value_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svsfnt.h
View File

@ -77,7 +77,7 @@ FT_BEGIN_HEADER
load_, get_, info_ \ load_, get_, info_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_SERVICE_SFNT_TABLEREC(class_, load_, get_, info_) \ #define FT_DEFINE_SERVICE_SFNT_TABLEREC(class_, load_, get_, info_) \
void \ void \
@ -86,9 +86,9 @@ FT_BEGIN_HEADER
clazz->load_table = load_; \ clazz->load_table = load_; \
clazz->get_table = get_; \ clazz->get_table = get_; \
clazz->table_info = info_; \ clazz->table_info = info_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svttcmap.h
View File

@ -82,7 +82,7 @@ FT_BEGIN_HEADER
get_cmap_info_ \ get_cmap_info_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_SERVICE_TTCMAPSREC(class_, get_cmap_info_) \ #define FT_DEFINE_SERVICE_TTCMAPSREC(class_, get_cmap_info_) \
void \ void \
@ -91,9 +91,9 @@ FT_BEGIN_HEADER
{ \ { \
FT_UNUSED(library); \ FT_UNUSED(library); \
clazz->get_cmap_info = get_cmap_info_; \ clazz->get_cmap_info = get_cmap_info_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

6
include/freetype/internal/services/svttglyf.h
View File

@ -45,16 +45,16 @@ FT_BEGIN_HEADER
get_location_ \ get_location_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_SERVICE_TTGLYFREC(class_, get_location_ ) \ #define FT_DEFINE_SERVICE_TTGLYFREC(class_, get_location_ ) \
void \ void \
FT_Init_Class_##class_( FT_Service_TTGlyfRec* clazz ) \ FT_Init_Class_##class_( FT_Service_TTGlyfRec* clazz ) \
{ \ { \
clazz->get_location = get_location_; \ clazz->get_location = get_location_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* */ /* */

10
include/freetype/internal/sfnt.h
View File

@ -757,12 +757,12 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
#define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) \ #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) \
a, a,
#else #else
#define FT_DEFINE_DRIVERS_OLD_INTERNAL(a) #define FT_DEFINE_DRIVERS_OLD_INTERNAL(a)
#endif #endif
#define FT_INTERNAL(a) \ #define FT_INTERNAL(a) \
a, a,
#define FT_DEFINE_SFNT_INTERFACE(class_, \ #define FT_DEFINE_SFNT_INTERFACE(class_, \
goto_table_, init_face_, load_face_, done_face_, get_interface_, \ goto_table_, init_face_, load_face_, done_face_, get_interface_, \
@ -819,7 +819,7 @@ FT_BEGIN_HEADER
FT_INTERNAL(get_metrics_) \ FT_INTERNAL(get_metrics_) \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
#define FT_DEFINE_DRIVERS_OLD_INTERNAL(a, a_) \ #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(set_sbit_strike,set_sbit_strike_) \
FT_INTERNAL(load_strike_metrics,load_strike_metrics_) \ FT_INTERNAL(load_strike_metrics,load_strike_metrics_) \
FT_INTERNAL(get_metrics,get_metrics_) \ FT_INTERNAL(get_metrics,get_metrics_) \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
FT_END_HEADER FT_END_HEADER

2
include/freetype/internal/tttypes.h
View File

@ -1401,7 +1401,7 @@ FT_BEGIN_HEADER
FT_Byte* vert_metrics; FT_Byte* vert_metrics;
FT_ULong vert_metrics_size; 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* glyph_locations;
FT_Byte* hdmx_table; FT_Byte* hdmx_table;

2
src/autofit/afglobal.c
View File

@ -43,7 +43,7 @@
#endif #endif
&af_latin_script_class, &af_latin_script_class,
&af_cjk_script_class, &af_cjk_script_class,
&af_indic_script_class, &af_indic_script_class,
NULL /* do not remove */ NULL /* do not remove */
}; };

2
src/autofit/afpic.c
View File

@ -77,7 +77,7 @@
&container->af_script_classes_rec[ss]; &container->af_script_classes_rec[ss];
} }
container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL; container->af_script_classes[AF_SCRIPT_CLASSES_COUNT - 1] = NULL;
/* add call to initialization function when you add new scripts */ /* add call to initialization function when you add new scripts */
ss = 0; ss = 0;
FT_Init_Class_af_dummy_script_class( FT_Init_Class_af_dummy_script_class(

6
src/autofit/afpic.h
View File

@ -19,7 +19,7 @@
#ifndef __AFPIC_H__ #ifndef __AFPIC_H__
#define __AFPIC_H__ #define __AFPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H
@ -38,9 +38,9 @@ FT_BEGIN_HEADER
#ifdef FT_OPTION_AUTOFIT2 #ifdef FT_OPTION_AUTOFIT2
#define AF_SCRIPT_CLASSES_COUNT 6 #define AF_SCRIPT_CLASSES_COUNT 6
#else #else
#define AF_SCRIPT_CLASSES_COUNT 5 #define AF_SCRIPT_CLASSES_COUNT 5
#endif #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_ typedef struct AFModulePIC_
{ {

2
src/autofit/aftypes.h
View File

@ -231,7 +231,7 @@ extern void* _af_debug_hints;
AF_SCRIPT_NONE = 0, AF_SCRIPT_NONE = 0,
AF_SCRIPT_LATIN = 1, AF_SCRIPT_LATIN = 1,
AF_SCRIPT_CJK = 2, AF_SCRIPT_CJK = 2,
AF_SCRIPT_INDIC = 3, AF_SCRIPT_INDIC = 3,
#ifdef FT_OPTION_AUTOFIT2 #ifdef FT_OPTION_AUTOFIT2
AF_SCRIPT_LATIN2, AF_SCRIPT_LATIN2,
#endif #endif

2
src/autofit/afwarp.c
View File

@ -352,7 +352,7 @@
{ {
FT_Fixed best_scale = warper->best_scale; FT_Fixed best_scale = warper->best_scale;
FT_Pos best_delta = warper->best_delta; FT_Pos best_delta = warper->best_delta;
hints->xmin_delta = FT_MulFix( X1, best_scale - org_scale ) hints->xmin_delta = FT_MulFix( X1, best_scale - org_scale )
+ best_delta; + best_delta;

2
src/base/basepic.h
View File

@ -19,7 +19,7 @@
#ifndef __BASEPIC_H__ #ifndef __BASEPIC_H__
#define __BASEPIC_H__ #define __BASEPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

2
src/base/ftbitmap.c
View File

@ -231,7 +231,7 @@
if ( ( ( FT_PIX_ROUND( xStrength ) >> 6 ) > FT_INT_MAX ) || if ( ( ( FT_PIX_ROUND( xStrength ) >> 6 ) > FT_INT_MAX ) ||
( ( FT_PIX_ROUND( yStrength ) >> 6 ) > FT_INT_MAX ) ) ( ( FT_PIX_ROUND( yStrength ) >> 6 ) > FT_INT_MAX ) )
return FT_Err_Invalid_Argument; return FT_Err_Invalid_Argument;
xstr = (FT_Int)FT_PIX_ROUND( xStrength ) >> 6; xstr = (FT_Int)FT_PIX_ROUND( xStrength ) >> 6;
ystr = (FT_Int)FT_PIX_ROUND( yStrength ) >> 6; ystr = (FT_Int)FT_PIX_ROUND( yStrength ) >> 6;

2
src/base/ftcalc.c
View File

@ -464,7 +464,7 @@
* Unfortunately, it doesn't work (at least not portably). * Unfortunately, it doesn't work (at least not portably).
* *
* It makes the assumption that right-shift on a negative signed value * 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, * 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 * the result of right-shift of a negative signed value is
* implementation-defined. At least one implementation fills the * implementation-defined. At least one implementation fills the

2
src/base/ftglyph.c
View File

@ -254,7 +254,7 @@
} }
FT_DEFINE_GLYPH( ft_outline_glyph_class, FT_DEFINE_GLYPH( ft_outline_glyph_class,
sizeof ( FT_OutlineGlyphRec ), sizeof ( FT_OutlineGlyphRec ),
FT_GLYPH_FORMAT_OUTLINE, FT_GLYPH_FORMAT_OUTLINE,

8
src/base/ftinit.c
View File

@ -104,7 +104,7 @@
FT_NUM_MODULE_CLASSES FT_NUM_MODULE_CLASSES
}; };
/* destroy all module classes */ /* destroy all module classes */
#undef FT_USE_MODULE #undef FT_USE_MODULE
#define FT_USE_MODULE( type, x ) \ #define FT_USE_MODULE( type, x ) \
if ( classes[i] ) { FT_Destroy_Class_##x(library, classes[i]); } \ if ( classes[i] ) { FT_Destroy_Class_##x(library, classes[i]); } \
@ -148,7 +148,7 @@
FT_UInt i; FT_UInt i;
BasePIC* pic_container = (BasePIC*)library->pic_container.base; BasePIC* pic_container = (BasePIC*)library->pic_container.base;
memory = library->memory; memory = library->memory;
pic_container->default_module_classes = 0; pic_container->default_module_classes = 0;
if ( FT_ALLOC(classes, sizeof(FT_Module_Class*) * (FT_NUM_MODULE_CLASSES + 1) ) ) if ( FT_ALLOC(classes, sizeof(FT_Module_Class*) * (FT_NUM_MODULE_CLASSES + 1) ) )
@ -162,11 +162,11 @@
#include FT_CONFIG_MODULES_H #include FT_CONFIG_MODULES_H
Exit: Exit:
if (error) ft_destroy_default_module_classes( library ); if (error) ft_destroy_default_module_classes( library );
else pic_container->default_module_classes = classes; else pic_container->default_module_classes = classes;
return error; return error;
} }

2
src/base/ftmac.c
View File

@ -146,7 +146,7 @@
{ {
#if defined( MAC_OS_X_VERSION_10_5 ) && \ #if defined( MAC_OS_X_VERSION_10_5 ) && \
( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ) ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )
OSStatus err; OSStatus err;
err = ATSFontGetFileReference( ats_font_id, ats_font_ref ); err = ATSFontGetFileReference( ats_font_id, ats_font_ref );

2
src/bdf/bdfdrivr.c
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include FT_INTERNAL_STREAM_H #include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_OBJECTS_H
#include FT_BDF_H #include FT_BDF_H
#include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_IDS_H
#include FT_SERVICE_BDF_H #include FT_SERVICE_BDF_H
#include FT_SERVICE_XFREE86_NAME_H #include FT_SERVICE_XFREE86_NAME_H

2
src/bdf/bdfdrivr.h
View File

@ -38,7 +38,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
typedef struct BDF_encoding_el_ typedef struct BDF_encoding_el_

2
src/cache/ftcbasic.c vendored
View File

@ -467,7 +467,7 @@
} }
#ifdef FT_CONFIG_OPTION_OLD_INTERNALS #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
/* yet another backwards-legacy structure */ /* yet another backwards-legacy structure */

2
src/cache/ftccmap.c vendored
View File

@ -320,7 +320,7 @@
/* /*
* If cmap_index is greater than the maximum number of cachable * 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. * using old internal header. See include/config/ftoption.h.
*/ */
if ( cmap_index > FT_MAX_CHARMAP_CACHEABLE && !no_cmap_change ) if ( cmap_index > FT_MAX_CHARMAP_CACHEABLE && !no_cmap_change )

2
src/cache/ftcmanag.c vendored
View File

@ -28,7 +28,7 @@
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "cache system does not support PIC yet" #error "cache system does not support PIC yet"
#endif #endif
#undef FT_COMPONENT #undef FT_COMPONENT

4
src/cff/cffdrivr.c
View File

@ -466,7 +466,7 @@
dict->cid_registry ); dict->cid_registry );
*registry = cff->registry; *registry = cff->registry;
} }
if ( ordering ) if ( ordering )
{ {
if ( cff->ordering == NULL ) if ( cff->ordering == NULL )
@ -489,7 +489,7 @@
*supplement = (FT_Int)dict->cid_supplement; *supplement = (FT_Int)dict->cid_supplement;
} }
} }
Fail: Fail:
return error; return error;
} }

4
src/cff/cffgload.c
View File

@ -2706,7 +2706,7 @@
FT_Byte fd_index = cff_fd_select_get( &cff->fd_select, FT_Byte fd_index = cff_fd_select_get( &cff->fd_select,
glyph_index ); glyph_index );
if ( fd_index >= cff->num_subfonts ) if ( fd_index >= cff->num_subfonts )
fd_index = (FT_Byte)( cff->num_subfonts - 1 ); fd_index = (FT_Byte)( cff->num_subfonts - 1 );
top_upm = cff->top_font.font_dict.units_per_em; top_upm = cff->top_font.font_dict.units_per_em;
@ -2962,7 +2962,7 @@
if ( has_vertical_info ) if ( has_vertical_info )
metrics->vertBearingX = metrics->horiBearingX - metrics->vertBearingX = metrics->horiBearingX -
metrics->horiAdvance / 2; metrics->horiAdvance / 2;
else else
{ {
if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
ft_synthesize_vertical_metrics( metrics, ft_synthesize_vertical_metrics( metrics,

2
src/cff/cffload.h
View File

@ -60,7 +60,7 @@ FT_BEGIN_HEADER
FT_LOCAL( FT_Error ) FT_LOCAL( FT_Error )
cff_font_load( FT_Library library, cff_font_load( FT_Library library,
FT_Stream stream, FT_Stream stream,
FT_Int face_index, FT_Int face_index,
CFF_Font font, CFF_Font font,

6
src/cff/cffobjs.c
View File

@ -403,7 +403,7 @@
FT_Int32 idx = 0; FT_Int32 idx = 0;
FT_Int32 length = strlen( name ) + 1; FT_Int32 length = strlen( name ) + 1;
FT_Bool continue_search = 1; FT_Bool continue_search = 1;
while ( continue_search ) while ( continue_search )
{ {
@ -780,7 +780,7 @@
char* family_name = NULL; char* family_name = NULL;
remove_subset_prefix( cffface->family_name ); remove_subset_prefix( cffface->family_name );
if ( dict->family_name ) if ( dict->family_name )
{ {
@ -827,7 +827,7 @@
style_name = cff_strcpy( memory, fullp ); style_name = cff_strcpy( memory, fullp );
/* remove the style part from the family name (if present) */ /* 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; break;
} }

2
src/cff/cffpic.h
View File

@ -19,7 +19,7 @@
#ifndef __CFFPIC_H__ #ifndef __CFFPIC_H__
#define __CFFPIC_H__ #define __CFFPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

2
src/cff/cfftypes.h
View File

@ -269,7 +269,7 @@ FT_BEGIN_HEADER
/* since version 2.3.6 */ /* since version 2.3.6 */
FT_String* registry; FT_String* registry;
FT_String* ordering; FT_String* ordering;
} CFF_FontRec, *CFF_Font; } CFF_FontRec, *CFF_Font;

2
src/cid/cidgload.c
View File

@ -426,7 +426,7 @@
metrics->horiBearingX = cbox.xMin; metrics->horiBearingX = cbox.xMin;
metrics->horiBearingY = cbox.yMax; metrics->horiBearingY = cbox.yMax;
if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
{ {
/* make up vertical ones */ /* make up vertical ones */
ft_synthesize_vertical_metrics( metrics, ft_synthesize_vertical_metrics( metrics,

4
src/cid/cidriver.c
View File

@ -111,13 +111,13 @@
if ( registry ) if ( registry )
*registry = cid->registry; *registry = cid->registry;
if ( ordering ) if ( ordering )
*ordering = cid->ordering; *ordering = cid->ordering;
if ( supplement ) if ( supplement )
*supplement = cid->supplement; *supplement = cid->supplement;
return CID_Err_Ok; return CID_Err_Ok;
} }

2
src/cid/cidriver.h
View File

@ -28,7 +28,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_CALLBACK_TABLE FT_CALLBACK_TABLE

2
src/gxvalid/gxvmod.h
View File

@ -36,7 +36,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Module_Class ) gxv_module_class; FT_EXPORT_VAR( const FT_Module_Class ) gxv_module_class;

2
src/gzip/ftgzip.c
View File

@ -42,7 +42,7 @@
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "gzip code does not support PIC yet" #error "gzip code does not support PIC yet"
#endif #endif
#ifdef FT_CONFIG_OPTION_SYSTEM_ZLIB #ifdef FT_CONFIG_OPTION_SYSTEM_ZLIB

2
src/lzw/ftlzw.c
View File

@ -44,7 +44,7 @@
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "lzw code does not support PIC yet" #error "lzw code does not support PIC yet"
#endif #endif
#include "ftzopen.h" #include "ftzopen.h"

2
src/otvalid/otvmod.h
View File

@ -29,7 +29,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Module_Class ) otv_module_class; FT_EXPORT_VAR( const FT_Module_Class ) otv_module_class;

2
src/pcf/pcfdrivr.c
View File

@ -35,7 +35,7 @@ THE SOFTWARE.
#include FT_BZIP2_H #include FT_BZIP2_H
#include FT_ERRORS_H #include FT_ERRORS_H
#include FT_BDF_H #include FT_BDF_H
#include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_IDS_H
#include "pcf.h" #include "pcf.h"
#include "pcfdrivr.h" #include "pcfdrivr.h"

2
src/pcf/pcfdrivr.h
View File

@ -35,7 +35,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class; FT_EXPORT_VAR( const FT_Driver_ClassRec ) pcf_driver_class;

2
src/pfr/pfrdrivr.h
View File

@ -28,7 +28,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Driver_ClassRec ) pfr_driver_class; FT_EXPORT_VAR( const FT_Driver_ClassRec ) pfr_driver_class;

2
src/pfr/pfrobjs.c
View File

@ -23,7 +23,7 @@
#include "pfrsbit.h" #include "pfrsbit.h"
#include FT_OUTLINE_H #include FT_OUTLINE_H
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
#include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_IDS_H
#include "pfrerror.h" #include "pfrerror.h"

2
src/psaux/psauxmod.h
View File

@ -28,7 +28,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Module_Class ) psaux_driver_class; FT_EXPORT_VAR( const FT_Module_Class ) psaux_driver_class;

2
src/psaux/t1decode.c
View File

@ -199,7 +199,7 @@
#ifdef FT_CONFIG_OPTION_INCREMENTAL #ifdef FT_CONFIG_OPTION_INCREMENTAL
T1_Face face = (T1_Face)decoder->builder.face; T1_Face face = (T1_Face)decoder->builder.face;
#endif #endif
if ( decoder->seac ) if ( decoder->seac )

2
src/pshinter/pshpic.c
View File

@ -58,7 +58,7 @@
return error; return error;
FT_MEM_SET( container, 0, sizeof ( *container ) ); FT_MEM_SET( container, 0, sizeof ( *container ) );
pic_container->pshinter = container; pic_container->pshinter = container;
/* add call to initialization function when you add new scripts */ /* add call to initialization function when you add new scripts */
FT_Init_Class_pshinter_interface( FT_Init_Class_pshinter_interface(
library, &container->pshinter_interface ); library, &container->pshinter_interface );

2
src/pshinter/pshpic.h
View File

@ -19,7 +19,7 @@
#ifndef __PSHPIC_H__ #ifndef __PSHPIC_H__
#define __PSHPIC_H__ #define __PSHPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

8
src/psnames/psmodule.c
View File

@ -521,7 +521,7 @@
#ifdef FT_CONFIG_OPTION_ADOBE_GLYPH_LIST #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_Unicode_ValueFunc) ps_unicode_value,
(PS_Unicodes_InitFunc) ps_unicodes_init, (PS_Unicodes_InitFunc) ps_unicodes_init,
(PS_Unicodes_CharIndexFunc)ps_unicodes_char_index, (PS_Unicodes_CharIndexFunc)ps_unicodes_char_index,
@ -536,7 +536,7 @@
#else #else
FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface, FT_DEFINE_SERVICE_PSCMAPSREC(pscmaps_interface,
0, 0,
0, 0,
0, 0,
@ -552,7 +552,7 @@
#endif /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST */ #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 FT_SERVICE_ID_POSTSCRIPT_CMAPS, &FT_PSCMAPS_INTERFACE_GET
) )
@ -590,7 +590,7 @@
#endif #endif
FT_DEFINE_MODULE(psnames_module_class, FT_DEFINE_MODULE(psnames_module_class,
0, /* this is not a font driver, nor a renderer */ 0, /* this is not a font driver, nor a renderer */
sizeof ( FT_ModuleRec ), sizeof ( FT_ModuleRec ),

2
src/psnames/pspic.c
View File

@ -80,7 +80,7 @@
goto Exit; goto Exit;
FT_Init_Class_pscmaps_interface( library, FT_Init_Class_pscmaps_interface( library,
&container->pscmaps_interface ); &container->pscmaps_interface );
Exit: Exit:
if ( error ) if ( error )
psnames_module_class_pic_free( library ); psnames_module_class_pic_free( library );

2
src/psnames/pspic.h
View File

@ -19,7 +19,7 @@
#ifndef __PSPIC_H__ #ifndef __PSPIC_H__
#define __PSPIC_H__ #define __PSPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

2
src/raster/rastpic.c
View File

@ -55,7 +55,7 @@
FT_Memory memory = library->memory; FT_Memory memory = library->memory;
/* since this function also serve raster5 renderer, /* since this function also serve raster5 renderer,
it implements reference counting */ it implements reference counting */
if ( pic_container->raster ) if ( pic_container->raster )
{ {

2
src/raster/rastpic.h
View File

@ -19,7 +19,7 @@
#ifndef __RASTPIC_H__ #ifndef __RASTPIC_H__
#define __RASTPIC_H__ #define __RASTPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

12
src/sfnt/sfdriver.c
View File

@ -430,7 +430,7 @@
if ( !module ) if ( !module )
return NULL; return NULL;
library = module->library; library = module->library;
if ( !library ) if ( !library )
return NULL; return NULL;
#else #else
FT_UNUSED( module ); FT_UNUSED( module );
@ -567,14 +567,14 @@
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */ #endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
#define PUT_EMBEDDED_BITMAPS(a) a #define PUT_EMBEDDED_BITMAPS(a) a
#else #else
#define PUT_EMBEDDED_BITMAPS(a) 0 #define PUT_EMBEDDED_BITMAPS(a) 0
#endif #endif
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
#define PUT_PS_NAMES(a) a #define PUT_PS_NAMES(a) a
#else #else
#define PUT_PS_NAMES(a) 0 #define PUT_PS_NAMES(a) 0
#endif #endif
FT_DEFINE_SFNT_INTERFACE(sfnt_interface, FT_DEFINE_SFNT_INTERFACE(sfnt_interface,
@ -648,7 +648,7 @@
FT_DEFINE_MODULE(sfnt_module_class, FT_DEFINE_MODULE(sfnt_module_class,
0, /* not a font driver or renderer */ 0, /* not a font driver or renderer */
sizeof ( FT_ModuleRec ), sizeof ( FT_ModuleRec ),

2
src/sfnt/sfntpic.h
View File

@ -19,7 +19,7 @@
#ifndef __SFNTPIC_H__ #ifndef __SFNTPIC_H__
#define __SFNTPIC_H__ #define __SFNTPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

2
src/sfnt/ttcmap.c
View File

@ -3363,7 +3363,7 @@
return error; return error;
/* the location of the class instances follows the array of pointers */ /* 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; i=0;
#undef TTCMAPCITEM #undef TTCMAPCITEM

6
src/sfnt/ttcmap.h
View File

@ -70,7 +70,7 @@ FT_BEGIN_HEADER
format_, validate_, get_cmap_info_ \ 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_, size_, init_, done_, char_index_, \
char_next_, char_var_index_, char_var_default_, variant_list_, \ char_next_, char_var_index_, char_var_default_, variant_list_, \
@ -92,9 +92,9 @@ FT_BEGIN_HEADER
clazz->format = format_; \ clazz->format = format_; \
clazz->validate = validate_; \ clazz->validate = validate_; \
clazz->get_cmap_info = get_cmap_info_; \ 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_
{ {

2
src/smooth/ftsmooth.c
View File

@ -449,7 +449,7 @@
FT_DEFINE_RENDERER( ft_smooth_lcd_renderer_class, FT_DEFINE_RENDERER( ft_smooth_lcd_renderer_class,
FT_MODULE_RENDERER, FT_MODULE_RENDERER,
sizeof ( FT_RendererRec ), sizeof ( FT_RendererRec ),

2
src/smooth/ftspic.c
View File

@ -57,7 +57,7 @@
FT_Memory memory = library->memory; 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 */ it implements reference counting */
if ( pic_container->smooth ) if ( pic_container->smooth )
{ {

2
src/smooth/ftspic.h
View File

@ -19,7 +19,7 @@
#ifndef __FTSPIC_H__ #ifndef __FTSPIC_H__
#define __FTSPIC_H__ #define __FTSPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H

2
src/truetype/ttinterp.c
View File

@ -8254,7 +8254,7 @@
if ( CUR.error && !CUR.instruction_trap ) if ( CUR.error && !CUR.instruction_trap )
{ {
FT_TRACE1(( " The interpreter returned error 0x%x\n", CUR.error )); FT_TRACE1(( " The interpreter returned error 0x%x\n", CUR.error ));
exc->size->cvt_ready = FALSE; exc->size->cvt_ready = FALSE;
} }
return CUR.error; return CUR.error;

2
src/truetype/ttpic.h
View File

@ -19,7 +19,7 @@
#ifndef __TTPIC_H__ #ifndef __TTPIC_H__
#define __TTPIC_H__ #define __TTPIC_H__
FT_BEGIN_HEADER FT_BEGIN_HEADER
#ifndef FT_CONFIG_OPTION_PIC #ifndef FT_CONFIG_OPTION_PIC

2
src/type1/t1driver.h
View File

@ -28,7 +28,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Driver_ClassRec ) t1_driver_class; FT_EXPORT_VAR( const FT_Driver_ClassRec ) t1_driver_class;

4
src/type1/t1gload.c
View File

@ -403,7 +403,7 @@
FIXED_TO_INT( decoder.builder.advance.x ); FIXED_TO_INT( decoder.builder.advance.x );
t1glyph->internal->glyph_transformed = 0; t1glyph->internal->glyph_transformed = 0;
if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
{ {
/* make up vertical ones */ /* make up vertical ones */
metrics->vertAdvance = ( face->type1.font_bbox.yMax - metrics->vertAdvance = ( face->type1.font_bbox.yMax -
@ -476,7 +476,7 @@
metrics->horiBearingX = cbox.xMin; metrics->horiBearingX = cbox.xMin;
metrics->horiBearingY = cbox.yMax; metrics->horiBearingY = cbox.yMax;
if ( load_flags & FT_LOAD_VERTICAL_LAYOUT ) if ( load_flags & FT_LOAD_VERTICAL_LAYOUT )
{ {
/* make up vertical ones */ /* make up vertical ones */
ft_synthesize_vertical_metrics( metrics, ft_synthesize_vertical_metrics( metrics,

2
src/type1/t1parse.c
View File

@ -404,7 +404,7 @@
/* characters... So skip now all whitespace character codes. */ /* characters... So skip now all whitespace character codes. */
while ( cur < limit && while ( cur < limit &&
( *cur == ' ' || ( *cur == ' ' ||
*cur == '\t' || *cur == '\t' ||
*cur == '\r' || *cur == '\r' ||
*cur == '\n' ) ) *cur == '\n' ) )
++cur; ++cur;

2
src/type1/t1tokens.h
View File

@ -96,7 +96,7 @@
T1_FIELD_DICT_PRIVATE ) T1_FIELD_DICT_PRIVATE )
T1_FIELD_BOOL ( "ForceBold", force_bold, T1_FIELD_BOOL ( "ForceBold", force_bold,
T1_FIELD_DICT_PRIVATE ) T1_FIELD_DICT_PRIVATE )
#undef FT_STRUCTURE #undef FT_STRUCTURE
#define FT_STRUCTURE T1_FontRec #define FT_STRUCTURE T1_FontRec

2
src/type42/t42drivr.h
View File

@ -27,7 +27,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
FT_EXPORT_VAR( const FT_Driver_ClassRec ) t42_driver_class; FT_EXPORT_VAR( const FT_Driver_ClassRec ) t42_driver_class;

2
src/type42/t42objs.c
View File

@ -21,7 +21,7 @@
#include "t42error.h" #include "t42error.h"
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
#include FT_LIST_H #include FT_LIST_H
#include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_IDS_H
#undef FT_COMPONENT #undef FT_COMPONENT

2
src/winfonts/winfnt.c
View File

@ -23,7 +23,7 @@
#include FT_INTERNAL_DEBUG_H #include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H #include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_OBJECTS_H #include FT_INTERNAL_OBJECTS_H
#include FT_TRUETYPE_IDS_H #include FT_TRUETYPE_IDS_H
#include "winfnt.h" #include "winfnt.h"
#include "fnterrs.h" #include "fnterrs.h"

2
src/winfonts/winfnt.h
View File

@ -30,7 +30,7 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
#error "this module does not support PIC yet" #error "this module does not support PIC yet"
#endif #endif
typedef struct WinMZ_HeaderRec_ typedef struct WinMZ_HeaderRec_
{ {