[QGIS Commit] r12687 - trunk/qgis/src/providers/grass

[svn_qgis at osgeo.org]

Author: rblazek
Date: 2010-01-07 07:03:33 -0500 (Thu, 07 Jan 2010)
New Revision: 12687

Modified:
   trunk/qgis/src/providers/grass/qgsgrass.cpp
Log:
temporal fix for 1900

Modified: trunk/qgis/src/providers/grass/qgsgrass.cpp
===================================================================
--- trunk/qgis/src/providers/grass/qgsgrass.cpp	2010-01-07 11:01:44 UTC (rev 12686)
+++ trunk/qgis/src/providers/grass/qgsgrass.cpp	2010-01-07 12:03:33 UTC (rev 12687)
@@ -90,6 +90,10 @@
   // Init GRASS libraries (required)
   G_no_gisinit();  // Doesn't check write permissions for mapset compare to G_gisinit("libgrass++");
 
+  // I think that mask should not be used in QGIS as it can only confuse people, 
+  // anyway, I don't think anybody is using MASK
+  G_suppress_masking();
+
   // Set program name
   G_set_program_name( "QGIS" );
 
@@ -594,9 +598,15 @@
 
     // Reinitialize GRASS
     G__setenv(( char * ) "GISRC", ( char * ) "" );
-    G__setenv(( char * ) "GISDBASE", ( char * ) "" );
-    G__setenv(( char * ) "LOCATION_NAME", ( char * ) "" );
-    G__setenv(( char * ) "MAPSET", ( char * ) "" );
+
+    // Temporarily commented because of 
+    //   http://trac.osgeo.org/qgis/ticket/1900
+    //   http://trac.osgeo.org/gdal/ticket/3313
+    // it can be uncommented once GDAL with patch gets depoyed (probably GDAL 1.8) 
+    //G__setenv(( char * ) "GISDBASE", ( char * ) "" );
+    //G__setenv(( char * ) "LOCATION_NAME", ( char * ) "" );
+    //G__setenv(( char * ) "MAPSET", ( char * ) "" );
+
     defaultGisdbase = "";
     defaultLocation = "";
     defaultMapset = "";