diff options
| author | Guiu Rocafort <neandertalspeople@gmail.com> | 2014-03-05 17:55:31 +0000 |
|---|---|---|
| committer | Guiu Rocafort <neandertalspeople@gmail.com> | 2014-03-05 17:55:31 +0000 |
| commit | 2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc (patch) | |
| tree | 8998af65af0544ce2a92d71b82027607483a0ea3 /src/sp-pattern.cpp | |
| parent | translations from spanish to english done, it might need a little review, but... (diff) | |
| parent | Change tooltip to one more explicit to make cusp nodes (diff) | |
| download | inkscape-2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc.tar.gz inkscape-2f732d93349881b4c8d4a0f9ee93ef5c9dd422dc.zip | |
completed merging
(bzr r11950.5.2)
Diffstat (limited to 'src/sp-pattern.cpp')
| -rw-r--r-- | src/sp-pattern.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index 425ca9efa..8e67141fb 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -595,8 +595,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b // the pattern onto a surface with that size and at that resolution. // Pattern server to user - Geom::Affine ps2user; - ps2user = pattern_patternTransform(this); + Geom::Affine ps2user = pattern_patternTransform(this); if (!this->viewBox_set && pattern_patternContentUnits (this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) { /* BBox to user coordinate system */ Geom::Affine bbox2user (bbox->width(), 0.0, 0.0, bbox->height(), bbox->left(), bbox->top()); @@ -631,7 +630,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b // to find the optimum tile size for rendering // c is number of pixels in buffer x and y. // Scale factor of 1.1 is too small... see bug #1251039 - Geom::Point c(pattern_tile.dimensions()*vb2ps.descrim()*ps2user.descrim()*full.descrim()*2.0); + Geom::Point c(pattern_tile.dimensions()*vb2ps.descrim()*full.descrim()*2.0); c[Geom::X] = ceil(c[Geom::X]); c[Geom::Y] = ceil(c[Geom::Y]); @@ -651,7 +650,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b // TODO: make sure there are no leaks. Inkscape::UpdateContext ctx; // UpdateContext is structure with only ctm! - ctx.ctm = vb2ps * pattern_surface.drawingTransform(); + ctx.ctm = ps2user * pattern_surface.drawingTransform(); // vb2ps? dc.transform( pattern_surface.drawingTransform().inverse() ); drawing.update(Geom::IntRect::infinite(), ctx); @@ -679,7 +678,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b cairo_pattern_t *cp = cairo_pattern_create_for_surface(pattern_surface.raw()); // Apply transformation to user space. Also compensate for oversampling. - ink_cairo_pattern_set_matrix(cp, ps2user.inverse() * pattern_surface.drawingTransform()); + ink_cairo_pattern_set_matrix(cp, pattern_surface.drawingTransform() ); cairo_pattern_set_extend(cp, CAIRO_EXTEND_REPEAT); |