diff options
| author | Tomasz Boczkowski <tomek@tomekLaptop.domain> | 2014-05-16 12:54:52 +0000 |
|---|---|---|
| committer | Tomasz Boczkowski <tomek@tomekLaptop.domain> | 2014-05-16 12:54:52 +0000 |
| commit | 165aa67187ef6e5b61515d08891ab9f42333f2c8 (patch) | |
| tree | 8e61ac3e8f4b9225c2343036aec82c1811ef4fd2 /src/sp-pattern.cpp | |
| parent | fix C++11 compilation (diff) | |
| download | inkscape-165aa67187ef6e5b61515d08891ab9f42333f2c8.tar.gz inkscape-165aa67187ef6e5b61515d08891ab9f42333f2c8.zip | |
Fix crash in preview widget for files containing objectBoundingBox related patterns
(bzr r13341.1.31)
Diffstat (limited to 'src/sp-pattern.cpp')
| -rw-r--r-- | src/sp-pattern.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp index e465565c4..9e9ce85f3 100644 --- a/src/sp-pattern.cpp +++ b/src/sp-pattern.cpp @@ -593,7 +593,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b double tile_y = pattern_y(this); double tile_width = pattern_width(this); double tile_height = pattern_height(this); - if (pattern_patternUnits(this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) { + if (pattern_patternUnits(this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX && bbox) { tile_x *= bbox->width(); tile_y *= bbox->height(); tile_width *= bbox->width(); @@ -614,7 +614,7 @@ cairo_pattern_t* SPPattern::pattern_new(cairo_t *base_ct, Geom::OptRect const &b } else { // Content to bbox - if (pattern_patternContentUnits (this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) { + if (pattern_patternContentUnits (this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX && bbox) { content2ps = Geom::Affine(bbox->width(), 0.0, 0.0, bbox->height(), 0,0); } } |