[GRASS-SVN] r46958 - in grass/trunk/include: . vect

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-07-04 03:48:20 -0700 (Mon, 04 Jul 2011)
New Revision: 46958

Modified:
   grass/trunk/include/vect/dig_externs.h
   grass/trunk/include/vect/dig_structs.h
   grass/trunk/include/vector.h
Log:
remove redundant code in vector lib: update headers

Modified: grass/trunk/include/vect/dig_externs.h
===================================================================
--- grass/trunk/include/vect/dig_externs.h	2011-07-04 10:47:42 UTC (rev 46957)
+++ grass/trunk/include/vect/dig_externs.h	2011-07-04 10:48:20 UTC (rev 46958)
@@ -85,7 +85,7 @@
 /* list.c */
 int dig_init_list(struct ilist *);
 int dig_list_add(struct ilist *, int);
-int dig_init_boxlist(struct boxlist *);
+int dig_init_boxlist(struct boxlist *, int);
 int dig_boxlist_add(struct boxlist *, int, struct bound_box);
 
 /* plus.c */
@@ -199,12 +199,9 @@
 int dig_spidx_del_isle(struct Plus_head *, int);
 
 int dig_select_nodes(struct Plus_head *, const struct bound_box *, struct ilist *);
-int dig_select_lines(struct Plus_head *, const struct bound_box *, struct ilist *);
-int dig_select_lines_with_box(struct Plus_head *, const struct bound_box *, struct boxlist *);
-int dig_select_areas(struct Plus_head *, const struct bound_box *, struct ilist *);
-int dig_select_areas_with_box(struct Plus_head *, const struct bound_box *, struct boxlist *);
-int dig_select_isles(struct Plus_head *, const struct bound_box *, struct ilist *);
-int dig_select_isles_with_box(struct Plus_head *, const struct bound_box *, struct boxlist *);
+int dig_select_lines(struct Plus_head *, const struct bound_box *, struct boxlist *);
+int dig_select_areas(struct Plus_head *, const struct bound_box *, struct boxlist *);
+int dig_select_isles(struct Plus_head *, const struct bound_box *, struct boxlist *);
 int dig_find_node(struct Plus_head *, double, double, double);
 int dig_find_line_box(const struct Plus_head *, struct boxlist *);
 int dig_find_area_box(const struct Plus_head *, struct boxlist *);

Modified: grass/trunk/include/vect/dig_structs.h
===================================================================
--- grass/trunk/include/vect/dig_structs.h	2011-07-04 10:47:42 UTC (rev 46957)
+++ grass/trunk/include/vect/dig_structs.h	2011-07-04 10:48:20 UTC (rev 46958)
@@ -1562,9 +1562,13 @@
     */
     struct bound_box *box;
     /*!
+      \brief flag to indicate whether bounding boxes should be added
+    */
+    int have_boxes;
+    /*!
       \brief Number of items in the list
     */
-    int n_values;		
+    int n_values;
     /*!
       \brief Allocated space for items
     */

Modified: grass/trunk/include/vector.h
===================================================================
--- grass/trunk/include/vector.h	2011-07-04 10:47:42 UTC (rev 46957)
+++ grass/trunk/include/vector.h	2011-07-04 10:48:20 UTC (rev 46958)
@@ -129,7 +129,7 @@
 void Vect_destroy_list(struct ilist *);
 
 /* List of bounding boxes with ids */
-struct boxlist *Vect_new_boxlist(void);
+struct boxlist *Vect_new_boxlist(int);
 int Vect_boxlist_append(struct boxlist *, int, struct bound_box);
 int Vect_boxlist_append_list(struct boxlist *, const struct boxlist *);
 int Vect_boxlist_delete(struct boxlist *, int);
@@ -304,14 +304,10 @@
 char *Vect_hist_read(char *, int, const struct Map_info *);
 
 /* Selecting features */
-int Vect_select_lines_by_box(struct Map_info *, const struct bound_box *, int,
-			     struct ilist *);
-int Vect_select_lines_by_box_with_box(struct Map_info *, const struct bound_box *,
+int Vect_select_lines_by_box(struct Map_info *, const struct bound_box *,
 			 int, struct boxlist *);
-int Vect_select_areas_by_box(struct Map_info *, const struct bound_box *, struct ilist *);
-int Vect_select_areas_by_box_with_box(struct Map_info *, const struct bound_box *, struct boxlist *);
-int Vect_select_isles_by_box(struct Map_info *, const struct bound_box *, struct ilist *);
-int Vect_select_isles_by_box_with_box(struct Map_info *, const struct bound_box *, struct boxlist *);
+int Vect_select_areas_by_box(struct Map_info *, const struct bound_box *, struct boxlist *);
+int Vect_select_isles_by_box(struct Map_info *, const struct bound_box *, struct boxlist *);
 int Vect_select_nodes_by_box(struct Map_info *, const struct bound_box *, struct ilist *);
 int Vect_find_node(struct Map_info *, double, double, double, double, int);
 int Vect_find_line(struct Map_info *, double, double, double, int, double,