diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-05-16 17:31:40 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-05-16 17:31:40 +0000 |
| commit | a8ed8893594a2e0f609beba7dc9bee86df408b01 (patch) | |
| tree | 2a14fe79fd0075fd1dc1b809d9005cbf99f190da /src/sp-pattern.cpp | |
| parent | Fix crash in preview widget for files containing objectBoundingBox related pa... (diff) | |
| download | inkscape-a8ed8893594a2e0f609beba7dc9bee86df408b01.tar.gz inkscape-a8ed8893594a2e0f609beba7dc9bee86df408b01.zip | |
don't rely on operator precedence (rev. 13372)
(bzr r13341.1.32)
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 9e9ce85f3..cc82c637e 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 && bbox) { + if ( bbox && (pattern_patternUnits(this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) ) { 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 && bbox) { + if (bbox && (pattern_patternContentUnits(this) == SP_PATTERN_UNITS_OBJECTBOUNDINGBOX) ) { content2ps = Geom::Affine(bbox->width(), 0.0, 0.0, bbox->height(), 0,0); } } |