[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Marco Hugentobler]

The following commit has been merged in the master branch:
commit 0b198ba03bfbaad0a11a0cc057db72df3370d4a9
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date:   Fri Mar 2 09:25:17 2012 +0100

    WMS featureinfo: use willRenderFeature instead of symbolForFeature

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
index 7d6f825..b9ca981 100644
--- a/src/mapserver/qgswmsserver.cpp
+++ b/src/mapserver/qgswmsserver.cpp
@@ -1257,7 +1257,16 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     if ( layer->isUsingRendererV2() )
     {
       QgsFeatureRendererV2* r2 = layer->rendererV2();
-      if ( !r2 || !r2->symbolForFeature( feature ) )
+      if ( !r2 )
+      {
+        continue;
+      }
+
+      QgsRenderContext c;
+      r2->startRender( c, layer );
+      bool renderV2 = r2->willRenderFeature( feature );
+      r2->stopRender( c );
+      if ( !renderV2 )
       {
         continue;
       }

-- 
The Quantum GIS in Debian project