organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-13 16:50:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[subset/cff1] In remap_sid_t::reset(), reset everything

Browse source 
Previous code wasn't resetting next=0; tests were passing.
It's always called when sidmap is empty. So, redundant,
but keeping as is.
This commit is contained in:
Behdad Esfahbod 2023-06-25 17:10:36 -06:00
parent 7e97233c35
commit 6ed0d04b69
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/hb-subset-cff1.cc
View file

@ -38,16 +38,25 @@
using namespace CFF;
struct remap_sid_t : hb_map_t
struct remap_sid_t
{
unsigned get_population () const { return map.get_population (); }
void reset ()
{
map.reset ();
vector.resize (0);
next = 0;
}
void resize (unsigned size)
{
hb_map_t::resize (size);
map.resize (size);
vector.alloc (size);
}
bool in_error () const
{ return hb_map_t::in_error () || vector.in_error (); }
{ return map.in_error () || vector.in_error (); }
unsigned int add (unsigned int sid)
{
@ -55,13 +64,13 @@ struct remap_sid_t : hb_map_t
{
sid = unoffset_sid (sid);
unsigned v = next;
if (set (sid, v, false))
if (map.set (sid, v, false))
{
vector.push (sid);
next++;
}
else
v = get (sid); // already exists
v = map.get (sid); // already exists
return offset_sid (v);
}
else
@ -73,7 +82,7 @@ struct remap_sid_t : hb_map_t
if (is_std_std (sid) || (sid == CFF_UNDEF_SID))
return sid;
else
return offset_sid (get (unoffset_sid (sid)));
return offset_sid (map.get (unoffset_sid (sid)));
}
static const unsigned int num_std_strings = 391;
@ -83,6 +92,7 @@ struct remap_sid_t : hb_map_t
static unsigned int unoffset_sid (unsigned int sid) { return sid - num_std_strings; }
unsigned next = 0;
hb_map_t map;
hb_vector_t<unsigned> vector;
};