diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2018-11-11 16:35:28 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2018-11-11 16:35:28 -0500 |
| commit | 1beacdded9cd1e4467b52244cdfd8497516eb107 (patch) | |
| tree | 0f38801ed90e11e7a7b64f4c02bd714cb32abae8 | |
| parent | e88d47b7f2f9aee5b0b3cdc0b8f708884175a71f (diff) | |
Minor
| -rw-r--r-- | src/hb-coretext.cc | 8 | ||||
| -rw-r--r-- | src/hb-directwrite.cc | 4 | ||||
| -rw-r--r-- | src/hb-fallback-shape.cc | 4 | ||||
| -rw-r--r-- | src/hb-graphite2.cc | 4 | ||||
| -rw-r--r-- | src/hb-ot-shape.cc | 4 | ||||
| -rw-r--r-- | src/hb-shaper.hh | 3 | ||||
| -rw-r--r-- | src/hb-uniscribe.cc | 4 |
7 files changed, 16 insertions, 15 deletions
diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc index 893a8761..7509b8a3 100644 --- a/src/hb-coretext.cc +++ b/src/hb-coretext.cc @@ -101,10 +101,10 @@ _hb_cg_font_release (void *data) } -HB_SHAPER_DATA_ENSURE_DEFINE(coretext, face) +HB_SHAPER_DATA_ENSURE_DEFINE(coretext, face); HB_SHAPER_DATA_ENSURE_DEFINE_WITH_CONDITION(coretext, font, fabs (CTFontGetSize((CTFontRef) data) - coretext_font_size_from_ptem (font->ptem)) <= .5 -) +); static CTFontDescriptorRef get_last_resort_font_desc (void) @@ -1152,8 +1152,8 @@ fail: * AAT shaper */ -HB_SHAPER_DATA_ENSURE_DEFINE(coretext_aat, face) -HB_SHAPER_DATA_ENSURE_DEFINE(coretext_aat, font) +HB_SHAPER_DATA_ENSURE_DEFINE(coretext_aat, face); +HB_SHAPER_DATA_ENSURE_DEFINE(coretext_aat, font); /* * shaper face data diff --git a/src/hb-directwrite.cc b/src/hb-directwrite.cc index 35197c23..cc8f6cc0 100644 --- a/src/hb-directwrite.cc +++ b/src/hb-directwrite.cc @@ -31,8 +31,8 @@ #include "hb-directwrite.h" -HB_SHAPER_DATA_ENSURE_DEFINE (directwrite, face) -HB_SHAPER_DATA_ENSURE_DEFINE (directwrite, font) +HB_SHAPER_DATA_ENSURE_DEFINE (directwrite, face); +HB_SHAPER_DATA_ENSURE_DEFINE (directwrite, font); /* diff --git a/src/hb-fallback-shape.cc b/src/hb-fallback-shape.cc index dc8536c8..ccfeba4b 100644 --- a/src/hb-fallback-shape.cc +++ b/src/hb-fallback-shape.cc @@ -28,8 +28,8 @@ #include "hb-shaper-impl.hh" -HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face) -HB_SHAPER_DATA_ENSURE_DEFINE(fallback, font) +HB_SHAPER_DATA_ENSURE_DEFINE(fallback, face); +HB_SHAPER_DATA_ENSURE_DEFINE(fallback, font); /* diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc index 24ee3d50..38c2cd81 100644 --- a/src/hb-graphite2.cc +++ b/src/hb-graphite2.cc @@ -46,8 +46,8 @@ **/ -HB_SHAPER_DATA_ENSURE_DEFINE(graphite2, face) -HB_SHAPER_DATA_ENSURE_DEFINE(graphite2, font) +HB_SHAPER_DATA_ENSURE_DEFINE(graphite2, face); +HB_SHAPER_DATA_ENSURE_DEFINE(graphite2, font); /* diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index 99d6b9d4..92a4b53a 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -255,7 +255,7 @@ hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner, * shaper face data */ -HB_SHAPER_DATA_ENSURE_DEFINE(ot, face) +HB_SHAPER_DATA_ENSURE_DEFINE(ot, face); struct hb_ot_face_data_t {}; @@ -275,7 +275,7 @@ _hb_ot_shaper_face_data_destroy (hb_ot_face_data_t *data) * shaper font data */ -HB_SHAPER_DATA_ENSURE_DEFINE(ot, font) +HB_SHAPER_DATA_ENSURE_DEFINE(ot, font); struct hb_ot_font_data_t {}; diff --git a/src/hb-shaper.hh b/src/hb-shaper.hh index 361165e4..e3be4119 100644 --- a/src/hb-shaper.hh +++ b/src/hb-shaper.hh @@ -119,7 +119,8 @@ HB_SHAPER_DATA_ENSURE_FUNC(shaper, object) (hb_##object##_t *object) \ } \ } \ return data != nullptr && (void *) data != HB_SHAPER_DATA_INVALID; \ -} +} \ +static_assert (true, "") /* Require semicolon. */ /* For embedding in face / font / ... */ diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc index e77825b3..76da20df 100644 --- a/src/hb-uniscribe.cc +++ b/src/hb-uniscribe.cc @@ -314,8 +314,8 @@ struct range_record_t { unsigned int index_last; /* == end - 1 */ }; -HB_SHAPER_DATA_ENSURE_DEFINE(uniscribe, face) -HB_SHAPER_DATA_ENSURE_DEFINE(uniscribe, font) +HB_SHAPER_DATA_ENSURE_DEFINE(uniscribe, face); +HB_SHAPER_DATA_ENSURE_DEFINE(uniscribe, font); /* |