GRASS compilation fix

blazek · blazek · commit 4d571b14873a · 2012-12-06T14:17:42.000+01:00
diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h
@@ -141,7 +141,7 @@ class QgsGrassModule: public QDialog, private  Ui::QgsGrassModuleBase
     void readStderr();
 
     //! Call on mapset change, i.e. also possible direct/indirect mode change
-    void mapsetChanged();
+    //void mapsetChanged();
 
   private:
     //! Pointer to the QGIS interface object
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -93,6 +93,7 @@ SET ( FUNCTIONS
   "G_row_to_northing"
   "G_set_c_null_value"
   "G_set_d_null_value"
+  "G_set_f_null_value"
   "G_set_d_raster_cat"
   "G_set_gisrc_mode"
   "G_set_null_value"
diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp
@@ -85,11 +85,10 @@ QgsGrassGisLib::QgsGrassGisLib()
 
 int GRASS_LIB_EXPORT QgsGrassGisLib::errorRoutine( const char *msg, int fatal )
 {
+  Q_UNUSED( fatal );
   QgsDebugMsg( QString( "error_routine (fatal = %1): %2" ).arg( fatal ).arg( msg ) );
-  // Crash to get backtrace
-  //int *x = 0; *x = 1;
   // qFatal does core dump, useful for backtrace
-  qFatal( QString( "Fatal error: %1" ).arg( msg ).toAscii().data() );
+  qFatal( "Fatal error: %s", msg );
   return 1;
 }
 
@@ -116,6 +115,7 @@ void * QgsGrassGisLib::resolve( const char * symbol )
 
 int GRASS_LIB_EXPORT QgsGrassGisLib::G__gisinit( const char * version, const char * programName )
 {
+  Q_UNUSED( version );
   // We use this function also to init our fake lib
   QgsDebugMsg( QString( "version = %1 programName = %2" ).arg( version ).arg( programName ) );
 
@@ -281,7 +281,7 @@ int G_fatal_error( const char * msg, ... )
   va_end( ap );
 
   // qFatal does core dump, useful for backtrace
-  qFatal( QString( "Fatal error: %1" ).arg( buffer ).toAscii().data() );
+  qFatal( "Fatal error: %s", buffer );
   exit( 1 ); // must exit to avoid compilation warning
 }
 
@@ -456,7 +456,7 @@ int QgsGrassGisLib::G_open_raster_new( const char *name, RASTER_MAP_TYPE wr_type
     fatal( "Cannot create output data source: " + dataSource );
   }
   raster.band = 1;
-  double noDataValue;
+  double noDataValue = std::numeric_limits<double>::quiet_NaN();
   switch ( wr_type )
   {
     case CELL_TYPE:

Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,10 @@ QgsGrassGisLib::QgsGrassGisLib()`
`85`	`85`
`86`	`86`	`int GRASS_LIB_EXPORT QgsGrassGisLib::errorRoutine( const char *msg, int fatal )`
`87`	`87`	`{`
	`88`	`+ Q_UNUSED( fatal );`
`88`	`89`	`QgsDebugMsg( QString( "error_routine (fatal = %1): %2" ).arg( fatal ).arg( msg ) );`
`89`		`- // Crash to get backtrace`
`90`		`- //int x = 0; x = 1;`
`91`	`90`	`// qFatal does core dump, useful for backtrace`
`92`		`- qFatal( QString( "Fatal error: %1" ).arg( msg ).toAscii().data() );`
	`91`	`+ qFatal( "Fatal error: %s", msg );`
`93`	`92`	`return 1;`
`94`	`93`	`}`
`95`	`94`
`@@ -116,6 +115,7 @@ void * QgsGrassGisLib::resolve( const char * symbol )`
`116`	`115`
`117`	`116`	`int GRASS_LIB_EXPORT QgsGrassGisLib::G__gisinit( const char * version, const char * programName )`
`118`	`117`	`{`
	`118`	`+ Q_UNUSED( version );`
`119`	`119`	`// We use this function also to init our fake lib`
`120`	`120`	`QgsDebugMsg( QString( "version = %1 programName = %2" ).arg( version ).arg( programName ) );`
`121`	`121`
`@@ -281,7 +281,7 @@ int G_fatal_error( const char * msg, ... )`
`281`	`281`	`va_end( ap );`
`282`	`282`
`283`	`283`	`// qFatal does core dump, useful for backtrace`
`284`		`- qFatal( QString( "Fatal error: %1" ).arg( buffer ).toAscii().data() );`
	`284`	`+ qFatal( "Fatal error: %s", buffer );`
`285`	`285`	`exit( 1 ); // must exit to avoid compilation warning`
`286`	`286`	`}`
`287`	`287`
`@@ -456,7 +456,7 @@ int QgsGrassGisLib::G_open_raster_new( const char *name, RASTER_MAP_TYPE wr_type`
`456`	`456`	`fatal( "Cannot create output data source: " + dataSource );`
`457`	`457`	`}`
`458`	`458`	`raster.band = 1;`
`459`		`- double noDataValue;`
	`459`	`+ double noDataValue = std::numeric_limits<double>::quiet_NaN();`
`460`	`460`	`switch ( wr_type )`
`461`	`461`	`{`
`462`	`462`	`case CELL_TYPE:`