Draw svg symbols as vectors if there is rotation

Author: mhugent

src/core/symbology-ng/qgsmarkersymbollayerv2.cpp

@@ -561,10 +561,12 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
     return;
   }
 
-  if ( mAngle != 0 )
+  bool rotated = !doubleNear( mAngle, 0 );
+  bool drawOnScreen = doubleNear( context.renderContext().rasterScaleFactor(), 1.0, 0.1 );
+  if ( rotated )
     p->rotate( mAngle );
 
-  if ( doubleNear( context.renderContext().rasterScaleFactor(), 1.0, 0.1 ) )
+  if ( drawOnScreen && !rotated )
   {
     const QImage& img = QgsSvgCache::instance()->svgAsImage( mPath, size, mFillColor, mOutlineColor, mOutlineWidth,
                         context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor() );

src/core/symbology-ng/qgssvgcache.cpp

@@ -240,7 +240,7 @@ void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )
 
   //correct QPictures dpi correction
   QPicture* picture = new QPicture();
-  double pictureSize = entry->size  /  25.4 / entry->rasterScaleFactor  * picture->logicalDpiX();
+  double pictureSize = entry->size  /  25.4 / ( entry->rasterScaleFactor * entry->widthScaleFactor )  * picture->logicalDpiX();
   QRectF rect( QPointF( -pictureSize / 2.0, -pictureSize / 2.0 ), QSizeF( pictureSize, pictureSize ) );