summaryrefslogtreecommitdiff
path: root/src/cairo-scaled-font-subsets-private.h
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2022-04-18 13:38:50 +0930
committerAdrian Johnson <ajohnson@redneon.com>2022-04-19 19:58:44 +0930
commit3998a79cc23fdcc7b3c0539fbe43e39472d54621 (patch)
treefa88e1b8d2dcca87f811950d516d7b803ff2f646 /src/cairo-scaled-font-subsets-private.h
parent2b355954a894182fe92315d38b44015a1d6e2f0d (diff)
downloadcairo-3998a79cc23fdcc7b3c0539fbe43e39472d54621.tar.gz
DWrite: check 'head' table as well as 'name' when comparing fonts
There may be different versions of fonts with the same name. As an additional check, compare the 'head' table wich contains the checksum for the font. Also, load the DWrite tables directly to avoid the memcpy in load_truetype_table.
Diffstat (limited to 'src/cairo-scaled-font-subsets-private.h')
-rw-r--r--src/cairo-scaled-font-subsets-private.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/cairo-scaled-font-subsets-private.h b/src/cairo-scaled-font-subsets-private.h
index e7809f03a..5b531d298 100644
--- a/src/cairo-scaled-font-subsets-private.h
+++ b/src/cairo-scaled-font-subsets-private.h
@@ -41,6 +41,8 @@
#if CAIRO_HAS_FONT_SUBSET
+CAIRO_BEGIN_DECLS
+
typedef struct _cairo_scaled_font_subsets_glyph {
unsigned int font_id;
unsigned int subset_id;
@@ -735,6 +737,9 @@ cairo_private void
dump_scaled_font_subsets (cairo_scaled_font_subsets_t *font_subsets);
#endif
+CAIRO_END_DECLS
+
+
#endif /* CAIRO_HAS_FONT_SUBSET */
#endif /* CAIRO_SCALED_FONT_SUBSETS_PRIVATE_H */