diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-11-11 14:37:03 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2013-11-11 16:12:45 +0100 |
| commit | a2c945506ea2a2b58edbde84124094c6b4f69eac (patch) | |
| tree | 3bcb66ff73e4323621f21a622a8049b71ee9a58f /source/pdf | |
| parent | cdc3d601bfe1f16ea96f35526644eaf53415be80 (diff) | |
| download | mupdf-a2c945506ea2a2b58edbde84124094c6b4f69eac.tar.xz | |
Add fz_new_font_from_buffer function.
Use fz_buffer to wrap and reference count data used in font.
Diffstat (limited to 'source/pdf')
| -rw-r--r-- | source/pdf/pdf-device.c | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-font.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c index f825872b..9877782f 100644 --- a/source/pdf/pdf-device.c +++ b/source/pdf/pdf-device.c @@ -549,7 +549,7 @@ pdf_dev_font(pdf_device *pdev, fz_font *font, float size) if (gs->font >= 0 && pdev->fonts[gs->font].font == font) return; - if (font->ft_data != NULL || font->ft_substitute) + if (font->ft_buffer != NULL || font->ft_substitute) fz_throw(pdev->ctx, FZ_ERROR_GENERIC, "pdf device supports only base 14 fonts currently"); /* Have we sent such a font before? */ diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c index e0664b13..78ee7f18 100644 --- a/source/pdf/pdf-font.c +++ b/source/pdf/pdf-font.c @@ -292,7 +292,7 @@ pdf_load_embedded_font(pdf_document *doc, pdf_font_desc *fontdesc, char *fontnam fz_try(ctx) { - fontdesc->font = fz_new_font_from_memory(ctx, fontname, buf->data, buf->len, 0, 1); + fontdesc->font = fz_new_font_from_buffer(ctx, fontname, buf, 0, 1); } fz_catch(ctx) { @@ -301,11 +301,6 @@ pdf_load_embedded_font(pdf_document *doc, pdf_font_desc *fontdesc, char *fontnam } fontdesc->size += buf->len; - /* save the buffer so we can free it later */ - fontdesc->font->ft_data = buf->data; - fontdesc->font->ft_size = buf->len; - fz_free(ctx, buf); /* only free the fz_buffer struct, not the contained data */ - fontdesc->is_embedded = 1; } |