Saver double comparison, minor code cleanup (deleting a 0 pointer is always save)

mhugent · mhugent · commit 335987005b99 · 2013-01-04T09:59:11.000+01:00
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -385,10 +385,7 @@ void QgsSVGFillSymbolLayer::startRender( QgsSymbolV2RenderContext& context )
     return;
   }
 
-  if ( mSvgPattern )
-  {
-    delete mSvgPattern;
-  }
+  delete mSvgPattern;
   mSvgPattern = 0;
   double size = context.outputPixelSize( mPatternWidth );
 
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -445,7 +445,7 @@ QgsSvgCacheEntry* QgsSvgCache::cacheEntry( const QString& file, double size, con
   for ( ; entryIt != entries.end(); ++entryIt )
   {
     QgsSvgCacheEntry* cacheEntry = *entryIt;
-    if ( cacheEntry->file == file && cacheEntry->size == size && cacheEntry->fill == fill && cacheEntry->outline == outline &&
+    if ( cacheEntry->file == file && doubleNear( cacheEntry->size, size ) && cacheEntry->fill == fill && cacheEntry->outline == outline &&
          cacheEntry->outlineWidth == outlineWidth && cacheEntry->widthScaleFactor == widthScaleFactor && cacheEntry->rasterScaleFactor == rasterScaleFactor )
     {
       currentEntry = cacheEntry;

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ QgsSvgCacheEntry* QgsSvgCache::cacheEntry( const QString& file, double size, con`
`445`	`445`	`for ( ; entryIt != entries.end(); ++entryIt )`
`446`	`446`	`{`
`447`	`447`	`QgsSvgCacheEntry* cacheEntry = *entryIt;`
`448`		`- if ( cacheEntry->file == file && cacheEntry->size == size && cacheEntry->fill == fill && cacheEntry->outline == outline &&`
	`448`	`+ if ( cacheEntry->file == file && doubleNear( cacheEntry->size, size ) && cacheEntry->fill == fill && cacheEntry->outline == outline &&`
`449`	`449`	`cacheEntry->outlineWidth == outlineWidth && cacheEntry->widthScaleFactor == widthScaleFactor && cacheEntry->rasterScaleFactor == rasterScaleFactor )`
`450`	`450`	`{`
`451`	`451`	`currentEntry = cacheEntry;`