Port changes from mainstream.

This commit is contained in:
Roman Telezhynskyi 2022-08-13 19:27:47 +03:00
parent 46b2814981
commit 5b9c1b1d55
2 changed files with 7 additions and 8 deletions

View File

@ -2494,7 +2494,6 @@ bool dxfRW::processViewport() {
if (!vp.parseCode(code, reader)) { if (!vp.parseCode(code, reader)) {
return setError( DRW::BAD_CODE_PARSED); return setError( DRW::BAD_CODE_PARSED);
} }
break;
} }
return setError(DRW::BAD_READ_ENTITIES); return setError(DRW::BAD_READ_ENTITIES);
@ -2686,9 +2685,8 @@ bool dxfRW::processPolyline() {
if (nextentity != "VERTEX") { if (nextentity != "VERTEX") {
iface->addPolyline(pl); iface->addPolyline(pl);
return true; //found new entity or ENDSEC, terminate return true; //found new entity or ENDSEC, terminate
} else {
processVertex(&pl);
} }
processVertex(&pl);
} }
if (!pl.parseCode(code, reader)) { //parseCode just initialize the members of pl if (!pl.parseCode(code, reader)) { //parseCode just initialize the members of pl
@ -2711,7 +2709,8 @@ bool dxfRW::processVertex(DRW_Polyline *pl) {
DRW_DBG(nextentity); DRW_DBG("\n"); DRW_DBG(nextentity); DRW_DBG("\n");
if (nextentity == "SEQEND") { if (nextentity == "SEQEND") {
return true; //found SEQEND no more vertex, terminate return true; //found SEQEND no more vertex, terminate
} else if (nextentity == "VERTEX"){ }
if (nextentity == "VERTEX"){
v.reset(new DRW_Vertex()); //another vertex v.reset(new DRW_Vertex()); //another vertex
} }
} }