Skip to content

Commit

Permalink
fix windows build (followup 8993a4b)
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Oct 30, 2015
1 parent 8993a4b commit 7019a8c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/core/qgscoordinatetransform.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r
// even with 1000 points it takes < 1ms // even with 1000 points it takes < 1ms
// TODO: how to effectively and precisely reproject bounding box? // TODO: how to effectively and precisely reproject bounding box?
const int nPoints = 1000; const int nPoints = 1000;
double d = sqrt(( rect.width() * rect.height() ) / pow( sqrt( nPoints ) - 1, 2.0 ) ); double d = sqrt(( rect.width() * rect.height() ) / pow( sqrt(( double ) nPoints ) - 1, 2.0 ) );
int nXPoints = ( int ) ceil( rect.width() / d ) + 1; int nXPoints = ( int ) ceil( rect.width() / d ) + 1;
int nYPoints = ( int ) ceil( rect.height() / d ) + 1; int nYPoints = ( int ) ceil( rect.height() / d ) + 1;


Expand All @@ -549,9 +549,9 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r
// We're interfacing with C-style vectors in the // We're interfacing with C-style vectors in the
// end, so let's do C-style vectors here too. // end, so let's do C-style vectors here too.


double x[nXPoints * nYPoints]; QVector<double> x( nXPoints * nYPoints );
double y[nXPoints * nYPoints]; QVector<double> y( nXPoints * nYPoints );
double z[nXPoints * nYPoints]; QVector<double> z( nXPoints * nYPoints );


QgsDebugMsg( "Entering transformBoundingBox..." ); QgsDebugMsg( "Entering transformBoundingBox..." );


Expand Down Expand Up @@ -584,7 +584,7 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r
// be handled in above layers. // be handled in above layers.
try try
{ {
transformCoords( nXPoints * nYPoints, x, y, z, direction ); transformCoords( nXPoints * nYPoints, x.data(), y.data(), z.data(), direction );
} }
catch ( const QgsCsException & ) catch ( const QgsCsException & )
{ {
Expand Down

0 comments on commit 7019a8c

Please sign in to comment.