diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-04-09 18:54:52 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-04-09 18:54:52 +0000 |
| commit | 42569eeea6a78406c723a0c2139a6adbb5f9c9cc (patch) | |
| tree | 480aff49241ce0c5b30837bf8bd6137e0a9f2789 /src/livarot/ShapeMisc.cpp | |
| parent | update to trunk (diff) | |
| parent | Cleaned up cmake files to build successfully on Linux. (diff) | |
| download | inkscape-42569eeea6a78406c723a0c2139a6adbb5f9c9cc.tar.gz inkscape-42569eeea6a78406c723a0c2139a6adbb5f9c9cc.zip | |
update to trunk
(bzr r12588.1.40)
Diffstat (limited to 'src/livarot/ShapeMisc.cpp')
| -rw-r--r-- | src/livarot/ShapeMisc.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp index c0bfe9428..4f63007e7 100644 --- a/src/livarot/ShapeMisc.cpp +++ b/src/livarot/ShapeMisc.cpp @@ -371,9 +371,9 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* int searchInd = 0; int lastPtUsed = 0; + int parentContour=-1; do { - int parentContour=-1; int childEdge = -1; bool foundChild = false; int startBord = -1; @@ -389,8 +389,10 @@ Shape::ConvertToFormeNested (Path * dest, int nbP, Path * *orig, int /*wildPath* if (askTo < 0 || askTo >= numberOfEdges() ) { parentContour=-1; } else { - parentContour = GPOINTER_TO_INT(swdData[askTo].misc); - parentContour-=1; // pour compenser le decalage + if (getEdge(askTo).prevS >= 0) { + parentContour = GPOINTER_TO_INT(swdData[askTo].misc); + parentContour-=1; // pour compenser le decalage + } childEdge = getPoint(fi).incidentEdge[FIRST]; } } |