summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Johnston <ray.johnston@artifex.com>2013-06-03 13:10:10 -0700
committerRay Johnston <ray.johnston@artifex.com>2013-06-03 17:12:02 -0700
commite0ba4228f11f9a5af359915878176efee8dc73f5 (patch)
tree824a5bc7f91e1ef6527d293b9e613885846b1bd7
parent761e413514c7f9374f54e8ffef3c1d7ebf824e28 (diff)
downloadghostpdl-e0ba4228f11f9a5af359915878176efee8dc73f5.tar.gz
Fix clipping bugs 693509 and 690036.
The Adobe scan conversion rules call for the clip path to use the same rule as for filling. Thus we need to apply the 'adjust' to do the any part of pixel rule. Differences are expected, but bmpcmp doesn't show any.
-rw-r--r--gs/base/gxcpath.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/gs/base/gxcpath.c b/gs/base/gxcpath.c
index 425668e54..053bd74c7 100644
--- a/gs/base/gxcpath.c
+++ b/gs/base/gxcpath.c
@@ -624,11 +624,8 @@ gx_cpath_intersect_with_params(gx_clip_path *pcpath, /*const*/ gx_path *ppath_or
new_box.q = new_box.p;
changed = 1;
} else {
- if (params != NULL) {
- /* Called from gx_default_fill_path for converting
- a filling path into a clipping path.
- Apply same adjustment as for filling the path. */
- gs_fixed_point adjust = params->adjust;
+ { /* Apply same adjustment as for filling the path. */
+ gs_fixed_point adjust = params != NULL ? params->adjust : pis->fill_adjust;
fixed adjust_xl, adjust_xu, adjust_yl, adjust_yu;
if (adjust.x == -1)