From 228fa71bf9186faedff48b3a259d696c7c07b5b5 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 21 Oct 2018 17:43:29 -0700 Subject: [PATCH] [colr] Move sanitize --- src/hb-ot-color-colr-table.hh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/hb-ot-color-colr-table.hh b/src/hb-ot-color-colr-table.hh index aef3649..0e7f6ef 100644 --- a/src/hb-ot-color-colr-table.hh +++ b/src/hb-ot-color-colr-table.hh @@ -63,15 +63,8 @@ struct LayerRecord struct BaseGlyphRecord { - inline bool sanitize (hb_sanitize_context_t *c) const - { - TRACE_SANITIZE (this); - return_trace (likely (c->check_struct (this))); - } - - inline int cmp (hb_codepoint_t g) const { - return g < glyphId ? -1 : g > glyphId ? 1 : 0; - } + inline int cmp (hb_codepoint_t g) const + { return g < glyphId ? -1 : g > glyphId ? 1 : 0; } static int cmp (const void *pa, const void *pb) { @@ -80,6 +73,12 @@ struct BaseGlyphRecord return b->cmp (*a); } + inline bool sanitize (hb_sanitize_context_t *c) const + { + TRACE_SANITIZE (this); + return_trace (likely (c->check_struct (this))); + } + public: GlyphID glyphId; /* Glyph ID of reference glyph */ HBUINT16 firstLayerIdx; /* Index (from beginning of -- 2.7.4