| Index: include/freetype/internal/services/svcid.h
|
| diff --git a/include/freetype/internal/services/svcid.h b/include/freetype/internal/services/svcid.h
|
| index 9b874b5e725b3ad0876f3f692cd6eff3d40ee530..6be3f9374da84962a97085036cd7cc9bb69af9ab 100644
|
| --- a/include/freetype/internal/services/svcid.h
|
| +++ b/include/freetype/internal/services/svcid.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* The FreeType CID font services (specification). */
|
| /* */
|
| -/* Copyright 2007, 2009 by Derek Clegg, Michael Toftdal. */
|
| +/* Copyright 2007, 2009, 2012 by Derek Clegg, Michael Toftdal. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| /* modified, and distributed under the terms of the FreeType project */
|
| @@ -46,30 +46,36 @@ FT_BEGIN_HEADER
|
| FT_CID_GetCIDFromGlyphIndexFunc get_cid_from_glyph_index;
|
| };
|
|
|
| +
|
| #ifndef FT_CONFIG_OPTION_PIC
|
|
|
| -#define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \
|
| - get_is_cid_, get_cid_from_glyph_index_ ) \
|
| - static const FT_Service_CIDRec class_ = \
|
| - { \
|
| - get_ros_, get_is_cid_, get_cid_from_glyph_index_ \
|
| +#define FT_DEFINE_SERVICE_CIDREC( class_, \
|
| + get_ros_, \
|
| + get_is_cid_, \
|
| + get_cid_from_glyph_index_ ) \
|
| + static const FT_Service_CIDRec class_ = \
|
| + { \
|
| + get_ros_, get_is_cid_, get_cid_from_glyph_index_ \
|
| };
|
|
|
| -#else /* FT_CONFIG_OPTION_PIC */
|
| -
|
| -#define FT_DEFINE_SERVICE_CIDREC(class_, get_ros_, \
|
| - get_is_cid_, get_cid_from_glyph_index_ ) \
|
| - void \
|
| - FT_Init_Class_##class_( FT_Library library, \
|
| - FT_Service_CIDRec* clazz) \
|
| - { \
|
| - FT_UNUSED(library); \
|
| - 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 */
|
| +#else /* FT_CONFIG_OPTION_PIC */
|
| +
|
| +#define FT_DEFINE_SERVICE_CIDREC( class_, \
|
| + get_ros_, \
|
| + get_is_cid_, \
|
| + get_cid_from_glyph_index_ ) \
|
| + void \
|
| + FT_Init_Class_ ## class_( FT_Library library, \
|
| + FT_Service_CIDRec* clazz ) \
|
| + { \
|
| + FT_UNUSED( library ); \
|
| + \
|
| + 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 */
|
|
|
| /* */
|
|
|
|
|