Don't try to render empty image paths for raster image marker

nyalldawson · nyalldawson · commit e6bbcbb4558c · 2018-12-06T09:22:50.000+10:00
diff --git a/src/core/symbology/qgsmarkersymbollayer.cpp b/src/core/symbology/qgsmarkersymbollayer.cpp
@@ -2676,8 +2676,6 @@ void QgsRasterMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderCont
     return;
   }
 
-  p->save();
-
   QString path = mPath;
   if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyName ) )
   {
@@ -2693,6 +2691,11 @@ void QgsRasterMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderCont
     }
   }
 
+  if ( path.isEmpty() )
+    return;
+
+  p->save();
+
   QPointF outputOffset;
   double angle = 0.0;
   calculateOffsetAndRotation( context, scaledSize, scaledSize * ( height / width ), outputOffset, angle );

Original file line number	Diff line number	Diff line change
`@@ -2676,8 +2676,6 @@ void QgsRasterMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderCont`
`2676`	`2676`	`return;`
`2677`	`2677`	`}`
`2678`	`2678`
`2679`		`- p->save();`
`2680`		`-`
`2681`	`2679`	`QString path = mPath;`
`2682`	`2680`	`if ( mDataDefinedProperties.isActive( QgsSymbolLayer::PropertyName ) )`
`2683`	`2681`	`{`
`@@ -2693,6 +2691,11 @@ void QgsRasterMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderCont`
`2693`	`2691`	`}`
`2694`	`2692`	`}`
`2695`	`2693`
	`2694`	`+ if ( path.isEmpty() )`
	`2695`	`+ return;`
	`2696`	`+`
	`2697`	`+ p->save();`
	`2698`	`+`
`2696`	`2699`	`QPointF outputOffset;`
`2697`	`2700`	`double angle = 0.0;`
`2698`	`2701`	`calculateOffsetAndRotation( context, scaledSize, scaledSize * ( height / width ), outputOffset, angle );`