Fix for SVG cache

mhugent · mhugent · commit 104b4d90c0f3 · 2013-06-27T14:42:18.000+02:00
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -136,7 +136,10 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q
       //currentEntry->image = new QImage( 0, 0 );
 
       // instead cache picture
-      cachePicture( currentEntry );
+      if ( !currentEntry->picture )
+      {
+        cachePicture( currentEntry );
+      }
     }
     else
     {
@@ -693,6 +696,11 @@ void QgsSvgCache::printEntryList()
 
 void QgsSvgCache::trimToMaximumSize()
 {
+  //only one entry in cache
+  if ( mLeastRecentEntry == mMostRecentEntry )
+  {
+    return;
+  }
   QgsSvgCacheEntry* entry = mLeastRecentEntry;
   while ( entry && ( mTotalSize > mMaximumSize ) )
   {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,10 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q`
`136`	`136`	`//currentEntry->image = new QImage( 0, 0 );`
`137`	`137`
`138`	`138`	`// instead cache picture`
`139`		`- cachePicture( currentEntry );`
	`139`	`+ if ( !currentEntry->picture )`
	`140`	`+ {`
	`141`	`+ cachePicture( currentEntry );`
	`142`	`+ }`
`140`	`143`	`}`
`141`	`144`	`else`
`142`	`145`	`{`
`@@ -693,6 +696,11 @@ void QgsSvgCache::printEntryList()`
`693`	`696`
`694`	`697`	`void QgsSvgCache::trimToMaximumSize()`
`695`	`698`	`{`
	`699`	`+ //only one entry in cache`
	`700`	`+ if ( mLeastRecentEntry == mMostRecentEntry )`
	`701`	`+ {`
	`702`	`+ return;`
	`703`	`+ }`
`696`	`704`	`QgsSvgCacheEntry* entry = mLeastRecentEntry;`
`697`	`705`	`while ( entry && ( mTotalSize > mMaximumSize ) )`
`698`	`706`	`{`