[QGIS Commit] r15620 - trunk/qgis/src/core/symbology-ng

[svn_qgis at osgeo.org]

Author: wonder
Date: 2011-03-27 10:57:22 -0700 (Sun, 27 Mar 2011)
New Revision: 15620

Modified:
   trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
   trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
Log:
Fixed #3681


Modified: trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp	2011-03-27 17:45:43 UTC (rev 15619)
+++ trunk/qgis/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp	2011-03-27 17:57:22 UTC (rev 15620)
@@ -138,6 +138,8 @@
 
   // find the right symbol for the category
   QgsSymbolV2* symbol = symbolForValue( *ita );
+  if ( symbol == NULL )
+    return NULL;
 
   if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
     return symbol; // no data-defined rotation/scaling - just return the symbol

Modified: trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
===================================================================
--- trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp	2011-03-27 17:45:43 UTC (rev 15619)
+++ trunk/qgis/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp	2011-03-27 17:57:22 UTC (rev 15620)
@@ -137,8 +137,9 @@
 
   // find the right category
   QgsSymbolV2* symbol = symbolForValue( ita->toDouble() );
+  if ( symbol == NULL )
+    return NULL;
 
-
   if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
     return symbol; // no data-defined rotation/scaling - just return the symbol