[GRASS-SVN] r63927 - in grass/trunk: include include/defs lib/rst/interp_float vector/v.surf.rst vector/v.vol.rst

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-02 00:24:50 -0800 (Fri, 02 Jan 2015)
New Revision: 63927

Removed:
   grass/trunk/include/defs/site.h
   grass/trunk/include/site.h
Modified:
   grass/trunk/lib/rst/interp_float/point2d.c
   grass/trunk/vector/v.surf.rst/main.c
   grass/trunk/vector/v.vol.rst/main.c
Log:
remove site.h and references to this header
(sitelib has been already removed in r62179)


Deleted: grass/trunk/include/defs/site.h
===================================================================
--- grass/trunk/include/defs/site.h	2015-01-02 08:22:48 UTC (rev 63926)
+++ grass/trunk/include/defs/site.h	2015-01-02 08:24:50 UTC (rev 63927)
@@ -1,29 +0,0 @@
-#ifndef GRASS_SITEDEFS_H
-#define GRASS_SITEDEFS_H
-
-/* Old version used by v.in.sites */
-FILE *G_oldsites_open_old(const char *, const char *);
-int G_oldsite_describe(FILE *, int *, int *, int *, int *);
-int G_oldsite_get(FILE *, Site *);
-
-/*!
-  \todo Update modules which are still using sites library. 
-  After that all the function below could be removed
-*/
-/* The same for old and new, format independent */
-Site *G_site_new_struct(RASTER_MAP_TYPE, int, int, int);
-void G_site_free_struct(Site *);
-int G_site_in_region(const Site *, const struct Cell_head *);
-/* New version based on vectors used in old, not updated sites modules */
-int G_site_get(struct Map_info *, Site *);
-int G_site_put(struct Map_info *, const Site *);
-int G_site_describe(struct Map_info *, int *, int *, int *,
-		    int *);
-int G_site_put_head(struct Map_info *, Site_head *);
-struct Map_info *G_sites_open_old(const char *, const char *);
-struct Map_info *G_sites_open_new(const char *);
-
-struct Map_info *G_fopen_sites_old(const char *, const char *);
-struct Map_info *G_fopen_sites_new(const char *);
-
-#endif

Deleted: grass/trunk/include/site.h
===================================================================
--- grass/trunk/include/site.h	2015-01-02 08:22:48 UTC (rev 63926)
+++ grass/trunk/include/site.h	2015-01-02 08:24:50 UTC (rev 63927)
@@ -1,65 +0,0 @@
-#ifndef GRASS_SITE_H
-#define GRASS_SITE_H
-
-#include <grass/raster.h>
-#include <grass/vector.h>
-
-#define MAX_SITE_STRING 1024
-#define MAX_SITE_LEN 4096
-
-typedef struct
-{
-    double east, north;
-    double *dim;
-    int dim_alloc;
-    RASTER_MAP_TYPE cattype;
-    CELL ccat;
-    FCELL fcat;
-    DCELL dcat;
-    int str_alloc;
-    char **str_att;
-    int dbl_alloc;
-    double *dbl_att;
-} Site;
-
-typedef struct
-{
-    const char *name, *desc, *form, *labels, *stime;
-    struct TimeStamp *time;
-} Site_head;
-
-
-/* Some defines for which column type to use */
-#define SITE_COL_NUL 0
-#define SITE_COL_DIM 1
-#define SITE_COL_DBL 2
-#define SITE_COL_STR 3
-
-/*!
-  \brief XYZ site struct.
-
-  Note the use of a union for the cat value is different than the Site
-  struct.
-*/
-typedef struct
-{
-    double x, y, z;
-    RASTER_MAP_TYPE cattype;
-    union
-    {
-	double d;
-	float f;
-	int c;
-    } cat;
-} SITE_XYZ;
-
-
-struct zstruct
-{
-    double x, y, z;
-};
-typedef struct zstruct Z;
-
-#include <grass/defs/site.h>
-
-#endif

Modified: grass/trunk/lib/rst/interp_float/point2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/point2d.c	2015-01-02 08:22:48 UTC (rev 63926)
+++ grass/trunk/lib/rst/interp_float/point2d.c	2015-01-02 08:24:50 UTC (rev 63927)
@@ -26,7 +26,6 @@
 #include <math.h>
 #include <unistd.h>
 #include <grass/gis.h>
-#include <grass/site.h>
 #include <grass/vector.h>
 #include <grass/dbmi.h>
 

Modified: grass/trunk/vector/v.surf.rst/main.c
===================================================================
--- grass/trunk/vector/v.surf.rst/main.c	2015-01-02 08:22:48 UTC (rev 63926)
+++ grass/trunk/vector/v.surf.rst/main.c	2015-01-02 08:24:50 UTC (rev 63927)
@@ -29,7 +29,6 @@
 #include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/dbmi.h>
-#include <grass/site.h>
 #include <grass/glocale.h>
 #include <grass/linkm.h>
 #include <grass/bitmap.h>
@@ -115,7 +114,7 @@
     double x_orig, y_orig, dnorm, deltx, delty, xm, ym;
     char dmaxchar[200];
     char dminchar[200];
-    Site_head inhead;
+
     struct quaddata *data;
     struct multfunc *functions;
     struct multtree *tree;
@@ -556,8 +555,6 @@
     /* If anyone is ever motivated to add it, the Plus_head struct has   */
     /*  'long coor_mtime' and dig_head has 'char *date; char *source_date;' */
     /*   which could be read in.                                         */
-    inhead.time = (struct TimeStamp *)NULL;
-    inhead.stime = NULL;
 
     if (devi != NULL || cvdev != NULL) {
 
@@ -609,7 +606,7 @@
 		      SCIK1, SCIK2, SCIK3, rsm, elev, slope, aspect, pcurv,
 		      tcurv, mcurv, dmin, x_orig, y_orig, deriv, theta,
 		      scalex, Tmp_fd_z, Tmp_fd_dx, Tmp_fd_dy, Tmp_fd_xx,
-		      Tmp_fd_yy, Tmp_fd_xy, devi, inhead.time, cv,
+		      Tmp_fd_yy, Tmp_fd_xy, devi, NULL, cv,
 		      parm.wheresql->answer);
 
     IL_init_func_2d(&params, IL_grid_calc_2d, IL_matrix_create,

Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c	2015-01-02 08:22:48 UTC (rev 63926)
+++ grass/trunk/vector/v.vol.rst/main.c	2015-01-02 08:24:50 UTC (rev 63927)
@@ -34,7 +34,6 @@
 
 #include <grass/gis.h>
 #include <grass/raster.h>
-#include <grass/site.h>
 #include <grass/vector.h>
 #include <grass/bitmap.h>
 #include <grass/dbmi.h>