From 26bfcb64e473c40e439d6efbe974781dada28eca Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 4 May 2010 14:49:45 -0400 Subject: [PATCH] Cosmetic --- src/hb-ot-layout-gdef-private.hh | 5 ++--- src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh index e63ec73..c1e021b 100644 --- a/src/hb-ot-layout-gdef-private.hh +++ b/src/hb-ot-layout-gdef-private.hh @@ -348,9 +348,8 @@ struct GDEF inline bool sanitize (SANITIZE_ARG_DEF) { TRACE_SANITIZE (); - if (!SANITIZE (version)) return false; - if (unlikely (version.major != 1)) return false; - return SANITIZE_THIS2 (glyphClassDef, attachList) && + return SANITIZE (version) && likely (version.major == 1) && + SANITIZE_THIS2 (glyphClassDef, attachList) && SANITIZE_THIS2 (ligCaretList, markAttachClassDef) && (version < 0x00010002 || SANITIZE_THIS (markGlyphSetsDef[0])); } diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh index f945ed9..d07fe25 100644 --- a/src/hb-ot-layout-gsubgpos-private.hh +++ b/src/hb-ot-layout-gsubgpos-private.hh @@ -913,10 +913,9 @@ struct GSUBGPOS inline bool sanitize (SANITIZE_ARG_DEF) { TRACE_SANITIZE (); - if (!SANITIZE (version)) return false; - if (unlikely (version.major != 1)) return false; - return SANITIZE_THIS (scriptList) - && SANITIZE_THIS (featureList) + return SANITIZE (version) && likely (version.major == 1) + && SANITIZE_THIS (scriptList) + && SANITIZE_THIS (featureList) && SANITIZE_THIS (lookupList); } -- 2.7.4