summaryrefslogtreecommitdiffstats
path: root/src/unclump.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-11-08 22:51:43 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-11-08 22:51:43 +0000
commit16617cc3f8e4692b2f76e99347a82eb7572bdefa (patch)
tree9c97fa99dc5eb5a0255ea03721f413d55d4bfcf4 /src/unclump.cpp
parentworking on roughen (diff)
parentmerge of branch lp:~inkscape.dev/inkscape/spraytool-no-overlap (diff)
downloadinkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.tar.gz
inkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.zip
update to trunk
(bzr r14422.3.3)
Diffstat (limited to 'src/unclump.cpp')
-rw-r--r--src/unclump.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/unclump.cpp b/src/unclump.cpp
index 81c958937..2c6840425 100644
--- a/src/unclump.cpp
+++ b/src/unclump.cpp
@@ -172,7 +172,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++) {
+ for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();++i) {
SPItem *other = *i;
if (other == item)
@@ -196,7 +196,7 @@ static SPItem *unclump_closest (SPItem *item, std::list<SPItem*> &others)
double min = HUGE_VAL;
SPItem *closest = NULL;
- for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();i++) {
+ for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();++i) {
SPItem *other = *i;
if (other == item)
@@ -219,7 +219,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++) {
+ for (std::list<SPItem*>::const_iterator i = others.begin(); i != others.end();++i) {
SPItem *other = *i;
if (other == item)
@@ -259,7 +259,7 @@ unclump_remove_behind (SPItem *item, SPItem *closest, std::list<SPItem*> &rest)
double val_item = A * it[Geom::X] + B * it[Geom::Y] + C;
std::vector<SPItem*> out;
- for (std::list<SPItem*>::const_reverse_iterator i = rest.rbegin(); i != rest.rend();i++) {
+ for (std::list<SPItem*>::const_reverse_iterator i = rest.rbegin(); i != rest.rend();++i) {
SPItem *other = *i;
if (other == item)
@@ -336,7 +336,7 @@ unclump (std::vector<SPItem*> &items)
c_cache.clear();
wh_cache.clear();
- for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end();i++) { // for each original/clone x:
+ for (std::vector<SPItem*>::const_iterator i = items.begin(); i != items.end();++i) { // for each original/clone x:
SPItem *item = *i;
std::list<SPItem*> nei;