Fix svg marker colors not correctly restored from project

nyalldawson · nyalldawson · commit 1bd2a69f9b28 · 2015-10-11T22:13:22.000+11:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -1099,24 +1099,24 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props )
   if ( props.contains( "fill" ) )
   {
     //pre 2.5 projects used "fill"
-    m->setFillColor( QColor( props["fill"] ) );
+    m->setFillColor( QgsSymbolLayerV2Utils::decodeColor( props["fill"] ) );
   }
   else if ( props.contains( "color" ) )
   {
-    m->setFillColor( QColor( props["color"] ) );
+    m->setFillColor( QgsSymbolLayerV2Utils::decodeColor( props["color"] ) );
   }
   if ( props.contains( "outline" ) )
   {
     //pre 2.5 projects used "outline"
-    m->setOutlineColor( QColor( props["outline"] ) );
+    m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["outline"] ) );
   }
   else if ( props.contains( "outline_color" ) )
   {
-    m->setOutlineColor( QColor( props["outline_color"] ) );
+    m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["outline_color"] ) );
   }
   else if ( props.contains( "line_color" ) )
   {
-    m->setOutlineColor( QColor( props["line_color"] ) );
+    m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["line_color"] ) );
   }
 
   if ( props.contains( "outline-width" ) )

Original file line number	Diff line number	Diff line change
`@@ -1099,24 +1099,24 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props )`
`1099`	`1099`	`if ( props.contains( "fill" ) )`
`1100`	`1100`	`{`
`1101`	`1101`	`//pre 2.5 projects used "fill"`
`1102`		`- m->setFillColor( QColor( props["fill"] ) );`
	`1102`	`+ m->setFillColor( QgsSymbolLayerV2Utils::decodeColor( props["fill"] ) );`
`1103`	`1103`	`}`
`1104`	`1104`	`else if ( props.contains( "color" ) )`
`1105`	`1105`	`{`
`1106`		`- m->setFillColor( QColor( props["color"] ) );`
	`1106`	`+ m->setFillColor( QgsSymbolLayerV2Utils::decodeColor( props["color"] ) );`
`1107`	`1107`	`}`
`1108`	`1108`	`if ( props.contains( "outline" ) )`
`1109`	`1109`	`{`
`1110`	`1110`	`//pre 2.5 projects used "outline"`
`1111`		`- m->setOutlineColor( QColor( props["outline"] ) );`
	`1111`	`+ m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["outline"] ) );`
`1112`	`1112`	`}`
`1113`	`1113`	`else if ( props.contains( "outline_color" ) )`
`1114`	`1114`	`{`
`1115`		`- m->setOutlineColor( QColor( props["outline_color"] ) );`
	`1115`	`+ m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["outline_color"] ) );`
`1116`	`1116`	`}`
`1117`	`1117`	`else if ( props.contains( "line_color" ) )`
`1118`	`1118`	`{`
`1119`		`- m->setOutlineColor( QColor( props["line_color"] ) );`
	`1119`	`+ m->setOutlineColor( QgsSymbolLayerV2Utils::decodeColor( props["line_color"] ) );`
`1120`	`1120`	`}`
`1121`	`1121`
`1122`	`1122`	`if ( props.contains( "outline-width" ) )`