[GRASS-SVN] r49207 - in grass/trunk/include: . Make defs vect
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Nov 14 02:40:04 EST 2011
Author: martinl
Date: 2011-11-13 23:40:04 -0800 (Sun, 13 Nov 2011)
New Revision: 49207
Removed:
grass/trunk/include/Paintlib.h
grass/trunk/include/V_.h
grass/trunk/include/bdlg_bm.h
grass/trunk/include/defs/dlg.h
grass/trunk/include/defs/ibtree.h
grass/trunk/include/defs/icon.h
grass/trunk/include/defs/libtrans.h
grass/trunk/include/defs/sitelib.h
grass/trunk/include/defs/transform.h
grass/trunk/include/devlib.h
grass/trunk/include/dig_atts.h
grass/trunk/include/dlg.h
grass/trunk/include/dlg_bm.h
grass/trunk/include/help.h
grass/trunk/include/ibtree.h
grass/trunk/include/icon.h
grass/trunk/include/icon_bm.h
grass/trunk/include/label_bm.h
grass/trunk/include/libtrans.h
grass/trunk/include/lock.h
grass/trunk/include/patterns.h
grass/trunk/include/region_bm.h
grass/trunk/include/shhopt.h
grass/trunk/include/sitelib.h
grass/trunk/include/std_incs.h
grass/trunk/include/transform.h
Modified:
grass/trunk/include/Make/Doxyfile_arch_html.in
grass/trunk/include/Make/Doxyfile_arch_latex.in
grass/trunk/include/defs/gis.h
grass/trunk/include/defs/site.h
grass/trunk/include/defs/vector.h
grass/trunk/include/gis.h
grass/trunk/include/site.h
grass/trunk/include/vect/dig_structs.h
Log:
clean up include files
remove unused headers
update doxygen conf files (exlude)
Modified: grass/trunk/include/Make/Doxyfile_arch_html.in
===================================================================
--- grass/trunk/include/Make/Doxyfile_arch_html.in 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/Make/Doxyfile_arch_html.in 2011-11-14 07:40:04 UTC (rev 49207)
@@ -456,10 +456,23 @@
dist. at ARCH@ \
doc \
general \
- gui/wxpython/vdigit \
- gui/wxpython/nviz \
+ gui/scripts \
+ gui/wxpython/compat \
+ gui/wxpython/icons \
+ gui/wxpython/scripts \
+ gui/wxpython/tools \
imagery \
+ include/defs \
+ lib/btree/test \
+ lib/db/dbmi_base/test \
+ lib/db/sqlp/test \
+ lib/gmath/test \
+ lib/gpde/test \
+ lib/linkm/test \
+ lib/raster3d/test \
lib/python/ctypes \
+ lib/vector/dglib/examples \
+ lib/vector/rtree/docs \
locale \
macosx \
man \
@@ -471,6 +484,7 @@
rpm \
scripts \
sites \
+ temporal \
testsuite \
tools \
vector \
@@ -485,7 +499,7 @@
# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
# certain files from those directories.
-EXCLUDE_PATTERNS = *defs.h
+EXCLUDE_PATTERNS =
# The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see
Modified: grass/trunk/include/Make/Doxyfile_arch_latex.in
===================================================================
--- grass/trunk/include/Make/Doxyfile_arch_latex.in 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/Make/Doxyfile_arch_latex.in 2011-11-14 07:40:04 UTC (rev 49207)
@@ -17,13 +17,13 @@
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = GRASS
+PROJECT_NAME = "GRASS Programmer's Manual"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = @GRASS_VERSION_MAJOR at .@GRASS_VERSION_MINOR at .@GRASS_VERSION_RELEASE@ (@GRASS_VERSION_DATE@)
+PROJECT_NUMBER = @GRASS_VERSION_MAJOR at .@GRASS_VERSION_MINOR at .@GRASS_VERSION_RELEASE@ (@GRASS_VERSION_DATE@) - r at GRASS_VERSION_SVN@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
@@ -434,7 +434,7 @@
FILE_PATTERNS = *.h \
*.c \
- *.i \
+ *.i \
*.py \
*.dox
@@ -456,11 +456,23 @@
dist. at ARCH@ \
doc \
general \
- gui/wxpython/vdigit \
- gui/wxpython/nviz \
+ gui/scripts \
+ gui/wxpython/compat \
+ gui/wxpython/icons \
+ gui/wxpython/scripts \
+ gui/wxpython/tools \
imagery \
- include \
+ include/defs \
+ lib/btree/test \
+ lib/db/dbmi_base/test \
+ lib/db/sqlp/test \
+ lib/gmath/test \
+ lib/gpde/test \
+ lib/linkm/test \
+ lib/raster3d/test \
lib/python/ctypes \
+ lib/vector/dglib/examples \
+ lib/vector/rtree/docs \
locale \
macosx \
man \
@@ -472,6 +484,7 @@
rpm \
scripts \
sites \
+ temporal \
testsuite \
tools \
vector \
@@ -512,7 +525,7 @@
# directories that contain image that are included in the documentation (see
# the \image command).
-IMAGE_PATH =
+IMAGE_PATH = .
# The INPUT_FILTER tag can be used to specify a program that doxygen should
# invoke to filter for each input file. Doxygen will invoke the filter program
@@ -615,7 +628,7 @@
# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
-HTML_OUTPUT =
+HTML_OUTPUT =
# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
Deleted: grass/trunk/include/Paintlib.h
===================================================================
--- grass/trunk/include/Paintlib.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/Paintlib.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,6 +0,0 @@
-#ifndef GRASS_PAINTLIB_H
-#define GRASS_PAINTLIB_H
-
-#include <grass/defs/paintlib.h>
-
-#endif
Deleted: grass/trunk/include/V_.h
===================================================================
--- grass/trunk/include/V_.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/V_.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,45 +0,0 @@
-#ifndef GRASS_VLIB_V_H
-#define GRASS_VLIB_V_H
-#ifndef _STDIO_H
-#include "stdio.h"
-#endif
-#include <grass/vector.h>
-
-
-#define MODE_READ 0
-#define MODE_WRITE 1
-#define MODE_RW 2
-
-#define VECT_OPEN_CODE 0x5522AA22
-#define VECT_CLOSED_CODE 0x22AA2255
-
-#define LEVEL_1 1
-#define LEVEL_2 2
-#define LEVEL_3 3
-
-#define VECT_OPEN(Map) (Map->open == VECT_OPEN_CODE)
-
-
-/* no longer used */
-struct V_info
-{
- int Level; /* 0 means unused */
- int RW; /* 0 read, 1 write, 2, update */
-
- char *name;
- char *mapset;
-
- FILE *fp;
- FILE *att_fp;
-
- char *tmp_name_dig; /* temp not yet implemented */
- char *tmp_name_att;
- FILE *tmp_fp;
- FILE *tmp_att_fp;
-
- struct dig_head Head;
-
- struct Map_info Map;
-};
-
-#endif
Deleted: grass/trunk/include/bdlg_bm.h
===================================================================
--- grass/trunk/include/bdlg_bm.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/bdlg_bm.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#define bdlg_bm_width 36
-#define bdlg_bm_height 24
-static char bdlg_bm_bits[] = {
- 0xf8, 0xff, 0x03, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
- 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
- 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x07, 0x00, 0xfc, 0xff, 0x0f, 0x01,
- 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x05, 0x00, 0x00,
- 0x0a, 0x08, 0x09, 0x01, 0x00, 0x09, 0x08, 0x09, 0x00, 0x00, 0xc9, 0x08,
- 0x39, 0x35, 0xc0, 0x29, 0x09, 0x49, 0x49, 0x20, 0x29, 0x09, 0x49, 0x49,
- 0x2f, 0x29, 0x09, 0x49, 0x49, 0x20, 0x29, 0x09, 0x49, 0x49, 0x20, 0x29,
- 0x09, 0x31, 0x49, 0xc0, 0xc8, 0x08, 0x01, 0x00, 0x00, 0x00, 0x09, 0x01,
- 0x00, 0x00, 0x20, 0x09, 0x01, 0x00, 0x00, 0xc0, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0x0f
-};
Deleted: grass/trunk/include/defs/dlg.h
===================================================================
--- grass/trunk/include/defs/dlg.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/dlg.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,25 +0,0 @@
-#ifndef GRASS_DLGDEFS_H
-#define GRASS_DLGDEFS_H
-
-int dlg_init(FILE *, struct dlg *);
-int dlg_read(FILE *, struct dlg *);
-int _dlg_read_node(struct dlg_node *, FILE *);
-int _dlg_read_area(struct dlg_area *, FILE *);
-int _dlg_read_line(struct dlg_line *, FILE *);
-int _dlg_write_area(struct dlg_area *, FILE *);
-int dlg_write_header(FILE *, struct dlg *);
-int _dlg_write_line(struct dlg_line *, FILE *);
-int _dlg_write_node(struct dlg_node *, FILE *);
-int dlg_read_whole_area(FILE *, struct dlg *, int, double **, double **,
- int *, int *);
-int dlg_read_area(FILE *, struct dlg *, int);
-int dlg_read_line(FILE *, struct dlg *, int);
-int dlg_read_node(FILE *, struct dlg *, int);
-int dlg_read_int(FILE *, int, int **);
-int dlg_write_int(FILE *, int, int *);
-int dlg_write_double(FILE *, int, double *);
-int dlg_write_area(FILE *, struct dlg *, int);
-int dlg_write_line(FILE *, struct dlg *, int);
-int dlg_write_node(FILE *, struct dlg *, int);
-
-#endif
Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/gis.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -470,6 +470,7 @@
struct Flag *G_define_flag(void);
struct Option *G_define_option(void);
struct Option *G_define_standard_option(int);
+struct Flag *G_define_standard_flag(int);
int G_parser(int, char **);
void G_usage(void);
char *G_recreate_command(void);
Deleted: grass/trunk/include/defs/ibtree.h
===================================================================
--- grass/trunk/include/defs/ibtree.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/ibtree.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#ifndef GRASS_IBTREEDEFS_H
-#define GRASS_IBTREEDEFS_H
-
-int ibtree_create(IBTREE *, int (*)(), int);
-int ibtree_find(IBTREE *, int, int *);
-int ibtree_free(IBTREE *);
-int ibtree_next(IBTREE *, int *, int *);
-int ibtree_rewind(IBTREE *);
-int Btree_init();
-int Btree_add(int);
-int Btree_report();
-int ibtree_update(IBTREE *, int, int);
-
-#endif
Deleted: grass/trunk/include/defs/icon.h
===================================================================
--- grass/trunk/include/defs/icon.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/icon.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#ifndef GRASS_ICONDEFS_H
-#define GRASS_ICONDEFS_H
-
-char *ask_icon_any(char *, char *, int);
-char *ask_icon_new(char *, char *);
-char *ask_icon_old(char *, char *);
-int get_icon(char *, char *, ICON *);
-int get_default_icon(ICON *);
-int put_icon(char *, ICON *);
-int read_icon(FILE *, ICON *);
-int release_icon(ICON *);
-int scale_icon(ICON *, ICON *, float);
-int write_icon(FILE *, ICON *, int);
-#endif
Deleted: grass/trunk/include/defs/libtrans.h
===================================================================
--- grass/trunk/include/defs/libtrans.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/libtrans.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,22 +0,0 @@
-#ifndef GRASS_LIBTRANSDEFS_H
-#define GRASS_LIBTRANSDEFS_H
-
-/* inverse.c */
-int inverse(double[DIM_matrix][DIM_matrix]);
-int isnull(double[DIM_matrix][DIM_matrix]);
-
-/* m_mult.c */
-int m_mult(double[DIM_matrix][DIM_matrix], double *, double *);
-
-/* transform.c */
-int compute_transformation_coef(double *, double *, double *, double *, int *,
- int);
-int transform_a_into_b(double, double, double *, double *);
-int transform_b_into_a(double, double, double *, double *);
-int residuals_a_predicts_b(double *, double *, double *, double *, int *, int,
- double *, double *);
-int residuals_b_predicts_a(double *, double *, double *, double *, int *, int,
- double *, double *);
-int print_transform_matrix(void);
-
-#endif /* GRASS_LIBTRANSDEFS_H */
Modified: grass/trunk/include/defs/site.h
===================================================================
--- grass/trunk/include/defs/site.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/site.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,69 +1,29 @@
#ifndef GRASS_SITEDEFS_H
#define GRASS_SITEDEFS_H
-/* Allocate 'num' SITE_XYZ structs. Returns NULL on failure */
-SITE_XYZ *G_alloc_site_xyz(size_t);
-
-/* Free the array of SITE_XYZ struct */
-void G_free_site_xyz(SITE_XYZ *);
-
-/* G_readsites_xyz: Reads a sites file converting to a site struct of xyz
- * values and the cat value. The Z value can come from one of the
- * n-dimensions, a double attribute, or a string attribute converted to a
- * double with strtod(). The 'size' must not be greater than the number
- * of elements in the SITE_XYZ array, or bad things will happen. The number
- * of records read is returned or EOF on end of file. NOTE: EOF won't be
- * returned unless no records are read and the EOF bit is set. It's safe
- * to assume that if the number of records read is less than the size of
- * the array, that there aren't any more records.
- */
-int G_readsites_xyz(FILE *, /* The FILE stream to the sites file */
- int, /* Attribute type: SITE_COL_DIM, etc... */
- int, /* The field index (1 based) for the attribute */
- int, /* Size of the array */
- struct Cell_head *, /* Respect region if not NULL */
- SITE_XYZ * xyz /* The site array of size 'size' */
- );
-
-int G_readsites(FILE *, int, int, int, struct Cell_head *, Z **);
-
-/* The same for old and new, format independent */
-Site *G_site_new_struct(RASTER_MAP_TYPE cattype, int ndim, int ns, int nd);
-void G_site_free_struct(Site * s);
-int G_site_in_region(const Site * s, const struct Cell_head *region);
-int G_site_d_cmp(const void *a, const void *b);
-int G_site_c_cmp(const void *a, const void *b);
-int G_site_s_cmp(const void *a, const void *b);
-char *G_site_format(const Site * s, const char *fs, int id);
-
-/* struct site_att * G_sites_get_atts (struct Map_info * ptr, int* cat); */
-int G_sites_get_fields(struct Map_info *ptr, char ***cnames, int **ctypes,
- int **ndx);
-void G_sites_free_fields(int ncols, char **cnames, int *ctypes, int *ndx);
-
/* Old version used by v.in.sites */
-FILE *G_oldsites_open_old(const char *name, const char *mapset);
-int G_oldsite_describe(FILE * p, int *dims, int *cat, int *strs, int *dbls);
-int G_oldsite_get(FILE * p, Site * s);
-int G__oldsite_get(FILE *, Site *, int);
+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 *p, Site * s);
-int G_site_put(struct Map_info *p, const Site * s);
-int G_site_describe(struct Map_info *p, int *dims, int *cat, int *strs,
- int *dbls);
-int G_site_get_head(struct Map_info *p, Site_head * head);
-int G_site_put_head(struct Map_info *p, Site_head * head);
-struct Map_info *G_sites_open_old(const char *name, const char *mapset);
-struct Map_info *G_sites_open_new(const char *name);
-void G_sites_close(struct Map_info *);
-const char *G_find_sites(char *name, const char *mapset);
-const char *G_find_sites2(const char *name, const char *mapset);
-int G__site_put(struct Map_info *, Site *, int);
+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 *);
-int G_get_site(struct Map_info *, double *, double *, char **);
-int G_put_site(struct Map_info *, double, double, const char *);
#endif
Deleted: grass/trunk/include/defs/sitelib.h
===================================================================
--- grass/trunk/include/defs/sitelib.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/sitelib.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,133 +0,0 @@
-#ifndef GRASS_SITELIBDEFS_H
-#define GRASS_SITELIBDEFS_H
-
-/* announce.c */
-int announce(char *);
-
-/* ask_quad.c */
-int ask_quad(int *);
-
-/* center.c */
-int center(char *, int);
-
-/* chain.c */
-int chain(char *);
-
-/* copy_sites.c */
-int copy_sites(SITE_LIST *, SITE_LIST *, int);
-
-/* copyfile.c */
-int copyfile(char *, char *);
-
-/* count_site.c */
-int count_sites(SITE_LIST *, int);
-
-/* counter.c */
-int counter_reset(char *, int);
-int counter(int);
-
-/* die.c */
-int die(char *);
-
-/* eq_sites.c */
-int equal_sites(SITE_LIST *, SITE_LIST *);
-
-/* execute.c */
-int execute(char *);
-
-/* hitreturn.c */
-int hitreturn(void);
-
-/* maximum.c */
-int maximum(register int *, int);
-
-/* memcopy.c */
-int memcopy(char *, char *, int);
-
-#ifdef MENU
-/* menu_hndlr.c */
-int menu_handler(MENU, char *);
-#endif
-
-/* meta_reprt.c */
-int meta_report(char *, char *, char *, int, int);
-
-/* parse.c */
-int parse(char *, char *[], int, char *);
-
-/* read_sites.c */
-int read_site_list(SITE_LIST *, FILE *);
-int get_site_list(SITE_LIST *, char *);
-
-/* region.c */
-char *format_res(double, char *, int);
-char *format_east(double, char *, int);
-char *format_north(double, char *, int);
-int scan_north(char *, double *);
-int scan_east(char *, double *);
-int scan_res(char *, double *);
-
-#ifdef REPORT
-/* report.c */
-REPORT *report_open(char *);
-REPORT *report_open_ref(char *, REPORT *);
-int report_close(REPORT *);
-int report_read(REPORT *);
-int report_record(REPORT *, char *);
-int report_read_record(REPORT *, char *);
-int report_scan(REPORT *);
-int report_matrix(REPORT *);
-
-/* rprt_finds.c */
-rprt_finds.c:int report_find_layer(REPORT *, int);
-rprt_finds.c:int report_find_cat(REPORT *, int, int);
-rprt_finds.c:int report_find_point(REPORT *, int);
-rprt_finds.c:int report_find_data(REPORT *, int, int);
-
-/* rprt_seeks.c */
-rprt_seeks.c:int report_seek_layers(REPORT *);
-rprt_seeks.c:int report_seek_points(REPORT *);
-rprt_seeks.c:int report_seek_cats(REPORT *);
-rprt_seeks.c:int report_seek_data(REPORT *);
-#endif
-
-/* rpt_screen.c */
-int new_report_screen(void);
-
-/* scan_int.c */
-int scan_int(char *, int *);
-
-/* scn_double.c */
-int scan_double(char *, double *);
-
-/* scopy.c */
-int scopy(char *, char *, int);
-
-/* site.c */
-int add_site(SITE_LIST *, double, double, char *);
-int initialize_site_list(SITE_LIST *);
-int rewind_site_list(SITE_LIST *);
-int next_site(SITE_LIST *, double *, double *, char **);
-int free_site_list(SITE_LIST *);
-
-/* sort_int.c */
-int sort_int(int[], int, int);
-
-/* trace.c */
-int trace(int);
-
-/* ut_to_cell.c */
-float northing_to_row(double, struct Cell_head *);
-float easting_to_col(double, struct Cell_head *);
-
-/* within_wnd.c */
-int within_window(double, double, struct Cell_head *);
-
-/* write_site.c */
-int put_site_list(SITE_LIST *, char *, int, int);
-int write_site_list(SITE_LIST *, FILE *, int, int);
-
-/* yes.c */
-int yes(char *);
-
-#endif
Deleted: grass/trunk/include/defs/transform.h
===================================================================
--- grass/trunk/include/defs/transform.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/transform.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,21 +0,0 @@
-#ifndef GRASS_TRANSFORMDEFS_H
-#define GRASS_TRANSFORMDEFS_H
-
-/* inverse.c */
-int inverse(double[DIM_matrix][DIM_matrix]);
-int isnull(double[DIM_matrix][DIM_matrix]);
-
-/* m_mult.c */
-int m_mult(double[DIM_matrix][DIM_matrix], double *, double *);
-
-/* transform.c */
-int compute_transformation_coef(double *, double *, double *, double *, int *,
- int);
-int transform_a_into_b(double, double, double *, double *);
-int transform_b_into_a(double, double, double *, double *);
-int residuals_a_predicts_b(double *, double *, double *, double *, int *, int,
- double *, double *);
-int residuals_b_predicts_a(double *, double *, double *, double *, int *, int,
- double *, double *);
-
-#endif
Modified: grass/trunk/include/defs/vector.h
===================================================================
--- grass/trunk/include/defs/vector.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/defs/vector.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -230,14 +230,16 @@
int Vect_get_built(const struct Map_info *);
int Vect_build_partial(struct Map_info *, int);
int Vect_set_constraint_region(struct Map_info *, double, double, double,
- double, double, double);
+ double, double, double);
int Vect_set_constraint_type(struct Map_info *, int);
-int Vect_remove_constraints(struct Map_info *);
+int Vect_set_constraint_field(struct Map_info *, int);
+void Vect_remove_constraints(struct Map_info *);
int Vect_rewind(struct Map_info *);
int Vect_close(struct Map_info *);
/* Read/write lines, nodes, areas */
/* Level 1 and 2 */
+int Vect_get_next_line_id(const struct Map_info *);
int Vect_read_next_line(const struct Map_info *, struct line_pnts *,
struct line_cats *);
off_t Vect_write_line(struct Map_info *, int, const struct line_pnts *,
Deleted: grass/trunk/include/devlib.h
===================================================================
--- grass/trunk/include/devlib.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/devlib.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,66 +0,0 @@
-int Box_abs(int, int, int, int);
-int Box_rel(int, int);
-int Color_table_float(void);
-int Color_table_fixed(void);
-int _get_lookup_for_color(int, int, int);
-int get_table_type(void);
-int Color(int);
-int RGB_color(unsigned char, unsigned char, unsigned char);
-int _get_color_index(int);
-int _get_color_index_array(int *, int);
-int Standard_color(int);
-int Color_offset(int);
-int get_color_offset(void);
-int Cont_abs(int, int);
-int Cont_rel(int, int);
-int Erase(void);
-int Font(char *);
-int Get_text_box(char *, int *, int *, int *, int *);
-int Linemod(char *);
-int Move_abs(int, int);
-int Get_current_xy(int *, int *);
-int Move_rel(int, int);
-int Number_of_colors(int *);
-int Polydots_abs(int *, int *, int);
-int Polydots_rel(int *, int *, int);
-int Polyline_abs(int *, int *, int);
-int Polyline_rel(int *, int *, int);
-int Polygon_rel(int *, int *, int);
-int Set_RGB_color(unsigned char, unsigned char, unsigned char);
-int RGB_raster(int, int, register unsigned char *, register unsigned char *,
- register unsigned char *, int);
-int Raster_char(int, int, unsigned char *, int, int);
-int Raster_int_def(int, int, int *, int, int);
-int Raster_int(int, int, int *, int, int);
-int Reset_colors(int, int, unsigned char *, unsigned char *, unsigned char *);
-int Reset_color(unsigned char, unsigned char, unsigned char, int);
-void close_mon(void);
-int Set_window(int, int, int, int);
-int window_clip(double *, double *, double *, double *);
-int window_box_clip(double *, double *, double *, double *);
-int Text(char *);
-int Text_size(int, int);
-int Text_rotation(float);
-int clip(register double, register double, register double, register double,
- register double *, register double *, register double *,
- register double *);
-int assign_fixed_color(int, int);
-int get_fixed_color(int);
-int get_fixed_color_array(register int *, register int);
-int assign_standard_color(int, int);
-int get_standard_color(int);
-int get_max_std_colors(void);
-int get_connection(char *, int *, int *);
-int prepare_connection(void);
-int check_connection(char *, char *;
- int init_font(char *);
- int get_char_vects(unsigned char, int *,
- unsigned char **, unsigned char **);
- int drawchar(double, double, register double,
- register double, char);
- int soft_text_ext(int, int, double, double, double,
- char *);
- int get_text_ext(int *, int *, int *, int *);
- int soft_text(int, int, double, double, double, char *);
- int onechar(int, int, double, double, double,
- register char);
Deleted: grass/trunk/include/dig_atts.h
===================================================================
--- grass/trunk/include/dig_atts.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/dig_atts.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,59 +0,0 @@
-#ifndef _STDIO_H
-#include <stdio.h>
-#endif
-
-/*
- #define WRITE_ATT_FORMAT "%c %12.2lf %12.2lf %8d"
- #define WRITE_ATT_FORMAT "%c %14.2lf %14.2lf %7d"
- */
-#define WRITE_ATT_FORMAT "%c %14s %14s %10d"
-#define FlSIZ 14
-#define READ_ATT_FORMAT "%c %lf %lf %d"
-
-/* only types allowed in atts file
- * A - area, L - line, P - point
- */
-#define ATT_TYPES "LAP"
-
-/* removed Jun 25 1991 dpg
- #define LINE 0
- #define AREA 1
- #define DOT 2
- #define DEAD_LINE 4
- #define DEAD_AREA 5
- #define DEAD_DOT 6
- */
-
-struct attribute
-{
- char type;
- double x;
- double y;
- int cat;
- long offset;
-};
-
-
-struct atts_index
-{
- long *area_off;
- long *line_off;
- long *point_off;
- int area_alloc;
- int line_alloc;
- int point_alloc;
- int max_areas;
- int max_lines;
- int max_points;
- int max_atts;
-};
-
-int atts_init(FILE *, struct atts_index *);
-int free_atts(struct atts_index *);
-int read_area_att(FILE *, struct atts_index *, struct attribute *, int);
-int read_line_att(FILE *, struct atts_index *, struct attribute *, int);
-int read_att_struct(FILE *, struct attribute *);
-int read_att(FILE *, char *, double *, double *, int *, long *);
-int write_att(FILE *, char, double, double, int);
-int write_att_struct(FILE *, struct attribute *);
-int write_att_line(FILE *, double *, double *, int, int);
Deleted: grass/trunk/include/dlg.h
===================================================================
--- grass/trunk/include/dlg.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/dlg.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,132 +0,0 @@
-#ifndef GRASS_DLG_H
-#define GRASS_DLG_H
-
-struct dlg_node
-{
- double x;
- double y;
- int n_lines;
- int n_atts;
- int n_lines_alloc;
- int n_atts_alloc;
- int *lines;
- int *atts;
-};
-
-struct dlg_area
-{
- double x;
- double y;
- int n_lines;
- int n_atts;
- int n_isles;
- int n_lines_alloc;
- int n_atts_alloc;
- int *lines;
- int *atts;
-};
-
-struct dlg_line
-{
- int start_node;
- int end_node;
- int left_area;
- int right_area;
- int n_coors;
- int n_atts;
- int n_coors_alloc;
- int n_atts_alloc;
- int *atts;
- double *coors;
- double N;
- double S;
- double E;
- double W;
-};
-
-struct dlg_head
-{
- int nlines;
- char banner[73];
- char cart_unit[41];
- char source_date[11];
- char orig_scale[9];
- char line_3[73];
- int level_code;
- int plani_code;
- int plani_zone;
- int plani_units;
- double resolution;
- int trans_param;
- int misc_records;
- int num_sides;
- int num_cats;
-};
-
-struct dlg_coors
-{
- double lat[4];
- double lon[4];
- double utm_n[4];
- double utm_e[4];
-};
-
-struct dlg_proj
-{
- double params[15];
- double int_params[4];
-};
-
-struct dlg_cats
-{
- int read;
- char name[21];
- int form_code;
- int num_nodes;
- int act_nodes;
- int nta_link;
- int ntl_link;
- int num_areas;
- int act_areas;
- int atn_link;
- int atl_link;
- int area_list;
- int num_lines;
- int act_lines;
- int line_list;
-};
-
-struct dlg
-{
- struct dlg_head head;
- struct dlg_cats cats;
- struct dlg_coors coors;
- struct dlg_proj proj;
- struct dlg_line line;
- struct dlg_area area;
- struct dlg_node node;
- long *node_off;
- long *area_off;
- long *line_off;
- int node_alloc;
- int area_alloc;
- int line_alloc;
- int max_nodes;
- int max_areas;
- int max_lines;
-};
-
-#define SW 0
-#define NW 1
-#define NE 2
-#define SE 3
-
-/* this will be stored as a double on mass, sun and 3b2's */
-#define ISLAND_MARKER -99999999.
-
-/* Need a definition for FILE */
-#include <stdio.h>
-
-#include <grass/defs/dlg.h>
-
-#endif
Deleted: grass/trunk/include/dlg_bm.h
===================================================================
--- grass/trunk/include/dlg_bm.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/dlg_bm.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#define dlg_bm_width 36
-#define dlg_bm_height 24
-static char dlg_bm_bits[] = {
- 0xf8, 0xff, 0x03, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
- 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
- 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x07, 0x00, 0xfc, 0xff, 0x0f, 0x01,
- 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x05,
- 0x00, 0x08, 0x01, 0x80, 0x04, 0x00, 0x08, 0x01, 0x80, 0x64, 0x00, 0x08,
- 0x01, 0xe0, 0x94, 0x00, 0x08, 0x01, 0x90, 0x94, 0x00, 0x08, 0x01, 0x90,
- 0x94, 0x00, 0x08, 0x01, 0x90, 0x94, 0x00, 0x08, 0x01, 0x90, 0x94, 0x00,
- 0x08, 0x01, 0x60, 0x64, 0x00, 0x08, 0x01, 0x00, 0x80, 0x00, 0x08, 0x01,
- 0x00, 0x90, 0x00, 0x08, 0x01, 0x00, 0x60, 0x00, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0x0f
-};
Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/gis.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -162,7 +162,7 @@
# define G_DEV_NULL "/dev/null"
#endif
- /**/ typedef enum
+/**/ typedef enum
{
G_OPT_UNDEFINED,
G_OPT_DB_WHERE, /* SQL where conditions */
@@ -225,6 +225,12 @@
G_OPT_M_DIR, /* directory input */
} STD_OPT;
+/**/ typedef enum
+{
+ G_FLG_UNDEFINED,
+ G_FLG_DB_TABLE, /* do not create table */
+} STD_FLG;
+
/* Message format */
#define G_INFO_FORMAT_STANDARD 0 /* GRASS_MESSAGE_FORMAT=standard or not defined */
#define G_INFO_FORMAT_GUI 1 /* GRASS_MESSAGE_FORMAT=gui */
Deleted: grass/trunk/include/help.h
===================================================================
--- grass/trunk/include/help.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/help.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,22 +0,0 @@
-#define RECLASS_WIDGET_HELP \
-"This widget is used to reclassify a raster map."
-#define PIXEL_WIDGET_HELP \
-"This widget is used to adjust a single color by manipulating the components of the color in one of three color schemes, RGB, HSV, or CMY."
-#define GENERIC_LABEL_HELP \
-"Labels have no actions associated with them."
-#define GENERIC_SCALE_HELP \
-"Press the left mouse button on the scale handle and drag the mouse to adjust the scale value, or click the left mouse button in the darker area of the scale to increment the scale value."
-
-#define LIST_EXTENDED_SELECT_HELP \
-"Pressing BSelect (Button 1) selects it and deselects any other selected item. \012\
-Dragging BSelect or pressing and dragging BExtend (Shift + Button1) following \012\
-a BSelect action selects all items between the item under the pointer and the \012\
-item on which BSelect was pressed. This action also deselects any other \012\
-selected items out side that range. Extended Select also allows the user to \012\
-select and deselect discontiguous ranges of items. Pressing BToggle (Control \012\
-+ Button 1) on an item toggles its selection state but does not deselect any \012\
-other selected items. Dragging BToggle or pressing or dragging BExtend \012\
-following a BToggle action sets the selection state of all items between \012\
-the item under the pointer and the item on which BToggle was pressed to the \012\
-state of the item on which BToggle was pressed. This action does not deselect \012\
-any other selected items outside that range."
Deleted: grass/trunk/include/ibtree.h
===================================================================
--- grass/trunk/include/ibtree.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/ibtree.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,24 +0,0 @@
-#ifndef GRASS_IBTREE_H
-#define GRASS_IBTREE_H
-
-typedef struct
-{
- int key;
- int data;
- int left;
- int right;
-} IBTREE_NODE;
-
-typedef struct
-{
- IBTREE_NODE *node; /* tree of values */
- int tlen; /* allocated tree size */
- int N; /* number of actual nodes in tree */
- int incr; /* number of nodes to add at a time */
- int cur;
- int (*cmp) (); /* routine to compare keys */
-} IBTREE;
-
-#include <grass/defs/ibtree.h>
-
-#endif
Deleted: grass/trunk/include/icon.h
===================================================================
--- grass/trunk/include/icon.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/icon.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,19 +0,0 @@
-#ifndef GRASS_ICON_H
-#define GRASS_ICON_H
-#ifndef _STDIO_H
-#include <stdio.h>
-#endif
-
-#define ICON struct _icon
-struct _icon
-{
- int nrows;
- int ncols;
- int xref;
- int yref;
- char **map;
-};
-
-#include <grass/defs/icon.h>
-
-#endif
Deleted: grass/trunk/include/icon_bm.h
===================================================================
--- grass/trunk/include/icon_bm.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/icon_bm.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#define icon_bm_width 36
-#define icon_bm_height 24
-static char icon_bm_bits[] = {
- 0xf8, 0xff, 0x03, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
- 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
- 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x07, 0x00, 0xfc, 0xff, 0x0f, 0x01,
- 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x41, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08,
- 0x41, 0xc6, 0x34, 0x06, 0x08, 0x41, 0x29, 0x49, 0x09, 0x08, 0x41, 0x21,
- 0x49, 0x01, 0x08, 0x41, 0x21, 0x49, 0x0e, 0x08, 0x41, 0x21, 0x49, 0x00,
- 0x08, 0x41, 0x29, 0x49, 0x09, 0x08, 0x41, 0xc6, 0x48, 0x06, 0x08, 0x01,
- 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0x0f
-};
Deleted: grass/trunk/include/label_bm.h
===================================================================
--- grass/trunk/include/label_bm.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/label_bm.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#define label_bm_width 36
-#define label_bm_height 24
-static char label_bm_bits[] = {
- 0xf8, 0xff, 0x03, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
- 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
- 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x07, 0x00, 0xfc, 0xff, 0x0f, 0x01,
- 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x41, 0x00, 0x02, 0x08, 0x08, 0x41, 0x00, 0x02, 0x08, 0x08,
- 0x41, 0x00, 0x02, 0x08, 0x08, 0x41, 0x18, 0x82, 0x09, 0x08, 0x41, 0x24,
- 0x42, 0x0a, 0x08, 0x41, 0x20, 0x4e, 0x0a, 0x08, 0x41, 0x38, 0xd2, 0x09,
- 0x08, 0x41, 0x24, 0x52, 0x08, 0x08, 0x41, 0x24, 0x52, 0x0a, 0x08, 0x81,
- 0x59, 0x8d, 0x31, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0x0f
-};
Deleted: grass/trunk/include/libtrans.h
===================================================================
--- grass/trunk/include/libtrans.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/libtrans.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,11 +0,0 @@
-#ifndef GRASS_LIBTRANS_H
-#define GRASS_LIBTRANS_H
-
-/* to give the size of the multi-dim array parameter is necessary here,
- because DEC's cc V5.6-079 on Digital UNIX V4.0 (Rev. 878) seems to need it
- */
-#define DIM_matrix 3
-
-#include <grass/defs/libtrans.h>
-
-#endif /* GRASS_LIBTRANS_H */
Deleted: grass/trunk/include/lock.h
===================================================================
--- grass/trunk/include/lock.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/lock.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,7 +0,0 @@
-#ifndef GRASS_LOCK_H
-#define GRASS_LOCK_H
-
-int lock_file(char *, int);
-int unlock_file(char *);
-
-#endif
Deleted: grass/trunk/include/patterns.h
===================================================================
--- grass/trunk/include/patterns.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/patterns.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,104 +0,0 @@
-#ifndef _XGD_PATTERNS_H
-#define _XGD_PATTERNS_H
-
-#include "xgbitmaps.h"
-
-/* Fill Patterns */
-
-#define verticalpat_width 16
-#define verticalpat_height 16
-static BITMAPS_H_TYPE verticalpat_bits[] = {
- 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49,
- 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49,
- 0x24, 0x49, 0x24, 0x49, 0x24, 0x49, 0x24, 0x49
-};
-
-#define check_width 16
-#define check_height 16
-static BITMAPS_H_TYPE check_bits[] = {
- 0x24, 0x49, 0x24, 0x49, 0xff, 0xff, 0x24, 0x49, 0x24, 0x49, 0xff, 0xff,
- 0x24, 0x49, 0x24, 0x49, 0xff, 0xff, 0x24, 0x49, 0x24, 0x49, 0xff, 0xff,
- 0x24, 0x49, 0x24, 0x49, 0xff, 0xff, 0x24, 0x49
-};
-
-#define cross_width 16
-#define cross_height 16
-static BITMAPS_H_TYPE cross_bits[] = {
- 0x49, 0x92, 0xb6, 0x6d, 0xb6, 0x6d, 0x49, 0x92, 0xb6, 0x6d, 0xb6, 0x6d,
- 0x49, 0x92, 0xb6, 0x6d, 0xb6, 0x6d, 0x49, 0x92, 0xb6, 0x6d, 0xb6, 0x6d,
- 0x49, 0x92, 0xb6, 0x6d, 0xb6, 0x6d, 0x49, 0x92
-};
-
-#define dot_dashed_width 16
-#define dot_dashed_height 16
-static BITMAPS_H_TYPE dot_dashed_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x87, 0xc3, 0x87, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-#define dotted_width 16
-#define dotted_height 16
-static BITMAPS_H_TYPE dotted_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x77, 0x77, 0x77, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-#define horizpat_width 16
-#define horizpat_height 16
-static BITMAPS_H_TYPE horizpat_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
- 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
- 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00
-};
-
-#define long_dashed_width 16
-#define long_dashed_height 16
-static BITMAPS_H_TYPE long_dashed_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x0f, 0x78, 0x0f, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-#define odd_dashed_width 16
-#define odd_dashed_height 16
-static BITMAPS_H_TYPE odd_dashed_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xb9, 0x31, 0xb9, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-#define ptleft_width 16
-#define ptleft_height 16
-static BITMAPS_H_TYPE ptleft_bits[] = {
- 0x24, 0x49, 0x49, 0x92, 0x92, 0x24, 0x24, 0x49, 0x49, 0x92, 0x92, 0x24,
- 0x24, 0x49, 0x49, 0x92, 0x92, 0x24, 0x24, 0x49, 0x49, 0x92, 0x92, 0x24,
- 0x24, 0x49, 0x49, 0x92, 0x92, 0x24, 0x24, 0x49
-};
-
-#define ptright_width 16
-#define ptright_height 16
-static BITMAPS_H_TYPE ptright_bits[] = {
- 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x49, 0x92,
- 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x49, 0x92,
- 0x24, 0x49, 0x92, 0x24, 0x49, 0x92, 0x24, 0x49
-};
-
-#define short_dashed_width 16
-#define short_dashed_height 16
-static BITMAPS_H_TYPE short_dashed_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-#define solidline_width 16
-#define solidline_height 16
-static BITMAPS_H_TYPE solidline_bits[] = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-#endif /* _XGD_PATTERNS_H */
Deleted: grass/trunk/include/region_bm.h
===================================================================
--- grass/trunk/include/region_bm.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/region_bm.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,14 +0,0 @@
-#define region_bm_width 36
-#define region_bm_height 24
-static char region_bm_bits[] = {
- 0xf8, 0xff, 0x03, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00,
- 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x04, 0x00,
- 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x07, 0x00, 0xfc, 0xff, 0x0f, 0x01,
- 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x10,
- 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0xd1, 0x18, 0x93, 0x69, 0x08,
- 0x21, 0xa5, 0x54, 0x92, 0x08, 0x21, 0xa4, 0x54, 0x92, 0x08, 0x21, 0x9c,
- 0x54, 0x92, 0x08, 0x21, 0x84, 0x54, 0x92, 0x08, 0x21, 0xa4, 0x54, 0x92,
- 0x08, 0x21, 0x18, 0x93, 0x91, 0x08, 0x01, 0x00, 0x04, 0x00, 0x08, 0x01,
- 0x80, 0x04, 0x00, 0x08, 0x01, 0x00, 0x03, 0x00, 0x08, 0x01, 0x00, 0x00,
- 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0x0f
-};
Deleted: grass/trunk/include/shhopt.h
===================================================================
--- grass/trunk/include/shhopt.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/shhopt.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,62 +0,0 @@
-#ifndef SHHOPT_H
-#define SHHOPT_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
- /* constants for recognized option types. */
- typedef enum
- {
- OPT_END, /* nothing. used as ending element. */
- OPT_FLAG, /* no argument following. sets variable to 1. */
- OPT_STRING, /* string argument. */
- OPT_INT, /* signed integer argument. */
- OPT_UINT, /* unsigned integer argument. */
- OPT_LONG, /* signed long integer argument. */
- OPT_ULONG, /* unsigned long integer argument. */
- OPT_FLOAT /* floating point argument. */
- } optArgType;
-
- /* flags modifying the default way options are handeled. */
-#define OPT_CALLFUNC 1 /* pass argument to a function. */
-
- typedef struct
- {
- char shortName; /* short option name. */
- const char *longName; /* long option name, not including '--'. */
- optArgType type; /* option type. */
- void *arg; /* pointer to variable to fill with argument,
- * or pointer to function if type == OPT_FUNC. */
- int flags; /* modifier flags. */
- } optStruct;
-
-
- typedef struct
- {
- unsigned char short_allowed; /* boolean */
- /* The syntax may include short (i.e. one-character) options.
- These options may be stacked within a single token (e.g.
- -abc = -a -b -c). If this value is not true, the short option
- member of the option table entry is meaningless and long
- options may have either one or two dashes.
- */
- unsigned char allowNegNum; /* boolean */
- /* Anything that starts with - and then a digit is a numeric
- parameter, not an option
- */
- optStruct *opt_table;
- } optStruct2;
-
- void optSetFatalFunc(void (*f) (const char *, ...));
- void optParseOptions(int *argc, char *argv[],
- optStruct opt[], int allowNegNum);
- void optParseOptions2(int *const argc_p, char *argv[],
- const optStruct2 opt, const unsigned long flags);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
Modified: grass/trunk/include/site.h
===================================================================
--- grass/trunk/include/site.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/site.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -29,37 +29,18 @@
} Site_head;
-/* ========================================================================== *
- * G_readsites_xyz(): New implementation of the readsites() library *
- * function limited generating an xyz array SITE_XYZ. *
- * ========================================================================== *
- * Copyright (c) 2000 Eric G. Miller <egm2 at jps.net> *
- * -------------------------------------------------------------------------- *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
- * -------------------------------------------------------------------------- *
- */
-
/* 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
-/* The XYZ site struct. Note the use of a union for the cat value is
- * different than the Site struct.
- */
+/*!
+ \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;
Deleted: grass/trunk/include/sitelib.h
===================================================================
--- grass/trunk/include/sitelib.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/sitelib.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,11 +0,0 @@
-#ifndef GRASS_SITELIB_H
-#define GRASS_SITELIB_H
-
-/* From src/sites/Lib */
-#ifndef GRASS_SITE_H
-#include <grass/site.h>
-#endif
-
-#include <grass/defs/sitelib.h>
-
-#endif
Deleted: grass/trunk/include/std_incs.h
===================================================================
--- grass/trunk/include/std_incs.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/std_incs.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,76 +0,0 @@
-
-/**********************************************************************
- std_incs.h - header file for standard includes
- *********************************************************************/
-#ifndef STD_INCS_H
-#define STD_INCS_H
-
-#include <X11/Xos.h>
-extern char *calloc(); /* removed <malloc.h> GRASS930313 parghi 1993-03-30 */
-extern char *malloc();
-extern char *realloc();
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/stat.h>
-#if defined(sparc) || defined (uts) || defined(SVR4) || defined(IdglGraph_s)
-#include <dirent.h>
-#else
-#include <sys/dir.h>
-#endif
-#ifndef SVR4
-#include <sys/wait.h>
-#endif
-#ifndef mips
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Intrinsic.h>
-#include <X11/Shell.h>
-#include <X11/StringDefs.h>
-#include <X11/Xproto.h>
-#include <X11/cursorfont.h>
-#include <Xm/Xm.h>
-#include <Xm/ArrowB.h>
-#include <Xm/ArrowBG.h>
-#include <Xm/BulletinB.h>
-#include <Xm/CascadeB.h>
-#include <Xm/CascadeBG.h>
-#include <Xm/CutPaste.h>
-#include <Xm/DialogS.h>
-#include <Xm/DrawingA.h>
-#include <Xm/DrawnB.h>
-#include <Xm/FileSB.h>
-#include <Xm/Form.h>
-#include <Xm/Frame.h>
-#include <Xm/Label.h>
-#include <Xm/LabelG.h>
-#include <Xm/List.h>
-#include <Xm/MainW.h>
-#include <Xm/MessageB.h>
-#include <Xm/MwmUtil.h>
-#include <Xm/Protocols.h>
-#include <Xm/PushB.h>
-#include <Xm/PushBG.h>
-#include <Xm/RowColumn.h>
-#include <Xm/Scale.h>
-#include <Xm/ScrollBar.h>
-#include <Xm/ScrolledW.h>
-#include <Xm/SelectioB.h>
-#include <Xm/Separator.h>
-#include <Xm/SeparatoG.h>
-#include <Xm/Text.h>
-#include <Xm/TextF.h>
-#include <Xm/ToggleB.h>
-
-#define XG_FAIL 0
-#define XG_SUCCESS 1
-
-#endif /* STD_INCS_H */
Deleted: grass/trunk/include/transform.h
===================================================================
--- grass/trunk/include/transform.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/transform.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1,15 +0,0 @@
-#ifndef GRASS_TRANSFORM_H
-#define GRASS_TRANSFORM_H
-
-/* This is the definition file for the libtrans functions.
- These are the tools that move data from one coordinate system into
- another.
- */
-/* to give the size of the multi-dim array parameter is necessary here,
- because DEC's cc V5.6-079 on Digital UNIX V4.0 (Rev. 878) seems to need it
- */
-#define DIM_matrix 3
-
-#include <grass/defs/transform.h>
-
-#endif
Modified: grass/trunk/include/vect/dig_structs.h
===================================================================
--- grass/trunk/include/vect/dig_structs.h 2011-11-14 07:07:24 UTC (rev 49206)
+++ grass/trunk/include/vect/dig_structs.h 2011-11-14 07:40:04 UTC (rev 49207)
@@ -1169,26 +1169,29 @@
/* constraints for reading in lines (not polys yet) */
/*!
- \brief Constrainys for reading features (region)
+ \brief Constraints (region, type, field)
- Non-zero code to enable this constraint
+ Note: Non-zero flag to enable given constraint.
*/
- int Constraint_region_flag;
+ struct {
+ /*!
+ \brief Region constraint
+ */
+ int region_flag;
+ struct bound_box box;
+ /*!
+ \brief Type constraint
+ */
+ int type_flag;
+ int type;
+ /*!
+ \brief Field constraint
+ */
+ int field_flag;
+ int field;
+ } constraint;
+
/*!
- \brief Constraints for reading features (type)
-
- Non-zero code to enable this constraint
- */
- int Constraint_type_flag;
- /*!
- \brief Constraints for reading features (bounding box)
- */
- struct bound_box Constraint_box;
- /*!
- \brief Constraints for reading features (type)
- */
- int Constraint_type;
- /*!
\brief ???
*/
int proj;
More information about the grass-commit
mailing list