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

minor

This commit is contained in:
Ebrahim Byagowi 2019-10-06 17:06:40 +03:30
parent 100dbccaa5
commit 74a2dbbced
5 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +0,0 @@
*.plist

1
src/Makefile.sources
View File

@ -139,7 +139,6 @@ HB_BASE_sources = \
hb-ot-var-gvar-table.hh \ hb-ot-var-gvar-table.hh \
hb-ot-var-hvar-table.hh \ hb-ot-var-hvar-table.hh \
hb-ot-var-mvar-table.hh \ hb-ot-var-mvar-table.hh \
hb-ot-var-gvar-table.hh \
hb-ot-var.cc \ hb-ot-var.cc \
hb-ot-vorg-table.hh \ hb-ot-vorg-table.hh \
hb-pool.hh \ hb-pool.hh \

1
src/hb-ot-font.cc
View File

@ -43,7 +43,6 @@
#include "hb-ot-post-table.hh" #include "hb-ot-post-table.hh"
#include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise. #include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise.
#include "hb-ot-vorg-table.hh" #include "hb-ot-vorg-table.hh"
#include "hb-ot-var-gvar-table.hh"
#include "hb-ot-color-cbdt-table.hh" #include "hb-ot-color-cbdt-table.hh"
#include "hb-ot-color-sbix-table.hh" #include "hb-ot-color-sbix-table.hh"

1
src/hb-ot-hmtx-table.hh
View File

@ -165,7 +165,6 @@ struct hmtxvmtx
void init (hb_face_t *face, void init (hb_face_t *face,
unsigned int default_advance_ = 0) unsigned int default_advance_ = 0)
{ {
memset (this, 0, sizeof (*this));
default_advance = default_advance_ ? default_advance_ : hb_face_get_upem (face); default_advance = default_advance_ ? default_advance_ : hb_face_get_upem (face);
num_advances = T::is_horizontal ? face->table.hhea->numberOfLongMetrics : face->table.vhea->numberOfLongMetrics; num_advances = T::is_horizontal ? face->table.hhea->numberOfLongMetrics : face->table.vhea->numberOfLongMetrics;

37
src/hb-ot-var-hvar-table.hh
View File

@ -65,7 +65,7 @@ struct DeltaSetIndexMap
unsigned int v = output_map[i]; unsigned int v = output_map[i];
unsigned int outer = v >> 16; unsigned int outer = v >> 16;
unsigned int inner = v & 0xFFFF; unsigned int inner = v & 0xFFFF;
unsigned int u = (outer << inner_bit_count)|inner; unsigned int u = (outer << inner_bit_count) | inner;
for (unsigned int w = width; w > 0;) for (unsigned int w = width; w > 0;)
{ {
p[--w] = u; p[--w] = u;
@ -155,14 +155,14 @@ struct index_map_subset_plan_t
hb_codepoint_t old_gid; hb_codepoint_t old_gid;
if (!plan->old_gid_for_new_gid (gid - 1, &old_gid)) if (!plan->old_gid_for_new_gid (gid - 1, &old_gid))
{ {
if (last_gid == (hb_codepoint_t)-1) if (last_gid == (hb_codepoint_t) -1)
continue; continue;
else else
break; break;
} }
unsigned int v = index_map.map (old_gid); unsigned int v = index_map.map (old_gid);
if (last_gid == (hb_codepoint_t)-1) if (last_gid == (hb_codepoint_t) -1)
{ {
last_val = v; last_val = v;
last_gid = gid; last_gid = gid;
@ -226,8 +226,8 @@ struct index_map_subset_plan_t
} }
unsigned int get_inner_bit_count () const { return inner_bit_count; } unsigned int get_inner_bit_count () const { return inner_bit_count; }
unsigned int get_width () const { return ((outer_bit_count + inner_bit_count + 7) / 8); } unsigned int get_width () const { return ((outer_bit_count + inner_bit_count + 7) / 8); }
unsigned int get_map_count () const { return map_count; } unsigned int get_map_count () const { return map_count; }
unsigned int get_size () const unsigned int get_size () const
{ return (map_count? (DeltaSetIndexMap::min_size + get_width () * map_count): 0); } { return (map_count? (DeltaSetIndexMap::min_size + get_width () * map_count): 0); }
@ -236,13 +236,11 @@ struct index_map_subset_plan_t
hb_array_t<const unsigned int> get_output_map () const { return output_map.as_array (); } hb_array_t<const unsigned int> get_output_map () const { return output_map.as_array (); }
protected: protected:
unsigned int map_count; unsigned int map_count;
hb_vector_t<unsigned int> hb_vector_t<unsigned int> max_inners;
max_inners; unsigned int outer_bit_count;
unsigned int outer_bit_count; unsigned int inner_bit_count;
unsigned int inner_bit_count; hb_vector_t<unsigned int> output_map;
hb_vector_t<unsigned int>
output_map;
}; };
struct hvarvvar_subset_plan_t struct hvarvvar_subset_plan_t
@ -318,15 +316,14 @@ struct hvarvvar_subset_plan_t
index_map_plans.fini_deep (); index_map_plans.fini_deep ();
} }
hb_inc_bimap_t outer_map; hb_inc_bimap_t outer_map;
hb_vector_t<hb_inc_bimap_t> inner_maps; hb_vector_t<hb_inc_bimap_t> inner_maps;
hb_vector_t<index_map_subset_plan_t> hb_vector_t<index_map_subset_plan_t> index_map_plans;
index_map_plans; const VariationStore *var_store;
const VariationStore *var_store;
protected: protected:
hb_vector_t<hb_set_t *> inner_sets; hb_vector_t<hb_set_t *> inner_sets;
hb_set_t *adv_set; hb_set_t *adv_set;
}; };
/* /*