diff options
Diffstat (limited to 'extras/freetype2/include/freetype/ftincrem.h')
| -rw-r--r-- | extras/freetype2/include/freetype/ftincrem.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/extras/freetype2/include/freetype/ftincrem.h b/extras/freetype2/include/freetype/ftincrem.h index c9e8b56d6..6a1aa1fc3 100644 --- a/extras/freetype2/include/freetype/ftincrem.h +++ b/extras/freetype2/include/freetype/ftincrem.h @@ -4,7 +4,7 @@ /* */ /* FreeType incremental loading (specification). */ /* */ -/* Copyright 2002 by */ +/* Copyright 2002, 2003 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -22,6 +22,12 @@ #include <ft2build.h> #include FT_FREETYPE_H +#ifdef FREETYPE_H +#error "freetype.h of FreeType 1 has been loaded!" +#error "Please fix the directory search order for header files" +#error "so that freetype.h of FreeType 2 is found first." +#endif + FT_BEGIN_HEADER @@ -186,10 +192,10 @@ FT_BEGIN_HEADER */ typedef FT_Error (*FT_Incremental_GetGlyphMetricsFunc) - ( FT_Incremental incremental, - FT_UInt glyph_index, - FT_Bool vertical, - FT_Incremental_MetricsRec *ametrics ); + ( FT_Incremental incremental, + FT_UInt glyph_index, + FT_Bool vertical, + FT_Incremental_MetricsRec *ametrics ); /************************************************************************** @@ -199,7 +205,7 @@ FT_BEGIN_HEADER * * @description: * A table of functions for accessing fonts that load data - * incrementally. Used in @FT_Incremental_Interface. + * incrementally. Used in @FT_Incremental_InterfaceRec. * * @fields: * get_glyph_data :: @@ -246,8 +252,7 @@ FT_BEGIN_HEADER * parameter.data = &inc_int; * * // set up FT_Open_Args structure - * open_args.flags = (FT_Open_Flags)( FT_OPEN_PATHNAME | - * FT_OPEN_PARAMS ); + * open_args.flags = FT_OPEN_PATHNAME | FT_OPEN_PARAMS; * open_args.pathname = my_font_pathname; * open_args.num_params = 1; * open_args.params = ¶meter; // we use one optional argument |