ref: 96089b95690c45bfa32190a4a396965d672d007b
parent: 03011c6462105cfd4cc2a1008780f21f30d42c11
author: Graham Asher <[email protected]>
date: Thu Jul 18 11:03:11 EDT 2002
FT_CONFIG_OPTION_INCREMENTAL is now used to compile incremental loading stuff conditionally.
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -199,6 +199,8 @@
} FT_Glyph_Metrics;
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -222,7 +224,9 @@
FT_Long advance;
} FT_Basic_Glyph_Metrics;
+#endif /* #ifdef FT_CONFIG_OPTION_INCREMENTAL */
+
/*************************************************************************/
/* */
/* <Struct> */
@@ -502,6 +506,8 @@
} FT_CharMapRec;
+
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
/*************************************************************************/
/* */
@@ -607,7 +613,9 @@
void* object;
} FT_Incremental_Interface;
+#endif /* #ifdef FT_CONFIG_OPTION_INCREMENTAL */
+
/*************************************************************************/
/*************************************************************************/
/* */
@@ -839,6 +847,10 @@
FT_Face_Internal internal;
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+ FT_Incremental_Interface* incremental_interface;
+#endif
+
/*@private end */
} FT_FaceRec;
@@ -1576,6 +1588,9 @@
/* */
/* ft_open_params :: Use the `num_params' & `params' field. */
/* */
+ /* ft_open_incremental :: Use the 'incremental_interface' field. */
+ /* (Available if FT_CONFIG_OPTION_INCREMENTAL is defined.) */
+ /* */
/* <Note> */
/* The `ft_open_memory', `ft_open_stream', and `ft_open_pathname' */
/* flags are mutually exclusive. */
@@ -1587,6 +1602,9 @@
ft_open_pathname = 4,
ft_open_driver = 8,
ft_open_params = 16
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+ ,ft_open_incremental = 32
+#endif
} FT_Open_Flags;
@@ -1648,6 +1666,11 @@
/* params :: Extra parameters passed to the font driver when */
/* opening a new face. */
/* */
+ /* incremental_interface :: If non-null, an interface used to */
+ /* implement incremental font loading. This field */
+ /* exists only if FT_CONFIG_OPTION_INCREMENTAL is */
+ /* defined. */
+ /* */
/* <Note> */
/* The stream type is determined by the contents of `flags' which */
/* are tested in the following order by @FT_Open_Face: */
@@ -1668,16 +1691,23 @@
/* `num_params' and `params' will be used. They are ignored */
/* otherwise. */
/* */
+ /* If the `ft_open_incremental' bit is set 'incremental_interface' */
+ /* will be used, else it is ignored. This feature is available only */
+ /* if FT_CONFIG_OPTION_INCREMENTAL is defined. */
+ /* */
typedef struct FT_Open_Args_
{- FT_Open_Flags flags;
- const FT_Byte* memory_base;
- FT_Long memory_size;
- FT_String* pathname;
- FT_Stream stream;
- FT_Module driver;
- FT_Int num_params;
- FT_Parameter* params;
+ FT_Open_Flags flags;
+ const FT_Byte* memory_base;
+ FT_Long memory_size;
+ FT_String* pathname;
+ FT_Stream stream;
+ FT_Module driver;
+ FT_Int num_params;
+ FT_Parameter* params;
+#ifdef FT_CONFIG_OPTION_INCREMENTAL
+ FT_Incremental_Interface* incremental_interface;
+#endif
} FT_Open_Args;