diff options
author | Robin Watts <Robin.Watts@artifex.com> | 2021-06-14 12:54:00 +0100 |
---|---|---|
committer | Robin Watts <Robin.Watts@artifex.com> | 2021-06-15 15:59:25 +0100 |
commit | b08ddcae269aa0804909fc80fc671519e7d8ff75 (patch) | |
tree | 4ec08c9dba51d2ef225e6a34fe2897c733db5331 /base/gdevsclass.c | |
parent | 7e0bd07c6a9b7435a3fa89ea4fdd767b8836f0d6 (diff) | |
download | ghostpdl-b08ddcae269aa0804909fc80fc671519e7d8ff75.tar.gz |
Rejig text_begin dev_proc.
In this commit we remove several parameters to the text_begin
device procedure, because they are implied.
Firstly, we remove pdcolor, and just use the device color from
the current color in the graphics state (pgs->color[0]). This is
actually what the code did anyway (in that it was assumed that
pdcolor, if it was non-NULL was a pointer to this).
Similarly, we remove the path param, as (if used) this is always
the same as pgs->path.
Finally, we remove the memory param as this is (almost always)
the same as pgs->memory (and in cases where it isn't, tests indicate
that it could be).
This has knock on effects for the text enumerator structure.
Diffstat (limited to 'base/gdevsclass.c')
-rw-r--r-- | base/gdevsclass.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/gdevsclass.c b/base/gdevsclass.c index e4fa367a5..2d50a0b33 100644 --- a/base/gdevsclass.c +++ b/base/gdevsclass.c @@ -477,13 +477,13 @@ int default_subclass_get_hardware_params(gx_device *dev, gs_param_list *plist) } int default_subclass_text_begin(gx_device *dev, gs_gstate *pgs, const gs_text_params_t *text, - gs_font *font, gx_path *path, const gx_device_color *pdcolor, const gx_clip_path *pcpath, - gs_memory_t *memory, gs_text_enum_t **ppte) + gs_font *font, const gx_clip_path *pcpath, + gs_text_enum_t **ppte) { if (dev->child) - return dev_proc(dev->child, text_begin)(dev->child, pgs, text, font, path, pdcolor, pcpath, memory, ppte); + return dev_proc(dev->child, text_begin)(dev->child, pgs, text, font, pcpath, ppte); /* else */ - return gx_default_text_begin(dev, pgs, text, font, path, pdcolor, pcpath, memory, ppte); + return gx_default_text_begin(dev, pgs, text, font, pcpath, ppte); } int default_subclass_begin_transparency_group(gx_device *dev, const gs_transparency_group_params_t *ptgp, |