From 01a16992cc9297d4985dc80e3177cc7475b9b385 Mon Sep 17 00:00:00 2001 From: bungeman Date: Fri, 19 Aug 2016 08:45:37 -0700 Subject: Simplify embeddability test. There is no reason to read the whole OS/2 table, and no need to spell out the full names of all the types over and over. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2256783002 Review-Url: https://codereview.chromium.org/2256783002 --- src/sfnt/SkOTTable_OS_2.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sfnt') diff --git a/src/sfnt/SkOTTable_OS_2.h b/src/sfnt/SkOTTable_OS_2.h index 4a09a78605..438257805c 100644 --- a/src/sfnt/SkOTTable_OS_2.h +++ b/src/sfnt/SkOTTable_OS_2.h @@ -18,11 +18,11 @@ #pragma pack(push, 1) struct SkOTTableOS2 { - static const SK_OT_CHAR TAG0 = 'O'; - static const SK_OT_CHAR TAG1 = 'S'; - static const SK_OT_CHAR TAG2 = '/'; - static const SK_OT_CHAR TAG3 = '2'; - static const SK_OT_ULONG TAG = SkOTTableTAG::value; + static constexpr SK_OT_CHAR TAG0 = 'O'; + static constexpr SK_OT_CHAR TAG1 = 'S'; + static constexpr SK_OT_CHAR TAG2 = '/'; + static constexpr SK_OT_CHAR TAG3 = '2'; + static constexpr SK_OT_ULONG TAG = SkOTTableTAG::value; union Version { SK_OT_USHORT version; -- cgit v1.2.3