diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-06-12 20:20:51 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-06-12 20:20:51 +0000 |
| commit | 21f04a292dafc2cfd1374609720c458124c5b9a4 (patch) | |
| tree | 1a38adb5df88eb36bafb6d055b55faf6b0d69cba /src/dialogs/unclump.cpp | |
| parent | update 2geom (diff) | |
| download | inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.tar.gz inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.zip | |
change NR::Matrix to Geom:: for many sp_item_xxx_affine functions
(bzr r5915)
Diffstat (limited to 'src/dialogs/unclump.cpp')
| -rw-r--r-- | src/dialogs/unclump.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dialogs/unclump.cpp b/src/dialogs/unclump.cpp index eb5870d2e..73131384f 100644 --- a/src/dialogs/unclump.cpp +++ b/src/dialogs/unclump.cpp @@ -35,7 +35,7 @@ unclump_center (SPItem *item) return i->second; } - NR::Maybe<NR::Rect> r = item->getBounds(sp_item_i2d_affine(item)); + NR::Maybe<NR::Rect> r = item->getBounds(from_2geom(sp_item_i2d_affine(item))); if (r) { NR::Point const c = r->midpoint(); c_cache[SP_OBJECT_ID(item)] = c; @@ -54,7 +54,7 @@ unclump_wh (SPItem *item) if ( i != wh_cache.end() ) { wh = i->second; } else { - NR::Maybe<NR::Rect> r = item->getBounds(sp_item_i2d_affine(item)); + NR::Maybe<NR::Rect> r = item->getBounds(from_2geom(sp_item_i2d_affine(item))); if (r) { wh = r->dimensions(); wh_cache[SP_OBJECT_ID(item)] = wh; @@ -298,7 +298,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", SP_OBJECT_ID(what), it[NR::X],it[NR::Y], p[NR::X],p[NR::Y], by[NR::X],by[NR::Y], dist); - sp_item_set_i2d_affine(what, sp_item_i2d_affine(what) * move); + sp_item_set_i2d_affine(what, sp_item_i2d_affine(what) * to_2geom(move)); sp_item_write_transform(what, SP_OBJECT_REPR(what), what->transform, NULL); } @@ -321,7 +321,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", SP_OBJECT_ID(what), it[NR::X],it[NR::Y], p[NR::X],p[NR::Y], by[NR::X],by[NR::Y], dist); - sp_item_set_i2d_affine(what, sp_item_i2d_affine(what) * move); + sp_item_set_i2d_affine(what, sp_item_i2d_affine(what) * to_2geom(move)); sp_item_write_transform(what, SP_OBJECT_REPR(what), what->transform, NULL); } |