diff options
| author | Niko Kiirala <niko@kiirala.com> | 2006-07-09 15:36:22 +0000 |
|---|---|---|
| committer | kiirala <kiirala@users.sourceforge.net> | 2006-07-09 15:36:22 +0000 |
| commit | 381d049ddec1040e22df9da4da9171d50243da9c (patch) | |
| tree | 5432a18b3e887d052cfb8c9a86d7928317997b9c /src | |
| parent | patch 1491236 minor win32 build adjustment (diff) | |
| download | inkscape-381d049ddec1040e22df9da4da9171d50243da9c.tar.gz inkscape-381d049ddec1040e22df9da4da9171d50243da9c.zip | |
Compiler error in NR::Filter fixed
(bzr r1383)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-filter.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp index a3c361fb1..1d87b6ec3 100644 --- a/src/display/nr-filter.cpp +++ b/src/display/nr-filter.cpp @@ -116,27 +116,27 @@ void Filter::bbox_enlarge(NRRectL &bbox) _region_y.update(12, 6, len_y); _region_width.update(12, 6, len_x); _region_height.update(12, 6, len_y); - if (_filter_units == SP_FILTER_UNITS_BOUNDINGBOX) { - if (_region_x.unit == PERCENT) { - bbox.x0 += _region_x.computed; + if (_filter_units == SP_FILTER_UNITS_OBJECTBOUNDINGBOX) { + if (_region_x.unit == SVGLength::PERCENT) { + bbox.x0 += (ICoord)_region_x.computed; } else { - bbox.x0 += _region_x.computed * len_x; + bbox.x0 += (ICoord)(_region_x.computed * len_x); } - if (_region_width.unit == PERCENT) { - bbox.x1 = bbox.x0 + _region_width.computed; + if (_region_width.unit == SVGLength::PERCENT) { + bbox.x1 = bbox.x0 + (ICoord)_region_width.computed; } else { - bbox.x1 = bbox.x0 + _region_width.computed * len_x; + bbox.x1 = bbox.x0 + (ICoord)(_region_width.computed * len_x); } - if (_region_y.unit == PERCENT) { - bbox.y0 += _region_y.computed; + if (_region_y.unit == SVGLength::PERCENT) { + bbox.y0 += (ICoord)_region_y.computed; } else { - bbox.y0 += _region_y.computed * len_y; + bbox.y0 += (ICoord)(_region_y.computed * len_y); } - if (_region_height.unit == PERCENT) { - bbox.y1 = bbox.y0 + _region_height.computed; + if (_region_height.unit == SVGLength::PERCENT) { + bbox.y1 = bbox.y0 + (ICoord)_region_height.computed; } else { - bbox.y1 = bbox.y0 + _region_height.computed * len_y; + bbox.y1 = bbox.y0 + (ICoord)(_region_height.computed * len_y); } } else if (_filter_units == SP_FILTER_UNITS_USERSPACEONUSE) { /* TODO: make sure bbox and fe region are in same coordinate system */ |