[GRASS-SVN] r39131 - grass/trunk/raster/r.out.vrml

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-09-11 23:35:43 -0400 (Fri, 11 Sep 2009)
New Revision: 39131

Modified:
   grass/trunk/raster/r.out.vrml/main.c
   grass/trunk/raster/r.out.vrml/put_grid.c
   grass/trunk/raster/r.out.vrml/pv.h
Log:
pv.h needs <grass/raster.h>
clean-up


Modified: grass/trunk/raster/r.out.vrml/main.c
===================================================================
--- grass/trunk/raster/r.out.vrml/main.c	2009-09-12 03:34:43 UTC (rev 39130)
+++ grass/trunk/raster/r.out.vrml/main.c	2009-09-12 03:35:43 UTC (rev 39131)
@@ -31,7 +31,7 @@
 
     struct Option *rast_el, *rast_co, *out;
     struct Option *exag_opt;
-    FILEDESC elevfd = 0, colorfd = 0;
+    int elevfd = 0, colorfd = 0;
     FILE *vout = NULL;
     struct Colors colr;
     char outfile[GPATH_MAX];

Modified: grass/trunk/raster/r.out.vrml/put_grid.c
===================================================================
--- grass/trunk/raster/r.out.vrml/put_grid.c	2009-09-12 03:34:43 UTC (rev 39130)
+++ grass/trunk/raster/r.out.vrml/put_grid.c	2009-09-12 03:35:43 UTC (rev 39131)
@@ -10,7 +10,7 @@
 
 void vrml_put_grid(FILE * vout,
 		   struct Cell_head *w,
-		   FILEDESC elevfd, FILEDESC colorfd,
+		   int elevfd, int colorfd,
 		   struct Colors *colr,
 		   int color_ok, int rows, int cols, int shh)
 {

Modified: grass/trunk/raster/r.out.vrml/pv.h
===================================================================
--- grass/trunk/raster/r.out.vrml/pv.h	2009-09-12 03:34:43 UTC (rev 39130)
+++ grass/trunk/raster/r.out.vrml/pv.h	2009-09-12 03:35:43 UTC (rev 39131)
@@ -1,4 +1,6 @@
+#include <stdio.h>
 #include <grass/gis.h>
+#include <grass/raster.h>
 
 /*  VRML VERSION - only 1.0 currently supported
    #define VRML2
@@ -10,13 +12,11 @@
 /* closed square bracket */
 #define CSB "]"
 
-/* open curley bracket */
+/* open curly bracket */
 #define OCB "{"
-/* closed curley bracket */
+/* closed curly bracket */
 #define CCB "}"
 
-typedef int FILEDESC;
-
 /* main.c */
 extern int init_coordcnv(double, struct Cell_head *, double, double);
 extern int do_coordcnv(double *, int);
@@ -27,10 +27,8 @@
 extern void vrml_end(FILE *);
 
 /* put_grid.c */
-extern void vrml_put_grid(FILE *,
-			  struct Cell_head *,
-			  FILEDESC, FILEDESC,
-			  struct Colors *, int, int, int, int);
+extern void vrml_put_grid(FILE *, struct Cell_head *,
+			  int, int, struct Colors *, int, int, int, int);
 
 /* put_view.c */
 extern void vrml_put_view(FILE *, struct G_3dview *);