[GRASS-SVN] r34529 - grass/trunk/include

[svn_grass at osgeo.org]

Author: marisn
Date: 2008-11-27 06:23:17 -0500 (Thu, 27 Nov 2008)
New Revision: 34529

Modified:
   grass/trunk/include/Vect.h
Log:
Adding skipped Vect_line_get_intersections declaration (merge from develbranch_6 r34499)

Modified: grass/trunk/include/Vect.h
===================================================================
--- grass/trunk/include/Vect.h	2008-11-27 11:16:49 UTC (rev 34528)
+++ grass/trunk/include/Vect.h	2008-11-27 11:23:17 UTC (rev 34529)
@@ -25,8 +25,7 @@
 int Vect_destroy_line_struct(struct line_pnts *);
 int Vect_point_on_line(struct line_pnts *, double, double *, double *,
 		       double *, double *, double *);
-int Vect_line_segment(struct line_pnts *, double, double,
-		      struct line_pnts *);
+int Vect_line_segment(struct line_pnts *, double, double, struct line_pnts *);
 double Vect_line_length(struct line_pnts *);
 double Vect_area_perimeter(struct line_pnts *);
 double Vect_line_geodesic_length(struct line_pnts *);
@@ -71,8 +70,7 @@
 struct dblinks *Vect_new_dblinks_struct(void);
 void Vect_reset_dblinks(struct dblinks *);
 int Vect_add_dblink(struct dblinks *, int, const char *,
-		    const char *, const char *, const char *,
-		    const char *);
+		    const char *, const char *, const char *, const char *);
 int Vect_check_dblink(struct dblinks *, int);
 int Vect_map_add_dblink(struct Map_info *, int, const char *,
 			const char *, const char *, const char *,
@@ -84,7 +82,7 @@
 struct field_info *Vect_default_field_info(struct Map_info *, int,
 					   const char *, int);
 struct field_info *Vect_get_dblink(struct Map_info *, int);
-struct field_info *Vect_get_field(struct Map_info *, int );
+struct field_info *Vect_get_field(struct Map_info *, int);
 void Vect_set_db_updated(struct Map_info *);
 const char *Vect_get_column_names(struct Map_info *, int);
 const char *Vect_get_column_types(struct Map_info *, int);
@@ -323,8 +321,7 @@
 		 int, struct Map_info *);
 int Vect_overlay_and(struct Map_info *, int, struct ilist *,
 		     struct ilist *, struct Map_info *, int,
-		     struct ilist *, struct ilist *,
-		     struct Map_info *);
+		     struct ilist *, struct ilist *, struct Map_info *);
 
 /* Graph */
 void Vect_graph_init(GRAPH *, int);
@@ -371,6 +368,8 @@
 			   struct line_pnts ***, struct line_pnts ***, int *,
 			   int *, int);
 int Vect_line_check_intersection(struct line_pnts *, struct line_pnts *, int);
+int Vect_line_get_intersections(struct line_pnts *, struct line_pnts *,
+				struct line_pnts *, int);
 char *Vect_subst_var(const char *str, struct Map_info *Map);
 
 /*