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

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-02-04 17:27:37 -0500 (Thu, 04 Feb 2010)
New Revision: 12882

Modified:
   trunk/qgis/src/providers/grass/CMakeLists.txt
   trunk/qgis/src/providers/grass/qgis.d.rast.c
   trunk/qgis/src/providers/grass/qgis.g.info.c
Log:
fix some warnings & build errors (Linux/Windows)

Modified: trunk/qgis/src/providers/grass/CMakeLists.txt
===================================================================
--- trunk/qgis/src/providers/grass/CMakeLists.txt	2010-02-04 22:24:35 UTC (rev 12881)
+++ trunk/qgis/src/providers/grass/CMakeLists.txt	2010-02-04 22:27:37 UTC (rev 12882)
@@ -77,12 +77,14 @@
 
 TARGET_LINK_LIBRARIES (qgis.d.rast
   ${GRASS_LIBRARY_gis}
+  ${GRASS_LIBRARY_datetime}
 )
 
 ADD_EXECUTABLE(qgis.g.info ${QGIS_G_INFO_SRCS})
 
 TARGET_LINK_LIBRARIES (qgis.g.info
   ${GRASS_LIBRARY_gis}
+  ${GRASS_LIBRARY_datetime}
   ${GRASS_LIBRARY_gproj}
 )
 

Modified: trunk/qgis/src/providers/grass/qgis.d.rast.c
===================================================================
--- trunk/qgis/src/providers/grass/qgis.d.rast.c	2010-02-04 22:24:35 UTC (rev 12881)
+++ trunk/qgis/src/providers/grass/qgis.d.rast.c	2010-02-04 22:27:37 UTC (rev 12882)
@@ -10,6 +10,8 @@
  *               License (>=v2).
  *
  *****************************************************************************/
+#define PACKAGE "grassmods"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -25,13 +27,9 @@
     char *mapset;
     char *name;
     int fp;
-    int cols, rows;
     struct GModule *module;
     struct Option *map;
     struct Option *win;
-    struct Flag *flag_o;
-    struct Flag *flag_i;
-    struct Flag *flag_x;
     struct Cell_head window;
 
     /* Initialize the GIS calls */
@@ -89,7 +87,6 @@
 	    RASTER_MAP_TYPE data_type)
 {
     struct Colors colors;
-    int r, g, b;
 
     if (G_read_colors(name, mapset, &colors) == -1)
 	G_fatal_error(_("Color file for <%s> not available"), name);
@@ -113,7 +110,6 @@
     int cellfile;
     void *xarray;
     int row;
-    int t, b, l, r;
     int ncols, nrows;
     static unsigned char *red, *grn, *blu, *set;
     int i;

Modified: trunk/qgis/src/providers/grass/qgis.g.info.c
===================================================================
--- trunk/qgis/src/providers/grass/qgis.g.info.c	2010-02-04 22:24:35 UTC (rev 12881)
+++ trunk/qgis/src/providers/grass/qgis.g.info.c	2010-02-04 22:27:37 UTC (rev 12882)
@@ -10,6 +10,8 @@
  *               License (>=v2).
  *
  *****************************************************************************/
+#define PACKAGE "grassmods"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -21,8 +23,6 @@
 
 int main(int argc, char **argv)
 {
-    char *mapset;
-    char *name;
     struct GModule *module;
     struct Option *info_opt, *rast_opt, *vect_opt, *coor_opt;
     struct Cell_head window;
@@ -96,8 +96,8 @@
           G_get_cellhd( rast_opt->answer, "", &window);
           G_set_window(&window);
           fd = G_open_cell_old( rast_opt->answer, "");
-          col = G_easting_to_col( x, &window);
-          row = G_northing_to_row( y, &window);
+          col = (int) G_easting_to_col( x, &window);
+          row = (int) G_northing_to_row( y, &window);
           if (col == window.cols) col--;
           if (row == window.rows) row--;