[GRASS-SVN] r47534 - in grass/trunk: general/g.region lib/gpde
lib/gpde/test lib/manage lib/ogsf lib/raster3d
lib/raster3d/test raster/r.colors raster/r.colors.out
raster/r.mapcalc raster/r.mfilter raster/r.to.rast3
raster/r.to.rast3elev raster/r.univar raster3d/r3.cross.rast
raster3d/r3.gwflow raster3d/r3.in.ascii raster3d/r3.in.v5d
raster3d/r3.info raster3d/r3.mask raster3d/r3.mkdspf
raster3d/r3.null raster3d/r3.out.ascii raster3d/r3.out.v5d
raster3d/r3.out.vtk raster3d/r3.retile raster3d/r3.showdspf
raster3d/r3.stats raster3d/r3.timestamp raster3d/r3.to.rast
vector/v.to.rast3 vector/v.vol.rst visualization/nviz2/cmd
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Aug 10 12:59:42 EDT 2011
Author: martinl
Date: 2011-08-10 09:59:42 -0700 (Wed, 10 Aug 2011)
New Revision: 47534
Modified:
grass/trunk/general/g.region/main.c
grass/trunk/lib/gpde/N_pde.h
grass/trunk/lib/gpde/test/test_geom.c
grass/trunk/lib/manage/do_remove.c
grass/trunk/lib/manage/do_rename.c
grass/trunk/lib/ogsf/GVL2.c
grass/trunk/lib/ogsf/Gvl3.c
grass/trunk/lib/ogsf/gvl_file.c
grass/trunk/lib/raster3d/G3d_intern.h
grass/trunk/lib/raster3d/cache1.c
grass/trunk/lib/raster3d/cachehash.c
grass/trunk/lib/raster3d/changeprecision.c
grass/trunk/lib/raster3d/changetype.c
grass/trunk/lib/raster3d/defaults.c
grass/trunk/lib/raster3d/filecompare.c
grass/trunk/lib/raster3d/header.c
grass/trunk/lib/raster3d/headerinfo.c
grass/trunk/lib/raster3d/index.c
grass/trunk/lib/raster3d/maskfn.c
grass/trunk/lib/raster3d/open.c
grass/trunk/lib/raster3d/open2.c
grass/trunk/lib/raster3d/region.c
grass/trunk/lib/raster3d/retile.c
grass/trunk/lib/raster3d/rle.c
grass/trunk/lib/raster3d/test/test_g3d_lib.h
grass/trunk/lib/raster3d/volume.c
grass/trunk/lib/raster3d/window.c
grass/trunk/lib/raster3d/writeascii.c
grass/trunk/raster/r.colors.out/local_proto.h
grass/trunk/raster/r.colors/local_proto.h
grass/trunk/raster/r.mapcalc/globals3.h
grass/trunk/raster/r.mapcalc/map3.c
grass/trunk/raster/r.mapcalc/xcoor3.c
grass/trunk/raster/r.mapcalc/xres3.c
grass/trunk/raster/r.mfilter/r.mfilter.html
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.univar/globals.h
grass/trunk/raster/r.univar/r3.univar_main.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.gwflow/main.c
grass/trunk/raster3d/r3.in.ascii/main.c
grass/trunk/raster3d/r3.in.v5d/main.c
grass/trunk/raster3d/r3.info/r3.info.main.c
grass/trunk/raster3d/r3.mask/main.c
grass/trunk/raster3d/r3.mkdspf/iso_surface.c
grass/trunk/raster3d/r3.mkdspf/main.c
grass/trunk/raster3d/r3.mkdspf/make_header.c
grass/trunk/raster3d/r3.mkdspf/r3_data.c
grass/trunk/raster3d/r3.mkdspf/r3_find.c
grass/trunk/raster3d/r3.null/main.c
grass/trunk/raster3d/r3.out.ascii/main.c
grass/trunk/raster3d/r3.out.v5d/main.c
grass/trunk/raster3d/r3.out.vtk/errorHandling.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c
grass/trunk/raster3d/r3.retile/main.c
grass/trunk/raster3d/r3.showdspf/init_caps.c
grass/trunk/raster3d/r3.showdspf/main_ogl.c
grass/trunk/raster3d/r3.showdspf/make_header.c
grass/trunk/raster3d/r3.showdspf/r3_data.c
grass/trunk/raster3d/r3.showdspf/r3_find.c
grass/trunk/raster3d/r3.stats/main.c
grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/vector/v.to.rast3/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.vol.rst/user1.c
grass/trunk/vector/v.vol.rst/user3.c
grass/trunk/vector/v.vol.rst/userglobs.h
grass/trunk/vector/v.vol.rst/vector.c
grass/trunk/visualization/nviz2/cmd/volume.c
Log:
update code: g3d.h has been renamed to raster3d.h
Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/general/g.region/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -18,7 +18,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/vector.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/lib/gpde/N_pde.h
===================================================================
--- grass/trunk/lib/gpde/N_pde.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/gpde/N_pde.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -16,7 +16,7 @@
*****************************************************************************/
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include <grass/gmath.h>
Modified: grass/trunk/lib/gpde/test/test_geom.c
===================================================================
--- grass/trunk/lib/gpde/test/test_geom.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/gpde/test/test_geom.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/glocale.h>
#include <grass/N_pde.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "test_gpde_lib.h"
/* prototypes */
Modified: grass/trunk/lib/manage/do_remove.c
===================================================================
--- grass/trunk/lib/manage/do_remove.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/manage/do_remove.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -16,7 +16,7 @@
#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "manage_local_proto.h"
Modified: grass/trunk/lib/manage/do_rename.c
===================================================================
--- grass/trunk/lib/manage/do_rename.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/manage/do_rename.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -16,7 +16,7 @@
#include <grass/gis.h>
#include <grass/vector.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "manage_local_proto.h"
Modified: grass/trunk/lib/ogsf/GVL2.c
===================================================================
--- grass/trunk/lib/ogsf/GVL2.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/ogsf/GVL2.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -18,7 +18,7 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/gstypes.h>
#include <grass/glocale.h>
#include "gsget.h"
Modified: grass/trunk/lib/ogsf/Gvl3.c
===================================================================
--- grass/trunk/lib/ogsf/Gvl3.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/ogsf/Gvl3.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -18,7 +18,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/gstypes.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/ogsf/gvl_file.c
===================================================================
--- grass/trunk/lib/ogsf/gvl_file.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/ogsf/gvl_file.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -22,7 +22,7 @@
#include <grass/gis.h>
#include <grass/gstypes.h>
#include <grass/gsurf.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define LUCKY 33
Modified: grass/trunk/lib/raster3d/G3d_intern.h
===================================================================
--- grass/trunk/lib/raster3d/G3d_intern.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/G3d_intern.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -3,7 +3,7 @@
/*---------------------------------------------------------------------------*/
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/gis.h>
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/cache1.c
===================================================================
--- grass/trunk/lib/raster3d/cache1.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/cache1.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -3,7 +3,7 @@
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
#include "cachehash.h"
Modified: grass/trunk/lib/raster3d/cachehash.c
===================================================================
--- grass/trunk/lib/raster3d/cachehash.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/cachehash.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -2,11 +2,11 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
/*---------------------------------------------------------------------------*/
-#ifndef GRASS_G3D_H
+#ifndef GRASS_RASTER3D_H
typedef struct
{
Modified: grass/trunk/lib/raster3d/changeprecision.c
===================================================================
--- grass/trunk/lib/raster3d/changeprecision.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/changeprecision.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/changetype.c
===================================================================
--- grass/trunk/lib/raster3d/changetype.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/changetype.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/defaults.c
===================================================================
--- grass/trunk/lib/raster3d/defaults.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/defaults.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/filecompare.c
===================================================================
--- grass/trunk/lib/raster3d/filecompare.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/filecompare.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/header.c
===================================================================
--- grass/trunk/lib/raster3d/header.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/header.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <rpc/types.h>
#include <rpc/xdr.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/headerinfo.c
===================================================================
--- grass/trunk/lib/raster3d/headerinfo.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/headerinfo.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,4 +1,4 @@
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/index.c
===================================================================
--- grass/trunk/lib/raster3d/index.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/index.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/maskfn.c
===================================================================
--- grass/trunk/lib/raster3d/maskfn.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/maskfn.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
/*local prototypes */
Modified: grass/trunk/lib/raster3d/open.c
===================================================================
--- grass/trunk/lib/raster3d/open.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/open.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -3,7 +3,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "G3d_intern.h"
Modified: grass/trunk/lib/raster3d/open2.c
===================================================================
--- grass/trunk/lib/raster3d/open2.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/open2.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,5 +1,5 @@
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*----------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/region.c
===================================================================
--- grass/trunk/lib/raster3d/region.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/region.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -2,7 +2,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
Modified: grass/trunk/lib/raster3d/retile.c
===================================================================
--- grass/trunk/lib/raster3d/retile.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/retile.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/rle.c
===================================================================
--- grass/trunk/lib/raster3d/rle.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/rle.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#define G_254_SQUARE 64516
#define G_254_TIMES_2 508
Modified: grass/trunk/lib/raster3d/test/test_g3d_lib.h
===================================================================
--- grass/trunk/lib/raster3d/test/test_g3d_lib.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/test/test_g3d_lib.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -18,7 +18,7 @@
#ifndef _TEST_G3D_LIB_H_
#define _TEST_G3D_LIB_H_
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/gis.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/raster3d/volume.c
===================================================================
--- grass/trunk/lib/raster3d/volume.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/volume.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -4,7 +4,7 @@
#include <unistd.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/window.c
===================================================================
--- grass/trunk/lib/raster3d/window.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/window.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "G3d_intern.h"
/*---------------------------------------------------------------------------*/
Modified: grass/trunk/lib/raster3d/writeascii.c
===================================================================
--- grass/trunk/lib/raster3d/writeascii.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/lib/raster3d/writeascii.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*!
* \brief
Modified: grass/trunk/raster/r.colors/local_proto.h
===================================================================
--- grass/trunk/raster/r.colors/local_proto.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.colors/local_proto.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -23,7 +23,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/glocale.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#define RASTER_TYPE 1
#define RASTER3D_TYPE 2
Modified: grass/trunk/raster/r.colors.out/local_proto.h
===================================================================
--- grass/trunk/raster/r.colors.out/local_proto.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.colors.out/local_proto.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/raster.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.mapcalc/globals3.h
===================================================================
--- grass/trunk/raster/r.mapcalc/globals3.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.mapcalc/globals3.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -2,7 +2,7 @@
#ifndef __GLOBALS3_H_
#define __GLOBALS3_H_
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
extern G3D_Region current_region3;
Modified: grass/trunk/raster/r.mapcalc/map3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map3.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.mapcalc/map3.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -7,7 +7,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/btree.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.mapcalc/xcoor3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xcoor3.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.mapcalc/xcoor3.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,6 +1,6 @@
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "globals.h"
#include "globals3.h"
#include "expression.h"
Modified: grass/trunk/raster/r.mapcalc/xres3.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xres3.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.mapcalc/xres3.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,6 +1,6 @@
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "globals.h"
#include "globals3.h"
#include "expression.h"
Modified: grass/trunk/raster/r.mfilter/r.mfilter.html
===================================================================
--- grass/trunk/raster/r.mfilter/r.mfilter.html 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.mfilter/r.mfilter.html 2011-08-10 16:59:42 UTC (rev 47534)
@@ -154,4 +154,4 @@
U.S.Army Construction Engineering Research Laboratory
<p>
-<i>Last changed: $Date: 2008-08-17 14:27:35 +0100 (Sun, 17 Aug 2008) $</i>
+<i>Last changed: $Date$</i>
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.to.rast3/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include <grass/config.h>
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include <grass/config.h>
Modified: grass/trunk/raster/r.univar/globals.h
===================================================================
--- grass/trunk/raster/r.univar/globals.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.univar/globals.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/raster.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.univar/r3.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r3.univar_main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster/r.univar/r3.univar_main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -18,7 +18,7 @@
#include <string.h>
#include "globals.h"
-#include "grass/G3d.h"
+#include "grass/raster3d.h"
param_type param;
zone_type zone_info;
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -21,7 +21,7 @@
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
/*- param and global variables -----------------------------------------*/
Modified: grass/trunk/raster3d/r3.gwflow/main.c
===================================================================
--- grass/trunk/raster3d/r3.gwflow/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.gwflow/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/gmath.h>
#include <grass/glocale.h>
#include <grass/N_pde.h>
Modified: grass/trunk/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.in.ascii/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define ROW_ORDER_NORTH_TO_SOUTH 1
Modified: grass/trunk/raster3d/r3.in.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.in.v5d/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.in.v5d/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -33,7 +33,7 @@
#include "binio.h"
#include "v5d.h"
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define MAX(a,b) (a > b ? a : b)
Modified: grass/trunk/raster3d/r3.info/r3.info.main.c
===================================================================
--- grass/trunk/raster3d/r3.info/r3.info.main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.info/r3.info.main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define printline(x) fprintf (out," | %-74.74s |\n",x)
Modified: grass/trunk/raster3d/r3.mask/main.c
===================================================================
--- grass/trunk/raster3d/r3.mask/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.mask/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/raster3d/r3.mkdspf/iso_surface.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/iso_surface.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.mkdspf/iso_surface.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -3,7 +3,7 @@
#include "vizual.h"
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "local_proto.h"
Modified: grass/trunk/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.mkdspf/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -44,7 +44,7 @@
#include <math.h>
#include "vizual.h"
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/raster3d/r3.mkdspf/make_header.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/make_header.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.mkdspf/make_header.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,5 +1,5 @@
#include "vizual.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
void viz_make_header(file_info * hf, double dmin, double dmax,
Modified: grass/trunk/raster3d/r3.mkdspf/r3_data.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_data.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.mkdspf/r3_data.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,5 +1,5 @@
#include "vizual.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#define NO_RESAMPLE
Modified: grass/trunk/raster3d/r3.mkdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.mkdspf/r3_find.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.mkdspf/r3_find.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -5,7 +5,7 @@
**************************************************************/
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
int g3_find_dsp_file(const char *cell, const char *file, const char *mset)
Modified: grass/trunk/raster3d/r3.null/main.c
===================================================================
--- grass/trunk/raster3d/r3.null/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.null/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.out.ascii/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define MAX(a,b) (a > b ? a : b)
Modified: grass/trunk/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.out.v5d/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include "binio.h"
#include "v5d.h"
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define MAX(a,b) (a > b ? a : b)
Modified: grass/trunk/raster3d/r3.out.vtk/errorHandling.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/errorHandling.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.out.vtk/errorHandling.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "globalDefs.h"
#include "errorHandling.h"
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "globalDefs.h"
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "globalDefs.h"
#include "writeVTKData.h"
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKHead.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "globalDefs.h"
#include "writeVTKHead.h"
Modified: grass/trunk/raster3d/r3.retile/main.c
===================================================================
--- grass/trunk/raster3d/r3.retile/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.retile/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
/*- Parameters and global variables -----------------------------------------*/
Modified: grass/trunk/raster3d/r3.showdspf/init_caps.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/init_caps.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.showdspf/init_caps.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -5,7 +5,7 @@
#include <grass/gis.h>
#include "vizual.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
/*
#define DEBUG1
*/
Modified: grass/trunk/raster3d/r3.showdspf/main_ogl.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/main_ogl.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.showdspf/main_ogl.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -16,7 +16,7 @@
*
*****************************************************************************/
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/config.h>
#define TOGGLE(x) ((x) = (x) ? 0 : 1)
Modified: grass/trunk/raster3d/r3.showdspf/make_header.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/make_header.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.showdspf/make_header.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,5 +1,5 @@
#include "vizual.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
int viz_make_header(hf, dmin, dmax, g3reg)
file_info *hf;
Modified: grass/trunk/raster3d/r3.showdspf/r3_data.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/r3_data.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.showdspf/r3_data.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,5 +1,5 @@
#include "vizual.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#define XDIMYDIM (Headfax->xdim)*(Headfax->ydim)
Modified: grass/trunk/raster3d/r3.showdspf/r3_find.c
===================================================================
--- grass/trunk/raster3d/r3.showdspf/r3_find.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.showdspf/r3_find.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -4,7 +4,7 @@
* Find the a 3dcell in the current mapset
**************************************************************/
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
int g3_find_dsp_file(cell, file, mset)
Modified: grass/trunk/raster3d/r3.stats/main.c
===================================================================
--- grass/trunk/raster3d/r3.stats/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.stats/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#define COMPARE_PRECISION 0.000000001
Modified: grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c
===================================================================
--- grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.timestamp/r3.timestamp.main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
int main(int argc, char *argv[])
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
/*- Parameters and global variables -----------------------------------------*/
Modified: grass/trunk/vector/v.to.rast3/main.c
===================================================================
--- grass/trunk/vector/v.to.rast3/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/vector/v.to.rast3/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -20,7 +20,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/glocale.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/vector.h>
#include <grass/dbmi.h>
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/vector/v.vol.rst/main.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -39,7 +39,7 @@
#include "userglobs.h"
/* include G3d defs */
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "oct.h"
#include "surf.h"
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/vector/v.vol.rst/user1.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -32,7 +32,7 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/dbmi.h>
#include <grass/vector.h>
#include <grass/bitmap.h>
Modified: grass/trunk/vector/v.vol.rst/user3.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user3.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/vector/v.vol.rst/user3.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -43,7 +43,7 @@
#include "userextern.h"
#include "userglobs.h"
#include "user.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "points.h"
#include <grass/bitmap.h>
Modified: grass/trunk/vector/v.vol.rst/userglobs.h
===================================================================
--- grass/trunk/vector/v.vol.rst/userglobs.h 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/vector/v.vol.rst/userglobs.h 2011-08-10 16:59:42 UTC (rev 47534)
@@ -1,7 +1,7 @@
#ifndef __USERGLOBS_H__
#define __USERGLOBS_H__
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/vector.h>
#include <grass/dbmi.h>
Modified: grass/trunk/vector/v.vol.rst/vector.c
===================================================================
--- grass/trunk/vector/v.vol.rst/vector.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/vector/v.vol.rst/vector.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -42,7 +42,7 @@
#include "userextern.h"
#include "userglobs.h"
#include "user.h"
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include "points.h"
int point_save(double xmm, double ymm, double zmm, double err)
Modified: grass/trunk/visualization/nviz2/cmd/volume.c
===================================================================
--- grass/trunk/visualization/nviz2/cmd/volume.c 2011-08-10 16:49:20 UTC (rev 47533)
+++ grass/trunk/visualization/nviz2/cmd/volume.c 2011-08-10 16:59:42 UTC (rev 47534)
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <string.h>
-#include <grass/G3d.h>
+#include <grass/raster3d.h>
#include <grass/glocale.h>
#include "local_proto.h"
More information about the grass-commit
mailing list