diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-08-05 17:30:53 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-08-05 17:30:53 +0200 |
| commit | 210d6ad784d55362d24a22cd7e07725a794d46cd (patch) | |
| tree | d4a0359da4cc1dad27266994954b608a1ab1ff51 /libskrift_merge_glyphs.c | |
| parent | demo: refuse to write image to terminal (diff) | |
| download | libskrift-210d6ad784d55362d24a22cd7e07725a794d46cd.tar.gz libskrift-210d6ad784d55362d24a22cd7e07725a794d46cd.tar.bz2 libskrift-210d6ad784d55362d24a22cd7e07725a794d46cd.tar.xz | |
minor fixes and cleanups, and update to use new version of libgrapheme and add text length parameter instead of using NUL-termination
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| -rw-r--r-- | libskrift_merge_glyphs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libskrift_merge_glyphs.c b/libskrift_merge_glyphs.c index 4df6f7a..820d0d4 100644 --- a/libskrift_merge_glyphs.c +++ b/libskrift_merge_glyphs.c @@ -20,7 +20,7 @@ libskrift_merge_glyphs(LIBSKRIFT_CONTEXT *ctx, const struct libskrift_glyph *gly glyph2 = t; } if (!(glyph2->width | glyph2->height)) { - size = offsetof(struct libskrift_glyph, image) + glyph1->size; + size = FLEXSTRUCTSIZE(struct libskrift_glyph, image, glyph1->size); *glyphp = calloc(1, size); if (!*glyphp) return -1; @@ -47,7 +47,7 @@ libskrift_merge_glyphs(LIBSKRIFT_CONTEXT *ctx, const struct libskrift_glyph *gly size *= width = (uint16_t)(x2 - x1); size *= height = (uint16_t)(y2 - y1); - *glyphp = calloc(1, offsetof(struct libskrift_glyph, image) + size); + *glyphp = calloc(1, FLEXSTRUCTSIZE(struct libskrift_glyph, image, size)); if (!*glyphp) return -1; |