diff options
| author | Diederik van Lierop <mail@diedenrezi.nl> | 2008-05-31 17:33:48 +0000 |
|---|---|---|
| committer | dvlierop2 <dvlierop2@users.sourceforge.net> | 2008-05-31 17:33:48 +0000 |
| commit | 54c0e0c0b9128272799fe45c9cef9bbb31437b02 (patch) | |
| tree | c9ac8df416e3057aef0dd76942ed6921e87414c4 /src/sp-item.cpp | |
| parent | * started implementing rendering of SVGFonts horizontal kerning (diff) | |
| download | inkscape-54c0e0c0b9128272799fe45c9cef9bbb31437b02.tar.gz inkscape-54c0e0c0b9128272799fe45c9cef9bbb31437b02.zip | |
Fix an error and remove some useless code (thanks to Peter Moulder for pointing me at this)
(bzr r5774)
Diffstat (limited to 'src/sp-item.cpp')
| -rw-r--r-- | src/sp-item.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/sp-item.cpp b/src/sp-item.cpp index be6be4f63..566ff8cb8 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -804,16 +804,12 @@ sp_item_invoke_bbox_full(SPItem const *item, NR::Maybe<NR::Rect> *bbox, NR::Matr } if (temp_bbox.x0 > temp_bbox.x1 || temp_bbox.y0 > temp_bbox.y1) { - // We'll assume here that when x0 > x1 or y0 > y1, the bbox is "nothing" - // However it has never been explicitely defined this way for NRRects - // (as opposed to NR::Maybe<NR::Rect>) - *bbox = NR::Nothing(); - return; - } - - if (temp_bbox.x0 == temp_bbox.y0 == NR_HUGE && temp_bbox.x1 == temp_bbox.y1 == -NR_HUGE) { - // The bbox hasn't been touched by the SPItemClass' bbox method + // Either the bbox hasn't been touched by the SPItemClass' bbox method + // (it still has its initial values, see above: x0 = y0 = NR_HUGE and x1 = y1 = -NR_HUGE) // or it has explicitely been set to be like this (e.g. in sp_shape_bbox) + + // When x0 > x1 or y0 > y1, the bbox is considered to be "nothing", although it has not been + // explicitely defined this way for NRRects (as opposed to NR::Maybe<NR::Rect>) *bbox = NR::Nothing(); return; } |
