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

move to the hb_face_t dest pattern

This commit is contained in:
Rod Sheeter 2018-02-07 16:09:52 -08:00 committed by Behdad Esfahbod
parent 0859a00669
commit 13193a9b97
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hb-ot-cmap-table.hh
View File

@ -504,8 +504,13 @@ struct cmap
encodingRecord.sanitize (c, this)); encodingRecord.sanitize (c, this));
} }
inline bool subset(hb_subset_plan_t *plan, OT::hb_serialize_context_t *out) const inline bool subset(hb_subset_plan_t *plan, hb_face_t *source, hb_face_t *dest) const
{ {
// TODO something useful re: memory, write to dest
size_t dest_sz = 64536; // as much as anyone would ever need
void *dest_buf = malloc(dest_sz);
OT::hb_serialize_context_t context(dest_buf, dest_sz);
// Same version // Same version
OT::cmap new_cmap; OT::cmap new_cmap;
new_cmap.version = version; new_cmap.version = version;

28
src/hb-subset.cc
View File

@ -109,22 +109,21 @@ hb_subset_input_destroy(hb_subset_input_t *subset_input)
template<typename TableType> template<typename TableType>
hb_bool_t hb_bool_t
subset(hb_subset_plan_t *plan, hb_face_t *face, hb_blob_t **out) subset(hb_subset_plan_t *plan, hb_face_t *source, hb_face_t *dest)
{ {
OT::Sanitizer<TableType> sanitizer; OT::Sanitizer<TableType> sanitizer;
hb_blob_t *table_blob = sanitizer.sanitize (face->reference_table (TableType::tableTag)); hb_blob_t *table_blob = sanitizer.sanitize (source->reference_table (TableType::tableTag));
if (unlikely(!table_blob)) { if (unlikely(!table_blob)) {
DEBUG_MSG(SUBSET, nullptr, "Failed to reference table for tag %d", TableType::tableTag);
return false; return false;
} }
const TableType *table = OT::Sanitizer<TableType>::lock_instance (table_blob); const TableType *table = OT::Sanitizer<TableType>::lock_instance (table_blob);
hb_bool_t result = table->subset(plan, source, dest);
// TODO actually manage the context/output memory
size_t dest_sz = 64536; // as much as anyone would ever need
void *dest = malloc(dest_sz);
OT::hb_serialize_context_t context(dest, dest_sz);
hb_bool_t result = table->subset(plan, &context);
// TODO populate out
hb_blob_destroy (table_blob); hb_blob_destroy (table_blob);
// TODO string not numeric tag
DEBUG_MSG(SUBSET, nullptr, "Subset %d %s", TableType::tableTag, result ? "success" : "FAILED!");
return result; return result;
} }
@ -306,18 +305,17 @@ hb_subset (hb_face_t *source,
// - copy the table into the output. // - copy the table into the output.
// - Fix header + table directory. // - Fix header + table directory.
bool success = true;
hb_face_t *dest = nullptr; // TODO allocate dest
hb_blob_t *glyf_prime = nullptr; hb_blob_t *glyf_prime = nullptr;
if (hb_subset_glyf (plan, source, &glyf_prime)) { if (hb_subset_glyf (plan, source, &glyf_prime)) {
// TODO: write new glyf to new face. // TODO: write new glyf to new face.
} }
hb_blob_destroy (glyf_prime); hb_blob_destroy (glyf_prime);
hb_blob_t *cmap_prime = nullptr; success = success && subset<const OT::cmap>(plan, source, dest);
if (subset<const OT::cmap>(plan, source, &cmap_prime)) {
DEBUG_MSG(SUBSET, nullptr, "subset cmap success!");
} else {
DEBUG_MSG(SUBSET, nullptr, "subset cmap FAILED!");
}
hb_subset_plan_destroy (plan); hb_subset_plan_destroy (plan);