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

[repacker] Begin implementing MarkBasePosFormat1::shrink.

This commit is contained in:
Garret Rieger 2022-08-11 22:53:30 +00:00
parent c9ddf0815a
commit bbe14417ad
1 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/graph/markbasepos-graph.hh
View File

@ -204,6 +204,18 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
hb_hashmap_t<unsigned, unsigned> mark_array_links; hb_hashmap_t<unsigned, unsigned> mark_array_links;
hb_hashmap_t<unsigned, unsigned> base_array_links; hb_hashmap_t<unsigned, unsigned> base_array_links;
hb_set_t marks_for (unsigned start, unsigned end)
{
hb_set_t marks;
for (unsigned klass = start; klass < end; klass++)
{
+ class_to_info[klass].marks.iter ()
| hb_sink (marks)
;
}
return marks;
}
unsigned original_count () unsigned original_count ()
{ {
return thiz->classCount; return thiz->classCount;
@ -259,37 +271,38 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
return class_to_info; return class_to_info;
} }
bool shrink (split_context_t& c, bool shrink (split_context_t& sc,
unsigned this_index, unsigned this_index,
unsigned count) unsigned count)
{ {
/*
DEBUG_MSG (SUBSET_REPACK, nullptr, DEBUG_MSG (SUBSET_REPACK, nullptr,
" Shrinking PairPosFormat1 (%u) to [0, %u).", " Shrinking MarkBasePosFormat1 (%u) to [0, %u).",
this_index, this_index,
count); count);
unsigned old_count = pairSet.len;
unsigned old_count = classCount;
if (count >= old_count) if (count >= old_count)
return true; return true;
pairSet.len = count; classCount = count;
c.graph.vertices_[this_index].obj.tail -= (old_count - count) * SmallTypes::size;
unsigned coverage_id = c.graph.mutable_index_for_offset (this_index, &coverage); auto mark_coverage = sc.c.graph.as_table<Coverage> (this_index,
unsigned coverage_size = c.graph.vertices_[coverage_id].table_size (); &markCoverage);
auto& coverage_v = c.graph.vertices_[coverage_id]; if (!mark_coverage) return false;
hb_set_t marks = sc.marks_for (0, count);
Coverage* coverage_table = (Coverage*) coverage_v.obj.head; auto new_coverage =
if (!coverage_table || !coverage_table->sanitize (coverage_v)) + hb_zip (hb_range (), mark_coverage.table->iter ())
| hb_filter (marks, hb_first)
| hb_map_retains_sorting (hb_second)
;
if (!Coverage::make_coverage (sc.c, + new_coverage,
mark_coverage.index,
4 + 2 * marks.get_population ()))
return false; return false;
auto new_coverage = // TODO: markArray, baseArray
+ hb_zip (coverage_table->iter (), hb_range ()) /*
| hb_filter ([&] (hb_pair_t<unsigned, unsigned> p) {
return p.second < count;
})
| hb_map_retains_sorting (hb_first)
;
return Coverage::make_coverage (c, new_coverage, coverage_id, coverage_size); return Coverage::make_coverage (c, new_coverage, coverage_id, coverage_size);
*/ */
@ -305,8 +318,6 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
DEBUG_MSG (SUBSET_REPACK, nullptr, DEBUG_MSG (SUBSET_REPACK, nullptr,
" Cloning MarkBasePosFormat1 (%u) range [%u, %u).", this_index, start, end); " Cloning MarkBasePosFormat1 (%u) range [%u, %u).", this_index, start, end);
// TODO
graph_t& graph = sc.c.graph; graph_t& graph = sc.c.graph;
unsigned prime_size = OT::Layout::GPOS_impl::MarkBasePosFormat1_2<SmallTypes>::static_size; unsigned prime_size = OT::Layout::GPOS_impl::MarkBasePosFormat1_2<SmallTypes>::static_size;
@ -322,18 +333,19 @@ struct MarkBasePosFormat1 : public OT::Layout::GPOS_impl::MarkBasePosFormat1_2<S
graph.add_link (&(prime->baseCoverage), prime_id, base_coverage_id); graph.add_link (&(prime->baseCoverage), prime_id, base_coverage_id);
graph.duplicate (prime_id, base_coverage_id); graph.duplicate (prime_id, base_coverage_id);
hb_set_t marks; auto mark_coverage = sc.c.graph.as_table<Coverage> (this_index,
for (unsigned klass = start; klass < end; klass++) &markCoverage);
{ if (!mark_coverage) return false;
+ sc.class_to_info[klass].marks.iter () hb_set_t marks = sc.marks_for (start, end);
| hb_sink (marks) auto new_coverage =
+ hb_zip (hb_range (), mark_coverage.table->iter ())
| hb_filter (marks, hb_first)
| hb_map_retains_sorting (hb_second)
; ;
}
if (!Coverage::add_coverage (sc.c, if (!Coverage::add_coverage (sc.c,
prime_id, prime_id,
2, 2,
+ marks.iter (), + new_coverage,
marks.get_population () * 2 + 4)) marks.get_population () * 2 + 4))
return -1; return -1;