diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-08-27 13:20:17 +0000 |
|---|---|---|
| committer | Krzysztof Kosinski <tweenk.pl@gmail.com> | 2011-08-27 13:20:17 +0000 |
| commit | 79012ca437ff3d7c25e4d164b1b9c3dccc2b4b7f (patch) | |
| tree | 9cc58ddb8d243fd9f78e7a57024bb929a2362404 /src/sp-gradient.cpp | |
| parent | Update 2Geom. Remove all use of NRRectL. (diff) | |
| download | inkscape-79012ca437ff3d7c25e4d164b1b9c3dccc2b4b7f.tar.gz inkscape-79012ca437ff3d7c25e4d164b1b9c3dccc2b4b7f.zip | |
Remove NRRect from paint servers and temporary calculations
(bzr r10582.1.4)
Diffstat (limited to 'src/sp-gradient.cpp')
| -rw-r--r-- | src/sp-gradient.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index 3aa14dc45..94ad0bb25 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -1155,7 +1155,7 @@ static void sp_lineargradient_build(SPObject *object, static void sp_lineargradient_set(SPObject *object, unsigned key, gchar const *value); static Inkscape::XML::Node *sp_lineargradient_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); -static cairo_pattern_t *sp_lineargradient_create_pattern(SPPaintServer *ps, cairo_t *ct, NRRect const *bbox, double opacity); +static cairo_pattern_t *sp_lineargradient_create_pattern(SPPaintServer *ps, cairo_t *ct, Geom::OptRect const &bbox, double opacity); static SPGradientClass *lg_parent_class; @@ -1318,7 +1318,7 @@ static void sp_radialgradient_build(SPObject *object, static void sp_radialgradient_set(SPObject *object, unsigned key, gchar const *value); static Inkscape::XML::Node *sp_radialgradient_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); -static cairo_pattern_t *sp_radialgradient_create_pattern(SPPaintServer *ps, cairo_t *ct, NRRect const *bbox, double opacity); +static cairo_pattern_t *sp_radialgradient_create_pattern(SPPaintServer *ps, cairo_t *ct, Geom::OptRect const &bbox, double opacity); static SPGradientClass *rg_parent_class; @@ -1494,7 +1494,7 @@ sp_radialgradient_set_position(SPRadialGradient *rg, static void sp_gradient_pattern_common_setup(cairo_pattern_t *cp, SPGradient *gr, - NRRect const *bbox, + Geom::OptRect const &bbox, double opacity) { // set spread type @@ -1523,7 +1523,7 @@ sp_gradient_pattern_common_setup(cairo_pattern_t *cp, // set pattern matrix Geom::Affine gs2user = gr->gradientTransform; if (gr->getUnits() == SP_GRADIENT_UNITS_OBJECTBOUNDINGBOX) { - Geom::Affine bbox2user(bbox->x1 - bbox->x0, 0, 0, bbox->y1 - bbox->y0, bbox->x0, bbox->y0); + Geom::Affine bbox2user(bbox->width(), 0, 0, bbox->height(), bbox->left(), bbox->top()); gs2user *= bbox2user; } ink_cairo_pattern_set_matrix(cp, gs2user.inverse()); @@ -1532,7 +1532,7 @@ sp_gradient_pattern_common_setup(cairo_pattern_t *cp, static cairo_pattern_t * sp_radialgradient_create_pattern(SPPaintServer *ps, cairo_t */* ct */, - NRRect const *bbox, + Geom::OptRect const &bbox, double opacity) { SPRadialGradient *rg = SP_RADIALGRADIENT(ps); @@ -1552,7 +1552,7 @@ sp_radialgradient_create_pattern(SPPaintServer *ps, static cairo_pattern_t * sp_lineargradient_create_pattern(SPPaintServer *ps, cairo_t */* ct */, - NRRect const *bbox, + Geom::OptRect const &bbox, double opacity) { SPLinearGradient *lg = SP_LINEARGRADIENT(ps); |