diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-04-07 23:42:04 +0000 |
| commit | 945ce419c806c73d70203dec33ececafbe108a92 (patch) | |
| tree | cfcdb59bf47e9db7f9e01f7eebb59924bdeaea94 /src/unclump.cpp | |
| parent | Merge from trunk (again) (diff) | |
| parent | Extensions. SVG+media fix (see Bug #400356). (diff) | |
| download | inkscape-945ce419c806c73d70203dec33ececafbe108a92.tar.gz inkscape-945ce419c806c73d70203dec33ececafbe108a92.zip | |
Merge from trunk
(bzr r9508.1.73)
Diffstat (limited to 'src/unclump.cpp')
| -rw-r--r-- | src/unclump.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unclump.cpp b/src/unclump.cpp index 1039351a3..d027a6986 100644 --- a/src/unclump.cpp +++ b/src/unclump.cpp @@ -287,7 +287,7 @@ unclump_push (SPItem *from, SPItem *what, double dist) Geom::Point p = unclump_center (from); Geom::Point by = dist * Geom::unit_vector (- (p - it)); - Geom::Matrix move = Geom::Translate (by); + Geom::Affine move = Geom::Translate (by); std::map<const gchar *, Geom::Point>::iterator i = c_cache.find(what->getId()); if ( i != c_cache.end() ) { @@ -297,7 +297,7 @@ unclump_push (SPItem *from, SPItem *what, double dist) //g_print ("push %s at %g,%g from %g,%g by %g,%g, dist %g\n", what->getId(), it[Geom::X],it[Geom::Y], p[Geom::X],p[Geom::Y], by[Geom::X],by[Geom::Y], dist); what->set_i2d_affine(what->i2d_affine() * move); - what->doWriteTransform(SP_OBJECT_REPR(what), what->transform, NULL); + what->doWriteTransform(what->getRepr(), what->transform, NULL); } /** @@ -310,7 +310,7 @@ unclump_pull (SPItem *to, SPItem *what, double dist) Geom::Point p = unclump_center (to); Geom::Point by = dist * Geom::unit_vector (p - it); - Geom::Matrix move = Geom::Translate (by); + Geom::Affine move = Geom::Translate (by); std::map<const gchar *, Geom::Point>::iterator i = c_cache.find(what->getId()); if ( i != c_cache.end() ) { @@ -320,7 +320,7 @@ unclump_pull (SPItem *to, SPItem *what, double dist) //g_print ("pull %s at %g,%g to %g,%g by %g,%g, dist %g\n", what->getId(), it[Geom::X],it[Geom::Y], p[Geom::X],p[Geom::Y], by[Geom::X],by[Geom::Y], dist); what->set_i2d_affine(what->i2d_affine() * move); - what->doWriteTransform(SP_OBJECT_REPR(what), what->transform, NULL); + what->doWriteTransform(what->getRepr(), what->transform, NULL); } |