Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport queued_ltr_backports] DXF export: fix crash on some MultiPolygon geometries when offset != 0 (fixes #46245) #47297

Merged
merged 2 commits into from
Feb 12, 2022
Merged

[Backport queued_ltr_backports] DXF export: fix crash on some MultiPolygon geometries when offset != 0 (fixes #46245) #47297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e48fea4
DXF export: fix crash on some MultiPolygon geometries when offset != …
rouault Feb 9, 2022
4662daf
qgsdxfexport.cpp: move Q_ASSERT()
rouault Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 32 additions & 58 deletions src/core/dxf/qgsdxfexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,6 +1614,8 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext &ctx, const QgsCoordinateT
case QgsWkbTypes::CircularString:
case QgsWkbTypes::CompoundCurve:
case QgsWkbTypes::LineString:
case QgsWkbTypes::MultiCurve:
case QgsWkbTypes::MultiLineString:
{
if ( !qgsDoubleNear( offset, 0.0 ) )
{
Expand All @@ -1629,45 +1631,28 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext &ctx, const QgsCoordinateT
if ( curve )
{
writePolyline( *curve, layer, lineStyleName, penColor, width );
break;
}

// Offset with miter might have turned the simple to a multiline string
offset = 0.0;
}
FALLTHROUGH

case QgsWkbTypes::MultiCurve:
case QgsWkbTypes::MultiLineString:
{
if ( !qgsDoubleNear( offset, 0.0 ) )
{
QgsGeos geos( sourceGeom );
tempGeom.reset( geos.offsetCurve( offset, 0, Qgis::JoinStyle::Miter, 2.0 ) ); //#spellok
if ( tempGeom )
sourceGeom = tempGeom.get();
else
sourceGeom = geom.constGet();
}

const QgsGeometryCollection *gc = dynamic_cast<const QgsGeometryCollection *>( sourceGeom );
if ( gc )
else
{
for ( int i = 0; i < gc->numGeometries(); i++ )
const QgsGeometryCollection *gc = dynamic_cast<const QgsGeometryCollection *>( sourceGeom );
Q_ASSERT( gc );
if ( gc )
{
const QgsCurve *curve = dynamic_cast<const QgsCurve *>( gc->geometryN( i ) );
Q_ASSERT( curve );
writePolyline( *curve, layer, lineStyleName, penColor, width );
for ( int i = 0; i < gc->numGeometries(); i++ )
{
const QgsCurve *curve = dynamic_cast<const QgsCurve *>( gc->geometryN( i ) );
Q_ASSERT( curve );
writePolyline( *curve, layer, lineStyleName, penColor, width );
}
}
}
else
Q_ASSERT( gc );

break;
}

case QgsWkbTypes::CurvePolygon:
case QgsWkbTypes::Polygon:
case QgsWkbTypes::MultiSurface:
case QgsWkbTypes::MultiPolygon:
{
if ( !qgsDoubleNear( offset, 0.0 ) )
{
Expand All @@ -1680,39 +1665,28 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext &ctx, const QgsCoordinateT
}

const QgsCurvePolygon *polygon = dynamic_cast<const QgsCurvePolygon *>( sourceGeom );
Q_ASSERT( polygon );

writePolyline( *polygon->exteriorRing(), layer, lineStyleName, penColor, width );
for ( int i = 0; i < polygon->numInteriorRings(); i++ )
writePolyline( *polygon->interiorRing( i ), layer, lineStyleName, penColor, width );

break;
}

case QgsWkbTypes::MultiSurface:
case QgsWkbTypes::MultiPolygon:
{
if ( !qgsDoubleNear( offset, 0.0 ) )
if ( polygon )
{
QgsGeos geos( sourceGeom );
tempGeom.reset( geos.buffer( offset, 0, Qgis::EndCapStyle::Flat, Qgis::JoinStyle::Miter, 2.0 ) ); //#spellok
if ( tempGeom )
sourceGeom = tempGeom.get();
else
sourceGeom = geom.constGet();
writePolyline( *polygon->exteriorRing(), layer, lineStyleName, penColor, width );
for ( int i = 0; i < polygon->numInteriorRings(); i++ )
writePolyline( *polygon->interiorRing( i ), layer, lineStyleName, penColor, width );
}

const QgsGeometryCollection *gc = dynamic_cast<const QgsGeometryCollection *>( sourceGeom );
Q_ASSERT( gc );

for ( int i = 0; i < gc->numGeometries(); i++ )
else
{
const QgsCurvePolygon *polygon = dynamic_cast<const QgsCurvePolygon *>( gc->geometryN( i ) );
Q_ASSERT( polygon );
const QgsGeometryCollection *gc = dynamic_cast<const QgsGeometryCollection *>( sourceGeom );
Q_ASSERT( gc );
if ( gc )
{
for ( int i = 0; i < gc->numGeometries(); i++ )
{
const QgsCurvePolygon *polygon = dynamic_cast<const QgsCurvePolygon *>( gc->geometryN( i ) );
Q_ASSERT( polygon );

writePolyline( *polygon->exteriorRing(), layer, lineStyleName, penColor, width );
for ( int j = 0; j < polygon->numInteriorRings(); j++ )
writePolyline( *polygon->interiorRing( j ), layer, lineStyleName, penColor, width );
writePolyline( *polygon->exteriorRing(), layer, lineStyleName, penColor, width );
for ( int j = 0; j < polygon->numInteriorRings(); j++ )
writePolyline( *polygon->interiorRing( j ), layer, lineStyleName, penColor, width );
}
}
}

break;
Expand Down