| Index: include/freetype/internal/services/svpsinfo.h
|
| diff --git a/include/freetype/internal/services/svpsinfo.h b/include/freetype/internal/services/svpsinfo.h
|
| index 91ba91e5dc005c427fedcf390566e9fada91aa9b..4bfb506711b17bc010f48c6e23c0e1d918407d07 100644
|
| --- a/include/freetype/internal/services/svpsinfo.h
|
| +++ b/include/freetype/internal/services/svpsinfo.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* The FreeType PostScript info service (specification). */
|
| /* */
|
| -/* Copyright 2003, 2004, 2009 by */
|
| +/* Copyright 2003, 2004, 2009, 2011, 2012 by */
|
| /* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -38,12 +38,19 @@ FT_BEGIN_HEADER
|
| PS_FontExtraRec* afont_extra );
|
|
|
| typedef FT_Int
|
| - (*PS_HasGlyphNamesFunc)( FT_Face face );
|
| + (*PS_HasGlyphNamesFunc)( FT_Face face );
|
|
|
| typedef FT_Error
|
| (*PS_GetFontPrivateFunc)( FT_Face face,
|
| PS_PrivateRec* afont_private );
|
|
|
| + typedef FT_Long
|
| + (*PS_GetFontValueFunc)( FT_Face face,
|
| + PS_Dict_Keys key,
|
| + FT_UInt idx,
|
| + void *value,
|
| + FT_Long value_len );
|
| +
|
|
|
| FT_DEFINE_SERVICE( PsInfo )
|
| {
|
| @@ -51,34 +58,46 @@ FT_BEGIN_HEADER
|
| PS_GetFontExtraFunc ps_get_font_extra;
|
| PS_HasGlyphNamesFunc ps_has_glyph_names;
|
| PS_GetFontPrivateFunc ps_get_font_private;
|
| + PS_GetFontValueFunc ps_get_font_value;
|
| };
|
|
|
| +
|
| #ifndef FT_CONFIG_OPTION_PIC
|
|
|
| -#define FT_DEFINE_SERVICE_PSINFOREC(class_, get_font_info_, \
|
| - ps_get_font_extra_, has_glyph_names_, get_font_private_) \
|
| - static const FT_Service_PsInfoRec class_ = \
|
| +#define FT_DEFINE_SERVICE_PSINFOREC( class_, \
|
| + get_font_info_, \
|
| + ps_get_font_extra_, \
|
| + has_glyph_names_, \
|
| + get_font_private_, \
|
| + get_font_value_ ) \
|
| + static const FT_Service_PsInfoRec class_ = \
|
| { \
|
| get_font_info_, ps_get_font_extra_, has_glyph_names_, \
|
| - get_font_private_ \
|
| + 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_) \
|
| +#define FT_DEFINE_SERVICE_PSINFOREC( class_, \
|
| + get_font_info_, \
|
| + ps_get_font_extra_, \
|
| + has_glyph_names_, \
|
| + get_font_private_, \
|
| + get_font_value_ ) \
|
| void \
|
| - FT_Init_Class_##class_( FT_Library library, \
|
| - FT_Service_PsInfoRec* clazz) \
|
| + FT_Init_Class_ ## class_( FT_Library library, \
|
| + FT_Service_PsInfoRec* clazz ) \
|
| { \
|
| - FT_UNUSED(library); \
|
| - clazz->ps_get_font_info = get_font_info_; \
|
| - clazz->ps_get_font_extra = ps_get_font_extra_; \
|
| - clazz->ps_has_glyph_names = has_glyph_names_; \
|
| + FT_UNUSED( library ); \
|
| + \
|
| + clazz->ps_get_font_info = get_font_info_; \
|
| + clazz->ps_get_font_extra = ps_get_font_extra_; \
|
| + 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 */
|
|
|
| /* */
|
|
|
|
|