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

[base] Don't use enum inside the table

This commit is contained in:
Ebrahim Byagowi 2019-07-30 03:34:10 +04:30 committed by GitHub
parent 388fa9b326
commit ed2965a852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/hb-ot-layout-base-table.hh
View File

@ -32,9 +32,6 @@
#include "hb-open-type.hh" #include "hb-open-type.hh"
#include "hb-ot-layout-common.hh" #include "hb-ot-layout-common.hh"
/* To be removed */
typedef hb_tag_t hb_ot_layout_baseline_t;
namespace OT { namespace OT {
/* /*
@ -118,9 +115,9 @@ struct BaseCoord
{ {
bool has_data () const { return u.format; } bool has_data () const { return u.format; }
hb_position_t get_coord (hb_font_t *font, hb_position_t get_coord (hb_font_t *font,
const VariationStore &var_store, const VariationStore &var_store,
hb_direction_t direction) const hb_direction_t direction) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.get_coord (); case 1: return u.format1.get_coord ();
@ -376,10 +373,10 @@ struct BaseScriptList
struct Axis struct Axis
{ {
bool get_baseline (hb_ot_layout_baseline_t baseline, bool get_baseline (hb_tag_t baseline_tag,
hb_tag_t script_tag, hb_tag_t script_tag,
hb_tag_t language_tag, hb_tag_t language_tag,
const BaseCoord **coord) const const BaseCoord **coord) const
{ {
const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag); const BaseScript &base_script = (this+baseScriptList).get_base_script (script_tag);
if (!base_script.has_data ()) return false; if (!base_script.has_data ()) return false;
@ -387,7 +384,7 @@ struct Axis
if (likely (coord)) if (likely (coord))
{ {
unsigned int tag_index = 0; unsigned int tag_index = 0;
(this+baseTagList).bfind (baseline, &tag_index); (this+baseTagList).bfind (baseline_tag, &tag_index);
*coord = &base_script.get_base_coord (tag_index); *coord = &base_script.get_base_coord (tag_index);
} }
@ -442,15 +439,15 @@ struct BASE
const VariationStore &get_var_store () const const VariationStore &get_var_store () const
{ return version.to_int () < 0x00010001u ? Null (VariationStore) : this+varStore; } { return version.to_int () < 0x00010001u ? Null (VariationStore) : this+varStore; }
bool get_baseline (hb_font_t *font, bool get_baseline (hb_font_t *font,
hb_ot_layout_baseline_t baseline, hb_tag_t baseline_tag,
hb_direction_t direction, hb_direction_t direction,
hb_tag_t script_tag, hb_tag_t script_tag,
hb_tag_t language_tag, hb_tag_t language_tag,
hb_position_t *base) const hb_position_t *base) const
{ {
const BaseCoord *base_coord = nullptr; const BaseCoord *base_coord = nullptr;
if (unlikely (!get_axis (direction).get_baseline (baseline, script_tag, language_tag, &base_coord) || if (unlikely (!get_axis (direction).get_baseline (baseline_tag, script_tag, language_tag, &base_coord) ||
!base_coord || !base_coord->has_data ())) !base_coord || !base_coord->has_data ()))
return false; return false;