[GRASS-SVN] r63928 - in grass/branches/releasebranch_7_0: . include include/defs lib lib/rst/interp_float vector/v.surf.rst vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jan 2 00:37:31 PST 2015
Author: martinl
Date: 2015-01-02 00:37:31 -0800 (Fri, 02 Jan 2015)
New Revision: 63928
Removed:
grass/branches/releasebranch_7_0/include/defs/site.h
grass/branches/releasebranch_7_0/include/site.h
grass/branches/releasebranch_7_0/lib/sites/
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/rst/interp_float/point2d.c
grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c
grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c
Log:
remove site.h and references to this header
(sitelib has been already removed in r62179)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927
Deleted: grass/branches/releasebranch_7_0/include/defs/site.h
===================================================================
--- grass/branches/releasebranch_7_0/include/defs/site.h 2015-01-02 08:24:50 UTC (rev 63927)
+++ grass/branches/releasebranch_7_0/include/defs/site.h 2015-01-02 08:37:31 UTC (rev 63928)
@@ -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/branches/releasebranch_7_0/include/site.h
===================================================================
--- grass/branches/releasebranch_7_0/include/site.h 2015-01-02 08:24:50 UTC (rev 63927)
+++ grass/branches/releasebranch_7_0/include/site.h 2015-01-02 08:37:31 UTC (rev 63928)
@@ -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/branches/releasebranch_7_0/lib/rst/interp_float/point2d.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/rst/interp_float/point2d.c 2015-01-02 08:24:50 UTC (rev 63927)
+++ grass/branches/releasebranch_7_0/lib/rst/interp_float/point2d.c 2015-01-02 08:37:31 UTC (rev 63928)
@@ -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/branches/releasebranch_7_0/vector/v.surf.rst/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c 2015-01-02 08:24:50 UTC (rev 63927)
+++ grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c 2015-01-02 08:37:31 UTC (rev 63928)
@@ -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) {
@@ -606,7 +603,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(¶ms, IL_grid_calc_2d, IL_matrix_create,
Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c 2015-01-02 08:24:50 UTC (rev 63927)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c 2015-01-02 08:37:31 UTC (rev 63928)
@@ -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>
More information about the grass-commit
mailing list