diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-03-30 10:59:39 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-04-01 00:04:14 +0200 |
| commit | 5ff1d6955496b3cf9a35042c9ac35db43bc336b1 (patch) | |
| tree | 6d470f7eb448f59f53e8df1010aec9dad8ce1f72 /devices/vector/gdevpdtb.c | |
| parent | Import Ghostscript 9.53.1 (diff) | |
| download | ghostscript-gpl-patches-a9bf7384335025d0efdb801e44a8321754c3eae7.tar.gz ghostscript-gpl-patches-a9bf7384335025d0efdb801e44a8321754c3eae7.tar.bz2 ghostscript-gpl-patches-a9bf7384335025d0efdb801e44a8321754c3eae7.zip | |
Import Ghostscript 9.54ghostscript-9.54
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'devices/vector/gdevpdtb.c')
| -rw-r--r-- | devices/vector/gdevpdtb.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/devices/vector/gdevpdtb.c b/devices/vector/gdevpdtb.c index 61961c4a..c0a148c3 100644 --- a/devices/vector/gdevpdtb.c +++ b/devices/vector/gdevpdtb.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2020 Artifex Software, Inc. +/* Copyright (C) 2001-2021 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -29,6 +29,7 @@ #include "gdevpdfo.h" #include "gdevpdtb.h" #include "gdevpdtf.h" +#include "gdevpdtd.h" #include "smd5.h" #include "gxfcache.h" /* for gs_purge_font_from_char_caches_completely */ /* @@ -372,7 +373,7 @@ pdf_base_font_alloc(gx_device_pdf *pdev, pdf_base_font_t **ppbfont, *ppbfont = pbfont; return 0; fail: - gs_free_object(mem, pbfont, "pdf_base_font_alloc"); + pdf_base_font_free(pdev, pbfont); return code; } @@ -412,6 +413,11 @@ pdf_base_font_is_subset(const pdf_base_font_t *pbfont) void pdf_base_font_drop_complete(pdf_base_font_t *pbfont) { + /* gs_font is a subset of gs_font_base and we only want to + * free the members which are common to both, so this cast is + * (at the time of writing) safe. + */ + gs_free_copied_font((gs_font *)pbfont->complete); pbfont->complete = NULL; } @@ -654,11 +660,18 @@ pdf_write_embedded_font(gx_device_pdf *pdev, pdf_base_font_t *pbfont, font_type /* Write the type 1 font with no converting to CFF. */ int lengths[3]; - code = psf_write_type1_font(writer.binary.strm, + if (pbfont->do_subset != DO_SUBSET_NO) + code = psf_write_type1_font(writer.binary.strm, (gs_font_type1 *)out_font, WRITE_TYPE1_WITH_LENIV | WRITE_TYPE1_EEXEC | WRITE_TYPE1_EEXEC_PAD | WRITE_TYPE1_ASCIIHEX, NULL, 0, &fnstr, lengths); + else + code = psf_write_type1_font(writer.binary.strm, + (gs_font_type1 *)out_font, + WRITE_TYPE1_WITH_LENIV | WRITE_TYPE1_EEXEC | + WRITE_TYPE1_EEXEC_PAD | WRITE_TYPE1_ASCIIHEX | WRITE_TYPE1_XUID, + NULL, 0, &fnstr, lengths); if (lengths[0] > 0) { if (code < 0) goto finish; @@ -689,7 +702,8 @@ pdf_write_embedded_font(gx_device_pdf *pdev, pdf_base_font_t *pbfont, font_type code = psf_write_type2_font(writer.binary.strm, (gs_font_type1 *)out_font, TYPE2_OPTIONS | - (pdev->CompatibilityLevel < 1.3 ? WRITE_TYPE2_AR3 : 0), + (pdev->CompatibilityLevel < 1.3 ? WRITE_TYPE2_AR3 : 0) | + (pbfont->do_subset == DO_SUBSET_NO ? WRITE_TYPE2_XUID : 0), NULL, 0, &fnstr, FontBBox); } goto finish; |