diff options
| author | Alvin Penner <penner@vaxxine.com> | 2015-04-02 21:36:14 +0000 |
|---|---|---|
| committer | apenner <penner@vaxxine.com> | 2015-04-02 21:36:14 +0000 |
| commit | df56d7f04dd0df1f12891383a06295403dabc341 (patch) | |
| tree | a1d8e5ea85c7599e545c1bd0c10dba7d12e3ab71 /src/livarot | |
| parent | Small cleanup: consistency, style (diff) | |
| download | inkscape-df56d7f04dd0df1f12891383a06295403dabc341.tar.gz inkscape-df56d7f04dd0df1f12891383a06295403dabc341.zip | |
more restrictive definition of parentContour. (Bug 499744)
Fixed bugs:
- https://launchpad.net/bugs/499744
(bzr r14040)
Diffstat (limited to 'src/livarot')
| -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]; } } |