Skip to content
Permalink
Browse files

Coverity fixes, including regression in label point obstacle code

  • Loading branch information
nyalldawson committed Dec 31, 2015
1 parent ba2b3de commit 8042343970bb0fe7cbeb5b2b75794d963a9d307b
@@ -55,6 +55,7 @@ QgsGeometryGeneratorSymbolLayerV2::QgsGeometryGeneratorSymbolLayerV2( const QStr
, mLineSymbol( nullptr )
, mMarkerSymbol( nullptr )
, mSymbol( nullptr )
, mSymbolType( QgsSymbolV2::Marker )
{

}
@@ -1291,7 +1291,7 @@ QRectF QgsMarkerSymbolV2::bounds( const QPointF& point, QgsRenderContext& contex
if ( bound.isNull() )
bound = symbolLayer->bounds( point, symbolContext );
else
bound = symbolLayer->bounds( point, symbolContext );
bound = bound.united( symbolLayer->bounds( point, symbolContext ) );
}
}
return bound;
@@ -3091,6 +3091,7 @@ void QgsSvgGroupsModel::createTree( QStandardItem*& parentGroup )

QgsGeometryGeneratorSymbolLayerWidget::QgsGeometryGeneratorSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent )
: QgsSymbolLayerV2Widget( parent, vl )
, mLayer( nullptr )
{
setupUi( this );
modificationExpressionSelector->setLayer( const_cast<QgsVectorLayer*>( vl ) );

0 comments on commit 8042343

Please sign in to comment.
You can’t perform that action at this time.