r3.out.vtk: use 'RASTER3D_Map *' (#1291)

Replace 'void *' with 'RASTER3D_Map *' for clarity.

raster3d/r3.out.vtk/errorHandling.c

@@ -27,7 +27,7 @@
 
 
 /* prototypes ************************************************************* */
-int close_input_raster3d_map(void *map);
+int close_input_raster3d_map(RASTER3D_Map *map);
 
 
 /* ************************************************************************* */
@@ -58,11 +58,11 @@ int CloseInputRasterMap(int fd)
 /* ************************************************************************* */
 /* Close the raster g3d input map ****************************************** */
 /* ************************************************************************* */
-int close_input_raster3d_map(void *map)
+int close_input_raster3d_map(RASTER3D_Map *map)
 {
     if (map != NULL) {
 	if (!Rast3d_close(map)) {
-	    G_warning(_("Unable to close 3D raster map <%s>"), map);
+	    G_warning(_("Unable to close 3D raster map <%s>"), map->fileName);
 	    return 1;
 	}
     }

raster3d/r3.out.vtk/globalDefs.h

@@ -18,17 +18,19 @@
 #ifndef __R3_OUT_VTK_GLOBALDEFS_H__
 #define __R3_OUT_VTK_GLOBALDEFS_H__
 
+#include <grass/raster3d.h>
+
 
 typedef struct
 {
     /*RASTER3D maps */
-    void *map;
-    void *map_r;
-    void *map_g;
-    void *map_b;
-    void *map_x;
-    void *map_y;
-    void *map_z;
+    RASTER3D_Map *map;
+    RASTER3D_Map *map_r;
+    RASTER3D_Map *map_g;
+    RASTER3D_Map *map_b;
+    RASTER3D_Map *map_x;
+    RASTER3D_Map *map_y;
+    RASTER3D_Map *map_z;
     /*raster maps */
     int top;
     int bottom;

raster3d/r3.out.vtk/writeVTKData.c

@@ -30,8 +30,8 @@
 /*local prototypes */
 static double get_raster_value_as_double(int maptype, void *ptr,
                                          double nullval);
-static double get_g3d_raster_value_as_double(void *map, int x, int y, int z,
-                                             int type, double nullval);
+static double get_g3d_raster_value_as_double(RASTER3D_Map *map, int x, int y,
+					     int z, int type, double nullval);
 
 
 /* ************************************************************************* */
@@ -71,7 +71,7 @@ double get_raster_value_as_double(int MapType, void *ptr, double nullval)
 /* Get the value of the 3d raster map as double *************************** */
 
 /* ************************************************************************* */
-double get_g3d_raster_value_as_double(void *map, int x, int y, int z,
+double get_g3d_raster_value_as_double(RASTER3D_Map *map, int x, int y, int z,
                                       int type, double nullval)
 {
     double val = 0;
@@ -313,8 +313,8 @@ void write_vtk_unstructured_grid_cells(FILE * fp, RASTER3D_Region region)
 /* Write the VTK Cell or point data **************************************** */
 
 /* ************************************************************************* */
-void write_vtk_data(FILE * fp, void *map, RASTER3D_Region region, char *varname,
-                    int dp)
+void write_vtk_data(FILE * fp, RASTER3D_Map *map, RASTER3D_Region region,
+		    char *varname, int dp)
 {
     double value;
     double nullvalue;
@@ -382,8 +382,8 @@ void write_vtk_data(FILE * fp, void *map, RASTER3D_Region region, char *varname,
 /* Write the VTK RGB Voxel Data ******************************************** */
 
 /* ************************************************************************* */
-void write_vtk_rgb_data(void *map_r, void *map_g, void *map_b,
-                        FILE * fp, const char *varname,
+void write_vtk_rgb_data(RASTER3D_Map *map_r, RASTER3D_Map *map_g,
+			RASTER3D_Map *map_b, FILE * fp, const char *varname,
                         RASTER3D_Region region, int dp)
 {
     double value = 0;
@@ -457,8 +457,8 @@ void write_vtk_rgb_data(void *map_r, void *map_g, void *map_b,
 /* Write the VTK vector Data *********************************************** */
 
 /* ************************************************************************* */
-void write_vtk_vector_data(void *map_x, void *map_y, void *map_z,
-                           FILE * fp, const char *varname,
+void write_vtk_vector_data(RASTER3D_Map *map_x, RASTER3D_Map *map_y,
+			   RASTER3D_Map *map_z, FILE * fp, const char *varname,
                            RASTER3D_Region region, int dp)
 {
     double value = 0;

raster3d/r3.out.vtk/writeVTKData.h

@@ -28,13 +28,15 @@ void write_vtk_points(input_maps * in, FILE * fp, RASTER3D_Region region, int dp
 void write_vtk_unstructured_grid_cells(FILE * fp, RASTER3D_Region region);
 
 /*Write the outputdata */
-void write_vtk_data(FILE * fp, void *map, RASTER3D_Region region, char *varname,
-		    int dp);
+void write_vtk_data(FILE * fp, RASTER3D_Map *map, RASTER3D_Region region,
+		    char *varname, int dp);
 /*Write the rgb voxel data to the output */
-void write_vtk_rgb_data(void *map_r, void *map_g, void *map_b, FILE * fp,
-			const char *string, RASTER3D_Region region, int dp);
+void write_vtk_rgb_data(RASTER3D_Map *map_r, RASTER3D_Map *map_g,
+			RASTER3D_Map *map_b, FILE * fp, const char *string,
+			RASTER3D_Region region, int dp);
 /*Write the vector data to the output */
-void write_vtk_vector_data(void *map_x, void *map_y, void *map_z, FILE * fp,
+void write_vtk_vector_data(RASTER3D_Map *map_x, RASTER3D_Map *map_y,
+			   RASTER3D_Map *map_z, FILE * fp,
 			   const char *string, RASTER3D_Region region, int dp);
 
 #endif