Check for short-circuit in QgsCoordinateTransform::transformCoords

dgoedkoop · nyalldawson · commit 0e866f02e910 · 2015-11-26T12:34:35.000+11:00
diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp
@@ -634,6 +634,8 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r
 
 void QgsCoordinateTransform::transformCoords( const int& numPoints, double *x, double *y, double *z, TransformDirection direction ) const
 {
+  if ( mShortCircuit || !mInitialisedFlag )
+    return;
   // Refuse to transform the points if the srs's are invalid
   if ( !mSourceCRS.isValid() )
   {

Original file line number	Diff line number	Diff line change
`@@ -634,6 +634,8 @@ QgsRectangle QgsCoordinateTransform::transformBoundingBox( const QgsRectangle &r`
`634`	`634`
`635`	`635`	`void QgsCoordinateTransform::transformCoords( const int& numPoints, double x, double y, double *z, TransformDirection direction ) const`
`636`	`636`	`{`
	`637`	`+ if ( mShortCircuit \|\| !mInitialisedFlag )`
	`638`	`+ return;`
`637`	`639`	`// Refuse to transform the points if the srs's are invalid`
`638`	`640`	`if ( !mSourceCRS.isValid() )`
`639`	`641`	`{`