Skip to content

Commit 8042343

Browse files
committed
Coverity fixes, including regression in label point obstacle code
1 parent ba2b3de commit 8042343

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ QgsGeometryGeneratorSymbolLayerV2::QgsGeometryGeneratorSymbolLayerV2( const QStr
5555
, mLineSymbol( nullptr )
5656
, mMarkerSymbol( nullptr )
5757
, mSymbol( nullptr )
58+
, mSymbolType( QgsSymbolV2::Marker )
5859
{
5960

6061
}

src/core/symbology-ng/qgssymbolv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1291,7 +1291,7 @@ QRectF QgsMarkerSymbolV2::bounds( const QPointF& point, QgsRenderContext& contex
12911291
if ( bound.isNull() )
12921292
bound = symbolLayer->bounds( point, symbolContext );
12931293
else
1294-
bound = symbolLayer->bounds( point, symbolContext );
1294+
bound = bound.united( symbolLayer->bounds( point, symbolContext ) );
12951295
}
12961296
}
12971297
return bound;

src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3091,6 +3091,7 @@ void QgsSvgGroupsModel::createTree( QStandardItem*& parentGroup )
30913091

30923092
QgsGeometryGeneratorSymbolLayerWidget::QgsGeometryGeneratorSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent )
30933093
: QgsSymbolLayerV2Widget( parent, vl )
3094+
, mLayer( nullptr )
30943095
{
30953096
setupUi( this );
30963097
modificationExpressionSelector->setLayer( const_cast<QgsVectorLayer*>( vl ) );

0 commit comments

Comments
 (0)