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

Const correctness

This commit is contained in:
Behdad Esfahbod 2010-04-21 04:19:51 -04:00
parent e032ed9f75
commit 1922ffe701
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hb-ot-layout-gsub-private.hh
View File

@ -591,10 +591,10 @@ struct ReverseChainSingleSubstFormat1
if (match_backtrack (APPLY_ARG, if (match_backtrack (APPLY_ARG,
backtrack.len, (USHORT *) backtrack.const_array(), backtrack.len, (USHORT *) backtrack.const_array(),
match_coverage, DECONST_CHARP(this)) && match_coverage, CONST_CHARP(this)) &&
match_lookahead (APPLY_ARG, match_lookahead (APPLY_ARG,
lookahead.len, (USHORT *) lookahead.const_array(), lookahead.len, (USHORT *) lookahead.const_array(),
match_coverage, DECONST_CHARP(this), match_coverage, CONST_CHARP(this),
1)) 1))
{ {
IN_CURGLYPH () = substitute[index]; IN_CURGLYPH () = substitute[index];

30
src/hb-ot-layout-gsubgpos-private.hh
View File

@ -81,7 +81,7 @@
TRACE_APPLY_ARG_INIT TRACE_APPLY_ARG_INIT
typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, char *data); typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const char *data);
typedef bool (*apply_lookup_func_t) (APPLY_ARG_DEF, unsigned int lookup_index); typedef bool (*apply_lookup_func_t) (APPLY_ARG_DEF, unsigned int lookup_index);
struct ContextFuncs struct ContextFuncs
@ -91,18 +91,18 @@ struct ContextFuncs
}; };
static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, char *data HB_GNUC_UNUSED) static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, const char *data HB_GNUC_UNUSED)
{ {
return glyph_id == value; return glyph_id == value;
} }
static inline bool match_class (hb_codepoint_t glyph_id, const USHORT &value, char *data) static inline bool match_class (hb_codepoint_t glyph_id, const USHORT &value, const char *data)
{ {
const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data); const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
return class_def.get_class (glyph_id) == value; return class_def.get_class (glyph_id) == value;
} }
static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value, char *data) static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value, const char *data)
{ {
const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value; const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value;
return (data+coverage) (glyph_id) != NOT_COVERED; return (data+coverage) (glyph_id) != NOT_COVERED;
@ -113,7 +113,7 @@ static inline bool match_input (APPLY_ARG_DEF,
unsigned int count, /* Including the first glyph (not matched) */ unsigned int count, /* Including the first glyph (not matched) */
const USHORT input[], /* Array of input values--start with second glyph */ const USHORT input[], /* Array of input values--start with second glyph */
match_func_t match_func, match_func_t match_func,
char *match_data, const char *match_data,
unsigned int *context_length_out) unsigned int *context_length_out)
{ {
unsigned int i, j; unsigned int i, j;
@ -143,7 +143,7 @@ static inline bool match_backtrack (APPLY_ARG_DEF,
unsigned int count, unsigned int count,
const USHORT backtrack[], const USHORT backtrack[],
match_func_t match_func, match_func_t match_func,
char *match_data) const char *match_data)
{ {
if (HB_UNLIKELY (buffer->out_pos < count)) if (HB_UNLIKELY (buffer->out_pos < count))
return false; return false;
@ -168,7 +168,7 @@ static inline bool match_lookahead (APPLY_ARG_DEF,
unsigned int count, unsigned int count,
const USHORT lookahead[], const USHORT lookahead[],
match_func_t match_func, match_func_t match_func,
char *match_data, const char *match_data,
unsigned int offset) unsigned int offset)
{ {
unsigned int i, j; unsigned int i, j;
@ -271,7 +271,7 @@ static inline bool apply_lookup (APPLY_ARG_DEF,
struct ContextLookupContext struct ContextLookupContext
{ {
ContextFuncs funcs; ContextFuncs funcs;
char *match_data; const char *match_data;
}; };
static inline bool context_lookup (APPLY_ARG_DEF, static inline bool context_lookup (APPLY_ARG_DEF,
@ -411,7 +411,7 @@ struct ContextFormat2
*/ */
struct ContextLookupContext lookup_context = { struct ContextLookupContext lookup_context = {
{match_class, apply_func}, {match_class, apply_func},
DECONST_CHARP(&class_def) CONST_CHARP(&class_def)
}; };
return rule_set.apply (APPLY_ARG, lookup_context); return rule_set.apply (APPLY_ARG, lookup_context);
} }
@ -451,7 +451,7 @@ struct ContextFormat3
const LookupRecord *lookupRecord = &CONST_CAST(LookupRecord, coverage, coverage[0].get_size () * glyphCount); const LookupRecord *lookupRecord = &CONST_CAST(LookupRecord, coverage, coverage[0].get_size () * glyphCount);
struct ContextLookupContext lookup_context = { struct ContextLookupContext lookup_context = {
{match_coverage, apply_func}, {match_coverage, apply_func},
DECONST_CHARP(this) CONST_CHARP(this)
}; };
return context_lookup (APPLY_ARG, return context_lookup (APPLY_ARG,
glyphCount, (const USHORT *) (coverage + 1), glyphCount, (const USHORT *) (coverage + 1),
@ -522,7 +522,7 @@ struct Context
struct ChainContextLookupContext struct ChainContextLookupContext
{ {
ContextFuncs funcs; ContextFuncs funcs;
char *match_data[3]; const char *match_data[3];
}; };
static inline bool chain_context_lookup (APPLY_ARG_DEF, static inline bool chain_context_lookup (APPLY_ARG_DEF,
@ -696,9 +696,9 @@ struct ChainContextFormat2
*/ */
struct ChainContextLookupContext lookup_context = { struct ChainContextLookupContext lookup_context = {
{match_class, apply_func}, {match_class, apply_func},
{DECONST_CHARP(&backtrack_class_def), {CONST_CHARP(&backtrack_class_def),
DECONST_CHARP(&input_class_def), CONST_CHARP(&input_class_def),
DECONST_CHARP(&lookahead_class_def)} CONST_CHARP(&lookahead_class_def)}
}; };
return rule_set.apply (APPLY_ARG, lookup_context); return rule_set.apply (APPLY_ARG, lookup_context);
} }
@ -752,7 +752,7 @@ struct ChainContextFormat3
const ArrayOf<LookupRecord> &lookup = CONST_NEXT (ArrayOf<LookupRecord>, lookahead); const ArrayOf<LookupRecord> &lookup = CONST_NEXT (ArrayOf<LookupRecord>, lookahead);
struct ChainContextLookupContext lookup_context = { struct ChainContextLookupContext lookup_context = {
{match_coverage, apply_func}, {match_coverage, apply_func},
{DECONST_CHARP(this), DECONST_CHARP(this), DECONST_CHARP(this)} {CONST_CHARP(this), CONST_CHARP(this), CONST_CHARP(this)}
}; };
return chain_context_lookup (APPLY_ARG, return chain_context_lookup (APPLY_ARG,
backtrack.len, (const USHORT *) backtrack.const_array(), backtrack.len, (const USHORT *) backtrack.const_array(),