From 8af4073113493efb2945b471821b4fe01a9e1a5f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 19 Jan 2017 05:01:15 +0200 Subject: [PATCH] added to enums --- include/c/sk_types.h | 10 +++++----- src/c/sk_enums.cpp | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/c/sk_types.h b/include/c/sk_types.h index 2783d02..9030f5e 100644 --- a/include/c/sk_types.h +++ b/include/c/sk_types.h @@ -580,11 +580,11 @@ typedef enum { } gr_pixelconfig_t; typedef enum { - BW_Format, //!< 1bit per pixel mask (e.g. monochrome) - A8_Format, //!< 8bits per pixel mask (e.g. antialiasing) - THREE_D_Format, //!< 3 8bit per pixl planes: alpha, mul, add - ARGB32_Format, //!< SkPMColor - LCD16_Format, //!< 565 alpha for r/g/b + BW_SK_MASK_FORMAT, //!< 1bit per pixel mask (e.g. monochrome) + A8_SK_MASK_FORMAT, //!< 8bits per pixel mask (e.g. antialiasing) + THREE_D_SK_MASK_FORMAT, //!< 3 8bit per pixl planes: alpha, mul, add + ARGB32_SK_MASK_FORMAT, //!< SkPMColor + LCD16_SK_MASK_FORMAT, //!< 565 alpha for r/g/b } sk_mask_format_t; typedef struct { diff --git a/src/c/sk_enums.cpp b/src/c/sk_enums.cpp index 671172a..7fbcf10 100644 --- a/src/c/sk_enums.cpp +++ b/src/c/sk_enums.cpp @@ -348,4 +348,11 @@ static_assert ((int)SkEncodedInfo::Color::kYUVA_Color == (int)YUVA_SK_ static_assert ((int)SkEncodedInfo::Color::kInvertedCMYK_Color == (int)INVERTED_CMYK_SK_ENCODEDINFO_COLOR, ASSERT_MSG(SkEncodedInfo::Color, sk_encodedinfo_color_t)); static_assert ((int)SkEncodedInfo::Color::kYCCK_Color == (int)YCCK_SK_ENCODEDINFO_COLOR, ASSERT_MSG(SkEncodedInfo::Color, sk_encodedinfo_color_t)); +// sk_mask_format_t +static_assert ((int)SkMask::Format::kBW_Format == (int)BW_SK_MASK_FORMAT, ASSERT_MSG(SkMask::Format, sk_mask_format_t)); +static_assert ((int)SkMask::Format::kA8_Format == (int)A8_SK_MASK_FORMAT, ASSERT_MSG(SkMask::Format, sk_mask_format_t)); +static_assert ((int)SkMask::Format::k3D_Format == (int)THREE_D_SK_MASK_FORMAT, ASSERT_MSG(SkMask::Format, sk_mask_format_t)); +static_assert ((int)SkMask::Format::kARGB32_Format == (int)ARGB32_SK_MASK_FORMAT, ASSERT_MSG(SkMask::Format, sk_mask_format_t)); +static_assert ((int)SkMask::Format::kLCD16_Format == (int)LCD16_SK_MASK_FORMAT, ASSERT_MSG(SkMask::Format, sk_mask_format_t)); + #endif -- 2.7.4