Fix unnecessary proj transform construction under proj 6 in certain circumstances

nyalldawson · nyalldawson · commit 56f16ace6b36 · 2019-06-12T07:02:56.000+10:00
diff --git a/src/core/qgscoordinatetransform_p.cpp b/src/core/qgscoordinatetransform_p.cpp
@@ -104,9 +104,12 @@ QgsCoordinateTransformPrivate::QgsCoordinateTransformPrivate( const QgsCoordinat
   , mDestCRS( other.mDestCRS )
   , mSourceDatumTransform( other.mSourceDatumTransform )
   , mDestinationDatumTransform( other.mDestinationDatumTransform )
+  , mProjCoordinateOperation( other.mProjCoordinateOperation )
 {
+#if PROJ_VERSION_MAJOR < 6
   //must reinitialize to setup mSourceProjection and mDestinationProjection
   initialize();
+#endif
 }
 Q_NOWARN_DEPRECATED_POP
 

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,12 @@ QgsCoordinateTransformPrivate::QgsCoordinateTransformPrivate( const QgsCoordinat`
`104`	`104`	`, mDestCRS( other.mDestCRS )`
`105`	`105`	`, mSourceDatumTransform( other.mSourceDatumTransform )`
`106`	`106`	`, mDestinationDatumTransform( other.mDestinationDatumTransform )`
	`107`	`+ , mProjCoordinateOperation( other.mProjCoordinateOperation )`
`107`	`108`	`{`
	`109`	`+#if PROJ_VERSION_MAJOR < 6`
`108`	`110`	`//must reinitialize to setup mSourceProjection and mDestinationProjection`
`109`	`111`	`initialize();`
	`112`	`+#endif`
`110`	`113`	`}`
`111`	`114`	`Q_NOWARN_DEPRECATED_POP`
`112`	`115`