From b71fb8bb74a42fea9e82e2f92ff70a5ddf707c17 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 13 May 2020 21:46:28 +0530 Subject: [PATCH] include: edit dwrite.idl file * remove trailing comma in enums * edit DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME as per docs * add DWRITE_MAKE_FONT_FEATURE_TAG define Signed-off-by: Biswapriyo Nath --- include/dwrite.idl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index a8c523e..ca4c208 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -138,7 +138,7 @@ typedef enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, - DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAMES = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME = DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME } DWRITE_INFORMATIONAL_STRING_ID; typedef enum DWRITE_FONT_SIMULATIONS @@ -238,6 +238,8 @@ cpp_quote(" ((UINT32)(UINT8)(c) << 16) | \\") cpp_quote(" ((UINT32)(UINT8)(b) << 8) | \\") cpp_quote(" (UINT32)(UINT8)(a))") +cpp_quote("#define DWRITE_MAKE_FONT_FEATURE_TAG(a,b,c,d) ((DWRITE_FONT_FEATURE_TAG)(DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d)))") + typedef enum DWRITE_FONT_FEATURE_TAG { DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS = 0x63726661, /* 'afrc' */ @@ -320,7 +322,7 @@ typedef enum DWRITE_FONT_FEATURE_TAG DWRITE_FONT_FEATURE_TAG_UNICASE = 0x63696e75, /* 'unic' */ DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING = 0x74726576, /* 'vert' */ DWRITE_FONT_FEATURE_TAG_VERTICAL_ALTERNATES_AND_ROTATION= 0x32747276, /* 'vrt2' */ - DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO = 0x6f72657a, /* 'zero' */ + DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO = 0x6f72657a /* 'zero' */ } DWRITE_FONT_FEATURE_TAG; typedef enum DWRITE_SCRIPT_SHAPES -- 2.26.2