summaryrefslogtreecommitdiffstats
path: root/src/unclump.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <mc@localhost.localdomain>2015-02-27 02:10:36 +0000
committerMarc Jeanmougin <mc@localhost.localdomain>2015-02-27 02:10:36 +0000
commit9a7fa4d1899d30ec745107823f307b2a0bf3172f (patch)
tree216bd7b47a96425af53642e2c3869a70ebfa23e5 /src/unclump.cpp
parentshould replace buggy pot file (diff)
downloadinkscape-9a7fa4d1899d30ec745107823f307b2a0bf3172f.tar.gz
inkscape-9a7fa4d1899d30ec745107823f307b2a0bf3172f.zip
corrected the casts (hopefully)
(bzr r13922.1.10)
Diffstat (limited to '')
-rw-r--r--src/unclump.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/unclump.cpp b/src/unclump.cpp
index 29608befa..81c958937 100644
--- a/src/unclump.cpp
+++ b/src/unclump.cpp
@@ -173,7 +173,7 @@ static double unclump_average (SPItem *item, std::list<SPItem*> &others)
int n = 0;
double sum = 0;
for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();i++) {
- SPItem *other = SP_ITEM (*i);
+ SPItem *other = *i;
if (other == item)
continue;
@@ -197,7 +197,7 @@ static SPItem *unclump_closest (SPItem *item, std::list<SPItem*> &others)
SPItem *closest = NULL;
for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();i++) {
- SPItem *other = SP_ITEM (*i);
+ SPItem *other = *i;
if (other == item)
continue;
@@ -220,7 +220,7 @@ static SPItem *unclump_farest (SPItem *item, std::list<SPItem*> &others)
double max = -HUGE_VAL;
SPItem *farest = NULL;
for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();i++) {
- SPItem *other = SP_ITEM (*i);
+ SPItem *other = *i;
if (other == item)
continue;
@@ -260,7 +260,7 @@ unclump_remove_behind (SPItem *item, SPItem *closest, std::list<SPItem*> &rest)
std::vector<SPItem*> out;
for (std::list<SPItem*>::const_reverse_iterator i = rest.rbegin(); i != rest.rend();i++) {
- SPItem *other = SP_ITEM (*i);
+ SPItem *other = *i;
if (other == item)
continue;
@@ -337,7 +337,7 @@ unclump (std::vector<SPItem*> &items)
wh_cache.clear();
for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end();i++) { // for each original/clone x:
- SPItem *item = SP_ITEM (*i);
+ SPItem *item = *i;
std::list<SPItem*> nei;