dxf export: fix output of closed 3d polylines (fixes #20242)

jef-n · jef-n · commit 56ec47328b9e · 2019-02-22T00:52:36.000+01:00
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -3478,9 +3478,6 @@ void QgsDxfExport::writePolyline( const QgsPointSequence &line, const QString &l
     return;
   }
 
-  bool polygon = line[0] == line[ line.size() - 1 ];
-  if ( polygon )
-    --n;
   if ( n < 2 )
   {
     QgsDebugMsg( QStringLiteral( "writePolyline: line too short layer=%1 lineStyleName=%2" ).arg( layer, lineStyleName ) );
@@ -3489,6 +3486,10 @@ void QgsDxfExport::writePolyline( const QgsPointSequence &line, const QString &l
 
   if ( mForce2d || !line.at( 0 ).is3D() )
   {
+    bool polygon = line[0] == line[ line.size() - 1 ];
+    if ( polygon )
+      --n;
+
     writeGroup( 0, QStringLiteral( "LWPOLYLINE" ) );
     writeHandle();
     writeGroup( 8, layer );

Original file line number	Diff line number	Diff line change
`@@ -3478,9 +3478,6 @@ void QgsDxfExport::writePolyline( const QgsPointSequence &line, const QString &l`
`3478`	`3478`	`return;`
`3479`	`3479`	`}`
`3480`	`3480`
`3481`		`- bool polygon = line[0] == line[ line.size() - 1 ];`
`3482`		`- if ( polygon )`
`3483`		`- --n;`
`3484`	`3481`	`if ( n < 2 )`
`3485`	`3482`	`{`
`3486`	`3483`	`QgsDebugMsg( QStringLiteral( "writePolyline: line too short layer=%1 lineStyleName=%2" ).arg( layer, lineStyleName ) );`
`@@ -3489,6 +3486,10 @@ void QgsDxfExport::writePolyline( const QgsPointSequence &line, const QString &l`
`3489`	`3486`
`3490`	`3487`	`if ( mForce2d \|\| !line.at( 0 ).is3D() )`
`3491`	`3488`	`{`
	`3489`	`+ bool polygon = line[0] == line[ line.size() - 1 ];`
	`3490`	`+ if ( polygon )`
	`3491`	`+ --n;`
	`3492`	`+`
`3492`	`3493`	`writeGroup( 0, QStringLiteral( "LWPOLYLINE" ) );`
`3493`	`3494`	`writeHandle();`
`3494`	`3495`	`writeGroup( 8, layer );`