summaryrefslogtreecommitdiff
path: root/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh')
-rw-r--r--Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh40
1 files changed, 17 insertions, 23 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh
index 5474d1d11b8..0648f6175f7 100644
--- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh
+++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-aat-layout-trak-table.hh
@@ -46,25 +46,19 @@ struct TrackTableEntry
{
friend struct TrackData;
- inline float get_track_value () const
- {
- return track.to_float ();
- }
+ float get_track_value () const { return track.to_float (); }
- inline int get_value (const void *base,
- unsigned int index,
- unsigned int nSizes) const
- {
- return (base+valuesZ).as_array (nSizes)[index];
- }
+ int get_value (const void *base, unsigned int index,
+ unsigned int table_size) const
+ { return (base+valuesZ).as_array (table_size)[index]; }
public:
- inline bool sanitize (hb_sanitize_context_t *c, const void *base,
- unsigned int nSizes) const
+ bool sanitize (hb_sanitize_context_t *c, const void *base,
+ unsigned int table_size) const
{
TRACE_SANITIZE (this);
return_trace (likely (c->check_struct (this) &&
- (valuesZ.sanitize (c, base, nSizes))));
+ (valuesZ.sanitize (c, base, table_size))));
}
protected:
@@ -82,10 +76,10 @@ struct TrackTableEntry
struct TrackData
{
- inline float interpolate_at (unsigned int idx,
- float target_size,
- const TrackTableEntry &trackTableEntry,
- const void *base) const
+ float interpolate_at (unsigned int idx,
+ float target_size,
+ const TrackTableEntry &trackTableEntry,
+ const void *base) const
{
unsigned int sizes = nSizes;
hb_array_t<const Fixed> size_table ((base+sizeTable).arrayZ, sizes);
@@ -97,7 +91,7 @@ struct TrackData
(1.f - t) * trackTableEntry.get_value (base, idx, sizes);
}
- inline int get_tracking (const void *base, float ptem) const
+ int get_tracking (const void *base, float ptem) const
{
/* CoreText points are CSS pixels (96 per inch),
* NOT typographic points (72 per inch).
@@ -143,7 +137,7 @@ struct TrackData
*trackTableEntry, base));
}
- inline bool sanitize (hb_sanitize_context_t *c, const void *base) const
+ bool sanitize (hb_sanitize_context_t *c, const void *base) const
{
TRACE_SANITIZE (this);
return_trace (likely (c->check_struct (this) &&
@@ -166,11 +160,11 @@ struct TrackData
struct trak
{
- static const hb_tag_t tableTag = HB_AAT_TAG_trak;
+ enum { tableTag = HB_AAT_TAG_trak };
- inline bool has_data (void) const { return version.to_int (); }
+ bool has_data () const { return version.to_int (); }
- inline bool apply (hb_aat_apply_context_t *c) const
+ bool apply (hb_aat_apply_context_t *c) const
{
TRACE_APPLY (this);
@@ -211,7 +205,7 @@ struct trak
return_trace (true);
}
- inline bool sanitize (hb_sanitize_context_t *c) const
+ bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);