Better fix for crs bug

mhugent · mhugent · commit 05c8c1ed67e1 · 2008-04-14T06:53:30.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8348 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsspatialrefsys.cpp b/src/core/qgsspatialrefsys.cpp
@@ -125,9 +125,6 @@ QgsSpatialRefSys::QgsSpatialRefSys(const QgsSpatialRefSys &srs)
 // Assignment operator
 QgsSpatialRefSys& QgsSpatialRefSys::operator=(const QgsSpatialRefSys& srs)
 {
-  OSRDestroySpatialReference( mSRS );
-  mSRS = OSRNewSpatialReference(NULL);
-  
   if (&srs != this)
   {
     mSrsId = srs.mSrsId;
@@ -141,10 +138,8 @@ QgsSpatialRefSys& QgsSpatialRefSys::operator=(const QgsSpatialRefSys& srs)
     mIsValidFlag = srs.mIsValidFlag;
     if(mIsValidFlag)
     {
-      char *proj4src = NULL;
-      OSRExportToProj4(srs.mSRS, &proj4src);
-      OSRImportFromProj4(mSRS, proj4src);
-      CPLFree(proj4src);
+      OSRDestroySpatialReference(mSRS);
+      mSRS = OSRClone(srs.mSRS);
     }
   }
   return *this;

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,6 @@ QgsSpatialRefSys::QgsSpatialRefSys(const QgsSpatialRefSys &srs)`
`125`	`125`	`// Assignment operator`
`126`	`126`	`QgsSpatialRefSys& QgsSpatialRefSys::operator=(const QgsSpatialRefSys& srs)`
`127`	`127`	`{`
`128`		`- OSRDestroySpatialReference( mSRS );`
`129`		`- mSRS = OSRNewSpatialReference(NULL);`
`130`		`-`
`131`	`128`	`if (&srs != this)`
`132`	`129`	`{`
`133`	`130`	`mSrsId = srs.mSrsId;`
`@@ -141,10 +138,8 @@ QgsSpatialRefSys& QgsSpatialRefSys::operator=(const QgsSpatialRefSys& srs)`
`141`	`138`	`mIsValidFlag = srs.mIsValidFlag;`
`142`	`139`	`if(mIsValidFlag)`
`143`	`140`	`{`
`144`		`- char *proj4src = NULL;`
`145`		`- OSRExportToProj4(srs.mSRS, &proj4src);`
`146`		`- OSRImportFromProj4(mSRS, proj4src);`
`147`		`- CPLFree(proj4src);`
	`141`	`+ OSRDestroySpatialReference(mSRS);`
	`142`	`+ mSRS = OSRClone(srs.mSRS);`
`148`	`143`	`}`
`149`	`144`	`}`
`150`	`145`	`return *this;`