diff options
| author | Ray Johnston <ray.johnston@artifex.com> | 2013-06-14 09:59:55 -0700 |
|---|---|---|
| committer | Ray Johnston <ray.johnston@artifex.com> | 2013-06-14 10:31:58 -0700 |
| commit | 65744368052b127b596014d55a6ea776808a6640 (patch) | |
| tree | cd36869594943f3087598bc4622347c0d522a935 | |
| parent | cb2e0f784882696e930e5077ecb1a2feef76fadf (diff) | |
| download | ghostpdl-65744368052b127b596014d55a6ea776808a6640.tar.gz | |
Fix gs_pdf14_device_color_mon_set and remove compiler warnings.
The previous function only set the value to false, and this should
set the value to the bool 'monitoring' that is the second arg.
| -rw-r--r-- | gs/base/gdevp14.c | 3 | ||||
| -rw-r--r-- | gs/base/gsicc_monitorcm.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gs/base/gdevp14.c b/gs/base/gdevp14.c index dd1c9e32a..4b8f21196 100644 --- a/gs/base/gdevp14.c +++ b/gs/base/gdevp14.c @@ -5108,7 +5108,8 @@ gs_pdf14_device_color_mon_set(gx_device *pdev, bool monitoring) cmm_dev_profile_t *dev_profile; int code = dev_proc(targ, get_profile)((gx_device*) targ, &dev_profile); - dev_profile->pageneutralcolor = false; + if (code == 0) + dev_profile->pageneutralcolor = monitoring; return code; } diff --git a/gs/base/gsicc_monitorcm.c b/gs/base/gsicc_monitorcm.c index 0cc1252d3..6ef2096c6 100644 --- a/gs/base/gsicc_monitorcm.c +++ b/gs/base/gsicc_monitorcm.c @@ -402,7 +402,7 @@ gsicc_mcm_end_monitor(gsicc_link_cache_t *cache, gx_device *dev) profile in the target device also. This is a special case since the pdf14 device has its own profile different from the target device */ if (dev_proc(dev, dev_spec_op)(dev, gxdso_is_pdf14_device, NULL, 0)) { - code = gs_pdf14_device_color_mon_set(dev, false); + gs_pdf14_device_color_mon_set(dev, false); } curr = cache->head; @@ -444,7 +444,7 @@ gsicc_mcm_begin_monitor(gsicc_link_cache_t *cache, gx_device *dev) profile in the target device also. This is a special case since the pdf14 device has its own profile different from the target device */ if (dev_proc(dev, dev_spec_op)(dev, gxdso_is_pdf14_device, NULL, 0)) { - code = gs_pdf14_device_color_mon_set(dev, true); + gs_pdf14_device_color_mon_set(dev, true); } curr = cache->head; |