Showing with 3 additions and 2 deletions.
  1. +1 −0 src/core/qgscachedfeatureiterator.cpp
  2. +2 −2 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
1 change: 1 addition & 0 deletions src/core/qgscachedfeatureiterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,6 @@ bool QgsCachedFeatureWriterIterator::rewind()

bool QgsCachedFeatureWriterIterator::close()
{
mClosed = true;
return mFeatIt.close();
}
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,12 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend
if ( fillColorExpression )
{
QString colorString = fillColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();
mBrush.setColor( QColor( colorString ) );
mBrush.setColor( QColor( QgsSymbolLayerV2Utils::decodeColor( colorString ) ) );
}
if ( outlineColorExpression )
{
QString colorString = outlineColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();
mPen.setColor( QColor( colorString ) );
mPen.setColor( QColor( QgsSymbolLayerV2Utils::decodeColor( colorString ) ) );
}
if ( widthExpression || heightExpression || symbolNameExpression )
{
Expand Down