diff options
author | Robin Watts <robin.watts@artifex.com> | 2012-01-26 16:22:29 +0000 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2012-01-26 19:24:12 +0000 |
commit | 4a61e49b6eda6c9f74c8010548f529385a5ade5e (patch) | |
tree | 9d9fd82495c8d3b1a00ff3ef0dcd01f0f7147b21 /xps/xps_gradient.c | |
parent | 50dbc1a356577f3df15a876f6adb716dea29bdc5 (diff) | |
download | mupdf-4a61e49b6eda6c9f74c8010548f529385a5ade5e.tar.xz |
Pull in XPS commits from GhostXPS to MuXPS
This brings MuXPS up to date with GhostXPS as of today.
The commits pulled in are:
856ecdc Whitespace fixes for parsing dashed line attributes
91dc749 Whitespace fixes while parsing points.
This commit is tweaked from the original, and the
changes will be pushed back into GhostXPS shortly.
a298a05 Tiff premultiplied/non-premultiped alpha differences.
No changes required for this, as we hold images
premultiplied already (and already cope with
premultiplying where required). Some changes to
comments and cleanup code to avoid leaks though.
Diffstat (limited to 'xps/xps_gradient.c')
-rw-r--r-- | xps/xps_gradient.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xps/xps_gradient.c b/xps/xps_gradient.c index 7533c4d3..f0ad0104 100644 --- a/xps/xps_gradient.c +++ b/xps/xps_gradient.c @@ -318,9 +318,9 @@ xps_draw_radial_gradient(xps_document *doc, fz_matrix ctm, yrad = 1.0; if (origin_att) - sscanf(origin_att, "%g,%g", &x0, &y0); + xps_get_point(origin_att, &x0, &y0); if (center_att) - sscanf(center_att, "%g,%g", &x1, &y1); + xps_get_point(center_att, &x1, &y1); if (radius_x_att) xrad = fz_atof(radius_x_att); if (radius_y_att) @@ -362,9 +362,9 @@ xps_draw_linear_gradient(xps_document *doc, fz_matrix ctm, x1 = y1 = 1; if (start_point_att) - sscanf(start_point_att, "%g,%g", &x0, &y0); + xps_get_point(start_point_att, &x0, &y0); if (end_point_att) - sscanf(end_point_att, "%g,%g", &x1, &y1); + xps_get_point(end_point_att, &x1, &y1); xps_draw_one_linear_gradient(doc, ctm, stops, count, 1, x0, y0, x1, y1); } |