diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/sp-conn-end.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/sp-conn-end.cpp')
| -rw-r--r-- | src/sp-conn-end.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp index d11eca4c7..71b4f45a7 100644 --- a/src/sp-conn-end.cpp +++ b/src/sp-conn-end.cpp @@ -4,7 +4,6 @@ #include <limits> #include "display/curve.h" -#include "libnr/nr-matrix-fns.h" #include "xml/repr.h" #include "sp-conn-end.h" #include "sp-path.h" @@ -142,12 +141,11 @@ sp_conn_get_route_and_redraw(SPPath *const path, return; } - SPItem *h2attItem[2]; + SPItem *h2attItem[2] = {0}; path->connEndPair.getAttachedItems(h2attItem); - SPItem const *const path_item = SP_ITEM(path); - SPObject const *const ancestor = get_nearest_common_ancestor(path_item, h2attItem); - Geom::Affine const path2anc(i2anc_affine(path_item, ancestor)); + SPObject const *const ancestor = get_nearest_common_ancestor(path, h2attItem); + Geom::Affine const path2anc(i2anc_affine(path, ancestor)); // Set sensible values incase there the connector ends are not // attached to any shapes. |