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

[dfont] Minor

This commit is contained in:
Behdad Esfahbod 2018-09-13 18:49:16 +02:00
parent bf852f0e62
commit 3fba41906f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hb-open-file.hh
View File

@ -411,17 +411,14 @@ struct ResourceForkHeader
inline const hb_bytes_t get_data (const ResourceTypeRecord& type, inline const hb_bytes_t get_data (const ResourceTypeRecord& type,
unsigned int idx) const unsigned int idx) const
{ { return (this+map).get_resource_record (type, idx).get_data (&(this+data)); }
const ResourceMap &resource_map = this+map;
const void *data_base = &(this+data);
return resource_map.get_resource_record (type, idx).get_data (data_base);
}
inline const OpenTypeFontFace& get_face (unsigned int idx, inline const OpenTypeFontFace& get_face (unsigned int idx,
unsigned int *base_offset = nullptr) const unsigned int *base_offset = nullptr) const
{ {
const ResourceMap &resource_map = this+map; const ResourceMap &resource_map = this+map;
for (unsigned int i = 0; i < resource_map.get_type_count (); i++) unsigned int count = resource_map.get_type_count ();
for (unsigned int i = 0; i < count; i++)
{ {
const ResourceTypeRecord& type = resource_map.get_type_record (i); const ResourceTypeRecord& type = resource_map.get_type_record (i);
if (type.is_sfnt () && idx < type.get_resource_count ()) if (type.is_sfnt () && idx < type.get_resource_count ())