summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2018-10-15 22:48:48 -0700
committerBehdad Esfahbod <behdad@behdad.org>2018-10-15 22:48:48 -0700
commit68f8b18003f211e1ed681d0c8fc29102875aaf2e (patch)
tree3f9656cc847bb8a25d6b510edcddf4e6c0617b8d
parent4205809df3e3206b59c57309aa03e0359fa43372 (diff)
[name] Implement hb_ot_name_get_names()
-rw-r--r--src/Makefile.sources1
-rw-r--r--src/hb-ot-name-table.hh3
-rw-r--r--src/hb-ot-name.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 59cde6bd..5abdb705 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -34,6 +34,7 @@ HB_BASE_sources = \
hb-ot-kern-table.hh \
hb-ot-maxp-table.hh \
hb-ot-name-table.hh \
+ hb-ot-name.cc \
hb-ot-os2-table.hh \
hb-ot-os2-unicode-ranges.hh \
hb-ot-post-macroman.hh \
diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh
index a6a1e5f3..5625ab2c 100644
--- a/src/hb-ot-name-table.hh
+++ b/src/hb-ot-name-table.hh
@@ -217,9 +217,8 @@ struct name
private:
hb_blob_t *blob;
+ public:
hb_vector_t<hb_ot_name_entry_t> names;
-
- unsigned int names_count;
};
/* We only implement format 0 for now. */
diff --git a/src/hb-ot-name.h b/src/hb-ot-name.h
index 3b5152e7..ddd2c254 100644
--- a/src/hb-ot-name.h
+++ b/src/hb-ot-name.h
@@ -82,8 +82,8 @@ typedef struct hb_ot_name_entry_t
} hb_ot_name_entry_t;
HB_EXTERN unsigned int
-hb_ot_name_get_names (hb_face_t *face,
- hb_ot_name_entry_t **entries /* OUT */);
+hb_ot_name_get_names (hb_face_t *face,
+ const hb_ot_name_entry_t **entries /* OUT */);
HB_END_DECLS