Merge pull request #8236 from nyalldawson/marker_fill

m-kuhn · web-flow · commit 607cd3e3aa47 · 2018-10-25T11:57:46.000+02:00
Fix svg marker doesn't render when size is very small
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -2025,11 +2025,11 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderCon
   double hwRatio = 1.0;
   if ( !context.renderContext().forceVectorOutput() && !rotated )
   {
-    usePict = false;
     const QImage& img = QgsSvgCache::instance()->svgAsImage( path, size, fillColor, outlineColor, outlineWidth,
                         context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor(), fitsInCache );
     if ( fitsInCache && img.width() > 1 )
     {
+      usePict = false;
       //consider transparency
       if ( !qgsDoubleNear( context.alpha(), 1.0 ) )
       {

Original file line number	Diff line number	Diff line change
`@@ -2025,11 +2025,11 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolV2RenderCon`
`2025`	`2025`	`double hwRatio = 1.0;`
`2026`	`2026`	`if ( !context.renderContext().forceVectorOutput() && !rotated )`
`2027`	`2027`	`{`
`2028`		`- usePict = false;`
`2029`	`2028`	`const QImage& img = QgsSvgCache::instance()->svgAsImage( path, size, fillColor, outlineColor, outlineWidth,`
`2030`	`2029`	`context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor(), fitsInCache );`
`2031`	`2030`	`if ( fitsInCache && img.width() > 1 )`
`2032`	`2031`	`{`
	`2032`	`+ usePict = false;`
`2033`	`2033`	`//consider transparency`
`2034`	`2034`	`if ( !qgsDoubleNear( context.alpha(), 1.0 ) )`
`2035`	`2035`	`{`