Skip to content

Commit

Permalink
fix windows build (followup 2175e7a)
Browse files Browse the repository at this point in the history
(cherry picked from commit 6e1df49)
  • Loading branch information
jef-n committed Nov 12, 2015
1 parent 8497146 commit 32626bd
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions src/server/qgswfsserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,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(
Expand Down Expand Up @@ -843,10 +843,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;
Expand Down Expand Up @@ -1724,9 +1724,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";
Expand Down

0 comments on commit 32626bd

Please sign in to comment.