Amend previous commit: call method after null-pointer check (sorry).

mmassing · mmassing · commit 44fedd36b4d3 · 2011-03-14T22:55:09.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15489 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -150,13 +150,16 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )
       GDALAutoCreateWarpedVRT( mGdalBaseDataset, NULL, NULL,
                                GRA_NearestNeighbour, 0.2, NULL );
     
-    GDALGetGeoTransform(mGdalDataset, mGeoTransform);
     if ( mGdalDataset == NULL )
     {
       QgsLogger::warning( "Warped VRT Creation failed." );
       mGdalDataset = mGdalBaseDataset;
       GDALReferenceDataset( mGdalDataset );
     }
+    else
+    {
+      GDALGetGeoTransform(mGdalDataset, mGeoTransform);   
+    }
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -150,13 +150,16 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )`
`150`	`150`	`GDALAutoCreateWarpedVRT( mGdalBaseDataset, NULL, NULL,`
`151`	`151`	`GRA_NearestNeighbour, 0.2, NULL );`
`152`	`152`
`153`		`- GDALGetGeoTransform(mGdalDataset, mGeoTransform);`
`154`	`153`	`if ( mGdalDataset == NULL )`
`155`	`154`	`{`
`156`	`155`	`QgsLogger::warning( "Warped VRT Creation failed." );`
`157`	`156`	`mGdalDataset = mGdalBaseDataset;`
`158`	`157`	`GDALReferenceDataset( mGdalDataset );`
`159`	`158`	`}`
	`159`	`+ else`
	`160`	`+ {`
	`161`	`+ GDALGetGeoTransform(mGdalDataset, mGeoTransform);`
	`162`	`+ }`
`160`	`163`	`}`
`161`	`164`	`else`
`162`	`165`	`{`