[HarfBuzz] harfbuzz-ng: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-open-file-private.hh        |    2 --
 src/hb-ot-layout-common-private.hh |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit d6387757de2c27867d6f57c4ee7c4ef436b3a74f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Nov 11 17:15:03 2009 -0500

    Fix sanitize

diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index f8749a1..fc69c89 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -291,7 +291,7 @@ struct Lookup
 
   inline bool sanitize (SANITIZE_ARG_DEF) {
     TRACE_SANITIZE ();
-    if (!(SANITIZE_SELF/*XXXXXXXXXXXXXX*/ () && SANITIZE_THIS (subTable))) return false;
+    if (!(SANITIZE (lookupType) && SANITIZE (lookupFlag) && SANITIZE_THIS (subTable))) return false;
     if (HB_UNLIKELY (lookupFlag & LookupFlag::UseMarkFilteringSet))
     {
       USHORT &markFilteringSet = NEXT (USHORT, subTable);
commit 636f017e387d46d4083c9f9ee57647a94dc5dc6d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Nov 10 12:56:35 2009 -0500

    Remove obsolete TODO item

diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index dda6b94..7b83813 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -147,8 +147,6 @@ struct TTCHeader
     TRACE_SANITIZE ();
     if (!SANITIZE (version)) return false;
     if (version.major < 1 || version.major > 2) return true;
-    /* TODO Maybe we shouldn't NEUTER these offsets, they may cause a full copy
-     * of the whole font right now. */
     return table.sanitize (SANITIZE_ARG, CONST_CHARP(this), CONST_CHARP(this));
   }