AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a few likely()'s

Browse Source
This commit is contained in:
Behdad Esfahbod 2010-05-10 23:13:08 -04:00
parent 24552ecf92
commit 69cb28bc13
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hb-ot-layout-common-private.hh
View File

@ -284,7 +284,7 @@ struct Lookup
TRACE_SANITIZE (); TRACE_SANITIZE ();
/* Real sanitize of the subtables is done by GSUB/GPOS/... */ /* Real sanitize of the subtables is done by GSUB/GPOS/... */
if (!(context->check_struct (this) if (!(context->check_struct (this)
&& likely (subTable.sanitize (context)))) return false; && subTable.sanitize (context))) return false;
if (unlikely (lookupFlag & LookupFlag::UseMarkFilteringSet)) if (unlikely (lookupFlag & LookupFlag::UseMarkFilteringSet))
{ {
USHORT &markFilteringSet = StructAfter<USHORT> (subTable); USHORT &markFilteringSet = StructAfter<USHORT> (subTable);

8
src/hb-ot-layout-gpos-private.hh
View File

@ -633,7 +633,7 @@ struct PairPosFormat1
if (!(context->check_struct (this) if (!(context->check_struct (this)
&& coverage.sanitize (context, this) && coverage.sanitize (context, this)
&& likely (pairSet.sanitize (context, this, len1 + len2)))) return false; && pairSet.sanitize (context, this, len1 + len2))) return false;
if (!(valueFormat1.has_device () || valueFormat2.has_device ())) return true; if (!(valueFormat1.has_device () || valueFormat2.has_device ())) return true;
@ -1092,7 +1092,7 @@ struct MarkBasePosFormat1
&& markCoverage.sanitize (context, this) && markCoverage.sanitize (context, this)
&& baseCoverage.sanitize (context, this) && baseCoverage.sanitize (context, this)
&& markArray.sanitize (context, this) && markArray.sanitize (context, this)
&& likely (baseArray.sanitize (context, this, (unsigned int) classCount)); && baseArray.sanitize (context, this, (unsigned int) classCount);
} }
private: private:
@ -1215,7 +1215,7 @@ struct MarkLigPosFormat1
&& markCoverage.sanitize (context, this) && markCoverage.sanitize (context, this)
&& ligatureCoverage.sanitize (context, this) && ligatureCoverage.sanitize (context, this)
&& markArray.sanitize (context, this) && markArray.sanitize (context, this)
&& likely (ligatureArray.sanitize (context, this, (unsigned int) classCount)); && ligatureArray.sanitize (context, this, (unsigned int) classCount);
} }
private: private:
@ -1319,7 +1319,7 @@ struct MarkMarkPosFormat1
&& mark1Coverage.sanitize (context, this) && mark1Coverage.sanitize (context, this)
&& mark2Coverage.sanitize (context, this) && mark2Coverage.sanitize (context, this)
&& mark1Array.sanitize (context, this) && mark1Array.sanitize (context, this)
&& likely (mark2Array.sanitize (context, this, (unsigned int) classCount)); && mark2Array.sanitize (context, this, (unsigned int) classCount);
} }
private: private: