merge r10596 to version 1.0

jef · jef · commit e28c24cea495 · 2009-04-19T09:13:36.000Z
git-svn-id: http://svn.osgeo.org/qgis/branches/Version-1_0@10597 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -1149,7 +1149,12 @@ void QgsGrassProvider::closeMap( int mapId )
 
     if ( mMaps[mapId].valid )
     {
+      bool mapsetunset = G__getenv( "MAPSET" )==NULL || *G__getenv( "MAPSET" )==0;
+      if( mapsetunset )
+        G__setenv(( char * )"MAPSET", mMaps[mapId].mapset.toAscii().data() );
       Vect_close( mMaps[mapId].map );
+      if( mapsetunset )
+        G__setenv(( char * )"MAPSET", "" );
     }
     mMaps[mapId].valid = false;
   }
@@ -1304,7 +1309,7 @@ QgsCoordinateReferenceSystem QgsGrassProvider::crs()
     struct Key_Value *projunits = G_get_projunits();
     char *wkt = GPJ_grass_to_wkt( projinfo, projunits,  0, 0 );
     Wkt = QString( wkt );
-    free( wkt );
+    G_free( wkt );
   }
 
   setlocale( LC_NUMERIC, oldlocale );

Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,12 @@ void QgsGrassProvider::closeMap( int mapId )`
`1149`	`1149`
`1150`	`1150`	`if ( mMaps[mapId].valid )`
`1151`	`1151`	`{`
	`1152`	`+ bool mapsetunset = G__getenv( "MAPSET" )==NULL \|\| *G__getenv( "MAPSET" )==0;`
	`1153`	`+ if( mapsetunset )`
	`1154`	`+ G__setenv(( char * )"MAPSET", mMaps[mapId].mapset.toAscii().data() );`
`1152`	`1155`	`Vect_close( mMaps[mapId].map );`
	`1156`	`+ if( mapsetunset )`
	`1157`	`+ G__setenv(( char * )"MAPSET", "" );`
`1153`	`1158`	`}`
`1154`	`1159`	`mMaps[mapId].valid = false;`
`1155`	`1160`	`}`
`@@ -1304,7 +1309,7 @@ QgsCoordinateReferenceSystem QgsGrassProvider::crs()`
`1304`	`1309`	`struct Key_Value *projunits = G_get_projunits();`
`1305`	`1310`	`char *wkt = GPJ_grass_to_wkt( projinfo, projunits, 0, 0 );`
`1306`	`1311`	`Wkt = QString( wkt );`
`1307`		`- free( wkt );`
	`1312`	`+ G_free( wkt );`
`1308`	`1313`	`}`
`1309`	`1314`
`1310`	`1315`	`setlocale( LC_NUMERIC, oldlocale );`