浏览代码

remove redundant code in vector lib: update headers

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46958 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 14 年之前
父节点
当前提交
b7a7a67be6
共有 3 个文件被更改,包括 13 次插入16 次删除
  1. 4 7
      include/vect/dig_externs.h
  2. 5 1
      include/vect/dig_structs.h
  3. 4 8
      include/vector.h

+ 4 - 7
include/vect/dig_externs.h

@@ -85,7 +85,7 @@ int dig_set_distance_to_line_tolerance(double);
 /* 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_area(struct Plus_head *, int);
 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 *);

+ 5 - 1
include/vect/dig_structs.h

@@ -1562,9 +1562,13 @@ struct boxlist
     */
     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
     */

+ 4 - 8
include/vector.h

@@ -129,7 +129,7 @@ int Vect_reset_list(struct ilist *);
 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 @@ void Vect_hist_rewind(struct Map_info *);
 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,