Skip to content
Permalink
Browse files

Merge pull request #4926 from nyalldawson/coverity_158026

Fix coverity identical code for different branches warning
  • Loading branch information
nyalldawson committed Aug 6, 2017
2 parents 5f66f36 + f5f133e commit b5c2253f0da4f787a46113b1daf7f374942f72b3
Showing with 2 additions and 8 deletions.
  1. +2 −8 src/server/services/wms/qgswmsrenderer.cpp
@@ -1126,10 +1126,7 @@ namespace QgsWms
QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( layer );
if ( vectorLayer )
{
if ( !featureInfoFromVectorLayer( vectorLayer, infoPoint.get(), featureCount, result, layerElement, mapSettings, renderContext, version, featuresRect.get(), filterGeom.get() ) )
{
break;
}
( void )featureInfoFromVectorLayer( vectorLayer, infoPoint.get(), featureCount, result, layerElement, mapSettings, renderContext, version, featuresRect.get(), filterGeom.get() );
break;
}
}
@@ -1149,10 +1146,7 @@ namespace QgsWms
break;
}
QgsPointXY layerInfoPoint = mapSettings.mapToLayerCoordinates( layer, *( infoPoint.get() ) );
if ( !featureInfoFromRasterLayer( rasterLayer, mapSettings, &layerInfoPoint, result, layerElement, version ) )
{
break;
}
( void )featureInfoFromRasterLayer( rasterLayer, mapSettings, &layerInfoPoint, result, layerElement, version );
break;
}
}

0 comments on commit b5c2253

Please sign in to comment.
You can’t perform that action at this time.