diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-10 04:56:26 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-10 04:56:26 +0000 |
| commit | 52cfa8cc5f3dedcba9e00b3cb7b800f3d5473136 (patch) | |
| tree | 51cf4ffaddd82e734ee5766c22b51a664749cce7 /src/libvpsc | |
| parent | Update to Vinipsmaker changes (diff) | |
| parent | Remove unused includes to tidy up the code. (diff) | |
| download | inkscape-52cfa8cc5f3dedcba9e00b3cb7b800f3d5473136.tar.gz inkscape-52cfa8cc5f3dedcba9e00b3cb7b800f3d5473136.zip | |
update to trunk
(bzr r11950.1.289)
Diffstat (limited to 'src/libvpsc')
| -rw-r--r-- | src/libvpsc/generate-constraints.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libvpsc/generate-constraints.cpp b/src/libvpsc/generate-constraints.cpp index fabe5217f..288e7ed53 100644 --- a/src/libvpsc/generate-constraints.cpp +++ b/src/libvpsc/generate-constraints.cpp @@ -209,7 +209,6 @@ int generateXConstraints(const int n, Rectangle** rs, Variable** vars, Constrain } } else { // Close event - int r; if(useNeighbourLists) { for(NodeSet::iterator i=v->leftNeighbours->begin(); i!=v->leftNeighbours->end();i++ @@ -217,7 +216,7 @@ int generateXConstraints(const int n, Rectangle** rs, Variable** vars, Constrain Node *u=*i; double sep = (v->r->width()+u->r->width())/2.0; constraints.push_back(new Constraint(u->v,v->v,sep)); - r=u->rightNeighbours->erase(v); + u->rightNeighbours->erase(v); } for(NodeSet::iterator i=v->rightNeighbours->begin(); @@ -226,22 +225,22 @@ int generateXConstraints(const int n, Rectangle** rs, Variable** vars, Constrain Node *u=*i; double sep = (v->r->width()+u->r->width())/2.0; constraints.push_back(new Constraint(v->v,u->v,sep)); - r=u->leftNeighbours->erase(v); + u->leftNeighbours->erase(v); } } else { Node *l=v->firstAbove, *r=v->firstBelow; if(l!=NULL) { double sep = (v->r->width()+l->r->width())/2.0; constraints.push_back(new Constraint(l->v,v->v,sep)); - l->firstBelow=v->firstBelow; + l->firstBelow = v->firstBelow; } if(r!=NULL) { double sep = (v->r->width()+r->r->width())/2.0; constraints.push_back(new Constraint(v->v,r->v,sep)); - r->firstAbove=v->firstAbove; + r->firstAbove = v->firstAbove; } } - r=scanline.erase(v); + scanline.erase(v); delete v; } delete e; |