diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-08-17 17:44:35 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-08-17 17:44:35 +0200 |
| commit | 6b8fc61b772b394d7a205531b492101c519dc47d (patch) | |
| tree | 85d441e2de4d57e9432a5d0173aa48c214ebb39c /libskrift_open_font_fd.c | |
| parent | m (diff) | |
| download | libskrift-6b8fc61b772b394d7a205531b492101c519dc47d.tar.gz libskrift-6b8fc61b772b394d7a205531b492101c519dc47d.tar.bz2 libskrift-6b8fc61b772b394d7a205531b492101c519dc47d.tar.xz | |
Add support for gzip compression and prepare for PSF support
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| -rw-r--r-- | libskrift_open_font_fd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libskrift_open_font_fd.c b/libskrift_open_font_fd.c index e134cd8..0e8b83d 100644 --- a/libskrift_open_font_fd.c +++ b/libskrift_open_font_fd.c @@ -46,7 +46,8 @@ libskrift_open_font_fd(LIBSKRIFT_FONT **fontp, int fd) mmapped = 1; } - if (libskrift_open_font_mem(fontp, mem, size)) { + if ((mmapped ? libskrift_open_font_adopt_mmap + : libskrift_open_font_adopt_mem)(fontp, mem, size)) { if (mmapped) munmap(mem, size); else @@ -54,9 +55,5 @@ libskrift_open_font_fd(LIBSKRIFT_FONT **fontp, int fd) return -1; } - (*fontp)->memory_free = mmapped ? NULL : mem; - (*fontp)->memory_unmap = mmapped ? mem : NULL; - (*fontp)->memory_size = size; - return 0; } |