fix windows build (followup 2175e7a)

This commit is contained in:
Juergen E. Fischer 2015-11-12 09:46:42 +01:00
parent 8803cb4241
commit 6e1df491f6

View File

@ -507,10 +507,10 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
//map extent
searchRect = layer->extent();
searchRect.set( searchRect.xMinimum() - 1/pow(10,layerPrec)
, searchRect.yMinimum() - 1/pow(10,layerPrec)
, searchRect.xMaximum() + 1/pow(10,layerPrec)
, searchRect.yMaximum() + 1/pow(10,layerPrec) );
searchRect.set( searchRect.xMinimum() - 1. / pow( 10., layerPrec )
, searchRect.yMinimum() - 1. / pow( 10., layerPrec )
, searchRect.xMaximum() + 1. / pow( 10., layerPrec )
, searchRect.yMaximum() + 1. / pow( 10., layerPrec ) );
layerCrs = layer->crs();
QgsFeatureIterator fit = layer->getFeatures(
@ -853,10 +853,10 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
if ( bboxOk )
searchRect.set( minx, miny, maxx, maxy );
else
searchRect.set( searchRect.xMinimum() - 1/pow(10,layerPrec),
searchRect.yMinimum() - 1/pow(10,layerPrec),
searchRect.xMaximum() + 1/pow(10,layerPrec),
searchRect.yMaximum() + 1/pow(10,layerPrec) );
searchRect.set( searchRect.xMinimum() - 1. / pow( 10., layerPrec ),
searchRect.yMinimum() - 1. / pow( 10., layerPrec ),
searchRect.xMaximum() + 1. / pow( 10., layerPrec ),
searchRect.yMaximum() + 1. / pow( 10., layerPrec ) );
layerCrs = layer->crs();
long featCounter = 0;
@ -1752,9 +1752,9 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, int prec, QgsCoord
{
fStr += "\"";
fStr += val.toString()
.replace( QString( "\"" ), QString( "\\\"" ) )
.replace( QString( "\r" ), QString( "\\r" ) )
.replace( QString( "\n" ), QString( "\\n" ) );
.replace( QString( "\"" ), QString( "\\\"" ) )
.replace( QString( "\r" ), QString( "\\r" ) )
.replace( QString( "\n" ), QString( "\\n" ) );
fStr += "\"";
}
fStr += "\n";