From a85b58e0548fb4e45f35bcbb7d0ee6e35bde35b4 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Sun, 3 Apr 2011 17:49:32 +0200 Subject: xps: Fix bugs uncovered by QualityLogicMinBar tests. --- xps/xps_image.c | 2 +- xps/xps_path.c | 2 +- xps/xps_xml.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xps') diff --git a/xps/xps_image.c b/xps/xps_image.c index a5d54fea..f4b75a1b 100644 --- a/xps/xps_image.c +++ b/xps/xps_image.c @@ -47,7 +47,7 @@ xps_paint_image_brush(xps_context *ctx, fz_matrix ctm, fz_rect area, char *base_ fz_matrix im = fz_scale(xs, -ys); im.f = ys; ctm = fz_concat(im, ctm); - ctx->dev->fillimage(ctx->dev->user, pixmap, ctm, 1.0); + ctx->dev->fillimage(ctx->dev->user, pixmap, ctm, ctx->opacity[ctx->opacity_top]); } static xps_part * diff --git a/xps/xps_path.c b/xps/xps_path.c index 5674eac2..28b34894 100644 --- a/xps/xps_path.c +++ b/xps/xps_path.c @@ -758,7 +758,7 @@ xps_clip(xps_context *ctx, fz_matrix ctm, xps_resource *dict, char *clip_att, xm path = xps_parse_path_geometry(ctx, dict, clip_tag, 0, &fill_rule); else path = fz_newpath(); - ctx->dev->clippath(ctx->dev->user, path, fill_rule, ctm); + ctx->dev->clippath(ctx->dev->user, path, fill_rule == 0, ctm); fz_freepath(path); } diff --git a/xps/xps_xml.c b/xps/xps_xml.c index 6373b6c6..8448ecef 100644 --- a/xps/xps_xml.c +++ b/xps/xps_xml.c @@ -103,7 +103,7 @@ static int xml_parse_entity(int *c, char *a) else *c = strtol(a + 2, &b, 10); if (*b == ';') - return b - a; + return b - a + 1; } else if (a[1] == 'l' && a[2] == 't' && a[3] == ';') { *c = '<'; -- cgit v1.2.3