diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2007-05-10 21:39:04 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2007-05-10 21:39:04 +0000 |
| commit | bad6ee18a54363d19e3bfa5e147b7d3e4033c9c5 (patch) | |
| tree | 63122cdeb2ad8f71cf31ce961c1b152fccd227a4 /src/libnr/nr-path.cpp | |
| parent | add document to action events (when possible) (diff) | |
| download | inkscape-bad6ee18a54363d19e3bfa5e147b7d3e4033c9c5.tar.gz inkscape-bad6ee18a54363d19e3bfa5e147b7d3e4033c9c5.zip | |
fixed crash when parameter viewbox=null in nr_path_matrix_point_bbox_wind_distance
(bzr r2998)
Diffstat (limited to 'src/libnr/nr-path.cpp')
| -rw-r--r-- | src/libnr/nr-path.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnr/nr-path.cpp b/src/libnr/nr-path.cpp index bef6378f5..03882a7fd 100644 --- a/src/libnr/nr-path.cpp +++ b/src/libnr/nr-path.cpp @@ -273,7 +273,7 @@ nr_path_matrix_point_bbox_wind_distance (NRBPath *bpath, NR::Matrix const &m, NR //std::cout << "swept: " << swept; //std::cout << "view: " << *viewbox; //std::cout << "intersects? " << (swept.intersects(*viewbox)? "YES" : "NO") << "\n"; - if (swept.intersects(*viewbox)) + if (!viewbox || swept.intersects(*viewbox)) nr_line_wind_distance (x0, y0, x3, y3, pt, wind, dist); } } @@ -293,7 +293,7 @@ nr_path_matrix_point_bbox_wind_distance (NRBPath *bpath, NR::Matrix const &m, NR swept.expandTo(NR::Point(x1, y1)); swept.expandTo(NR::Point(x2, y2)); - if (swept.intersects(*viewbox)) { // we see this segment, so do full processing + if (!viewbox || swept.intersects(*viewbox)) { // we see this segment, so do full processing nr_curve_bbox_wind_distance ( x0, y0, x1, y1, |