Skip to content

Commit

Permalink
update code: g3d.h has been renamed to raster3d.h
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47534 15284696-431f-4ddb-bdfa-cd5b030d7da7
  • Loading branch information
landam committed Aug 10, 2011
1 parent 845af2c commit 06df95e
Show file tree
Hide file tree
Showing 73 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion general/g.region/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/gpde/N_pde.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*****************************************************************************/

#include <grass/gis.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>
#include <grass/glocale.h>
#include <grass/gmath.h>

Expand Down
2 changes: 1 addition & 1 deletion lib/gpde/test/test_geom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/manage/do_remove.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion lib/manage/do_rename.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/ogsf/GVL2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/ogsf/Gvl3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lib/ogsf/gvl_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/G3d_intern.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/*---------------------------------------------------------------------------*/

#include <grass/G3d.h>
#include <grass/raster3d.h>
#include <grass/gis.h>

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/cache1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions lib/raster3d/cachehash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
{

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/changeprecision.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*---------------------------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/changetype.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*---------------------------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/defaults.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>
#include "G3d_intern.h"

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/filecompare.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*--------------------------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/header.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/headerinfo.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <grass/G3d.h>
#include <grass/raster3d.h>
#include "G3d_intern.h"

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/index.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/maskfn.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/open.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/open2.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <grass/gis.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*----------------------------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/region.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

#include "G3d_intern.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/retile.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*---------------------------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/rle.c
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/test/test_g3d_lib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/volume.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <unistd.h>

#include <grass/raster.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*---------------------------------------------------------------------------*/

Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/window.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <grass/gis.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>
#include "G3d_intern.h"

/*---------------------------------------------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion lib/raster3d/writeascii.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <grass/gis.h>
#include <grass/G3d.h>
#include <grass/raster3d.h>

/*!
* \brief
Expand Down
2 changes: 1 addition & 1 deletion raster/r.colors.out/local_proto.h
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion raster/r.colors/local_proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/globals3.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef __GLOBALS3_H_
#define __GLOBALS3_H_

#include <grass/G3d.h>
#include <grass/raster3d.h>

extern G3D_Region current_region3;

Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/map3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/xcoor3.c
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/xres3.c
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mfilter/r.mfilter.html
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ <h2>AUTHOR</h2>
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>
2 changes: 1 addition & 1 deletion raster/r.to.rast3/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion raster/r.to.rast3elev/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion raster/r.univar/globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion raster/r.univar/r3.univar_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.cross.rast/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 -----------------------------------------*/
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.gwflow/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.in.ascii/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.in.v5d/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.info/r3.info.main.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ int format_double(double value, char *buf);
#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)
Expand Down
2 changes: 1 addition & 1 deletion raster3d/r3.mask/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>

/*--------------------------------------------------------------------------*/
Expand Down
Loading

0 comments on commit 06df95e

Please sign in to comment.