[GRASS-SVN] r45105 - grass/trunk/lib/vector/Vlib
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 20 11:17:01 EST 2011
Author: mmetz
Date: 2011-01-20 08:17:00 -0800 (Thu, 20 Jan 2011)
New Revision: 45105
Modified:
grass/trunk/lib/vector/Vlib/area.c
grass/trunk/lib/vector/Vlib/array.c
grass/trunk/lib/vector/Vlib/box.c
grass/trunk/lib/vector/Vlib/break_lines.c
grass/trunk/lib/vector/Vlib/break_polygons.c
grass/trunk/lib/vector/Vlib/bridges.c
grass/trunk/lib/vector/Vlib/buffer.c
grass/trunk/lib/vector/Vlib/buffer2.c
grass/trunk/lib/vector/Vlib/build.c
grass/trunk/lib/vector/Vlib/build_nat.c
grass/trunk/lib/vector/Vlib/build_ogr.c
grass/trunk/lib/vector/Vlib/cats.c
grass/trunk/lib/vector/Vlib/cindex.c
grass/trunk/lib/vector/Vlib/clean_nodes.c
grass/trunk/lib/vector/Vlib/close.c
grass/trunk/lib/vector/Vlib/close_nat.c
grass/trunk/lib/vector/Vlib/close_ogr.c
grass/trunk/lib/vector/Vlib/constraint.c
grass/trunk/lib/vector/Vlib/dangles.c
grass/trunk/lib/vector/Vlib/dbcolumns.c
grass/trunk/lib/vector/Vlib/dgraph.c
grass/trunk/lib/vector/Vlib/error.c
grass/trunk/lib/vector/Vlib/field.c
grass/trunk/lib/vector/Vlib/find.c
grass/trunk/lib/vector/Vlib/geos.c
grass/trunk/lib/vector/Vlib/graph.c
grass/trunk/lib/vector/Vlib/header.c
grass/trunk/lib/vector/Vlib/hist.c
grass/trunk/lib/vector/Vlib/init_head.c
grass/trunk/lib/vector/Vlib/intersect.c
grass/trunk/lib/vector/Vlib/legal_vname.c
grass/trunk/lib/vector/Vlib/level_two.c
grass/trunk/lib/vector/Vlib/line.c
grass/trunk/lib/vector/Vlib/list.c
grass/trunk/lib/vector/Vlib/map.c
grass/trunk/lib/vector/Vlib/merge_lines.c
grass/trunk/lib/vector/Vlib/net.c
grass/trunk/lib/vector/Vlib/open.c
grass/trunk/lib/vector/Vlib/open_nat.c
grass/trunk/lib/vector/Vlib/open_ogr.c
grass/trunk/lib/vector/Vlib/overlap.c
grass/trunk/lib/vector/Vlib/overlay.c
grass/trunk/lib/vector/Vlib/poly.c
grass/trunk/lib/vector/Vlib/read.c
grass/trunk/lib/vector/Vlib/read_nat.c
grass/trunk/lib/vector/Vlib/read_ogr.c
grass/trunk/lib/vector/Vlib/remove_areas.c
grass/trunk/lib/vector/Vlib/remove_duplicates.c
grass/trunk/lib/vector/Vlib/rewind_ogr.c
grass/trunk/lib/vector/Vlib/select.c
grass/trunk/lib/vector/Vlib/sindex.c
grass/trunk/lib/vector/Vlib/snap.c
grass/trunk/lib/vector/Vlib/type.c
grass/trunk/lib/vector/Vlib/write.c
grass/trunk/lib/vector/Vlib/write_nat.c
grass/trunk/lib/vector/Vlib/write_ogr.c
Log:
update headers, revert r37860
Modified: grass/trunk/lib/vector/Vlib/area.c
===================================================================
--- grass/trunk/lib/vector/Vlib/area.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/area.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -16,9 +16,7 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/array.c
===================================================================
--- grass/trunk/lib/vector/Vlib/array.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/array.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,9 +15,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/dbmi.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/box.c
===================================================================
--- grass/trunk/lib/vector/Vlib/box.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/box.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,9 +15,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
/*!
Modified: grass/trunk/lib/vector/Vlib/break_lines.c
===================================================================
--- grass/trunk/lib/vector/Vlib/break_lines.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/break_lines.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,9 +13,7 @@
* \author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
@@ -368,8 +366,8 @@
}
G_debug(3, "nlines = %d", nlines);
} /* for each line */
-
G_percent(nlines, nlines, 1); /* finish it */
+
G_verbose_message(_("Intersections: %d"), nbreaks);
Vect_destroy_list(List);
Modified: grass/trunk/lib/vector/Vlib/break_polygons.c
===================================================================
--- grass/trunk/lib/vector/Vlib/break_polygons.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/break_polygons.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -21,7 +21,6 @@
#include <fcntl.h>
#include <unistd.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/bridges.c
===================================================================
--- grass/trunk/lib/vector/Vlib/bridges.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/bridges.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,9 +15,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/buffer.c
===================================================================
--- grass/trunk/lib/vector/Vlib/buffer.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/buffer.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -17,11 +17,9 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <math.h>
#include <grass/vector.h>
-#include <grass/gis.h>
#define LENGTH(DX, DY) ( sqrt( (DX*DX)+(DY*DY) ) )
#define PI M_PI
Modified: grass/trunk/lib/vector/Vlib/buffer2.c
===================================================================
--- grass/trunk/lib/vector/Vlib/buffer2.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/buffer2.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -16,11 +16,9 @@
\author Rewritten by Rosen Matev (Google Summer of Code 2008)
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <math.h>
#include <grass/vector.h>
-#include <grass/gis.h>
#include <grass/glocale.h>
#include "dgraph.h"
Modified: grass/trunk/lib/vector/Vlib/build.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/build.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,13 +13,11 @@
\author Original author CERL, probably Dave Gerdes or Mike Higgins.
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
#include <grass/glocale.h>
-#include <grass/gis.h>
#include <grass/vector.h>
Modified: grass/trunk/lib/vector/Vlib/build_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build_nat.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/build_nat.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,13 +14,11 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/types.h>
#include <grass/glocale.h>
-#include <grass/gis.h>
#include <grass/vector.h>
/*!
@@ -127,7 +125,7 @@
\param Map_info vector map
\param isle isle id
- \return number of area(s)
+ \return area id
\return 0 if not found
*/
int Vect_isle_find_area(struct Map_info *Map, int isle)
Modified: grass/trunk/lib/vector/Vlib/build_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build_ogr.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/build_ogr.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -21,11 +21,9 @@
\author Various updates for GRASS 7 by Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/cats.c
===================================================================
--- grass/trunk/lib/vector/Vlib/cats.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/cats.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -16,10 +16,8 @@
* \author Various updates by Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <string.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/cindex.c
===================================================================
--- grass/trunk/lib/vector/Vlib/cindex.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/cindex.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,13 +13,11 @@
* \author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/clean_nodes.c
===================================================================
--- grass/trunk/lib/vector/Vlib/clean_nodes.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/clean_nodes.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,9 +13,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/close.c
===================================================================
--- grass/trunk/lib/vector/Vlib/close.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/close.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,7 +14,6 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
Modified: grass/trunk/lib/vector/Vlib/close_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/close_nat.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/close_nat.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,8 +14,8 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
+#include <stdlib.h>
#include <grass/vector.h>
-#include <stdlib.h>
/*!
\brief Close vector map file
Modified: grass/trunk/lib/vector/Vlib/close_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/close_ogr.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/close_ogr.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,7 +14,6 @@
\author Update to GRASS 5.7 Radim Blazek and Piero Cavalieri.
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/constraint.c
===================================================================
--- grass/trunk/lib/vector/Vlib/constraint.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/constraint.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -34,7 +34,6 @@
*/
#include <grass/vector.h>
-#include <grass/gis.h>
/*!
\brief Set constraint region
Modified: grass/trunk/lib/vector/Vlib/dangles.c
===================================================================
--- grass/trunk/lib/vector/Vlib/dangles.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/dangles.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,9 +13,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/dbcolumns.c
===================================================================
--- grass/trunk/lib/vector/Vlib/dbcolumns.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/dbcolumns.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,7 +13,6 @@
\author Markus Neteler
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -21,7 +20,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <grass/glocale.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/dbmi.h>
Modified: grass/trunk/lib/vector/Vlib/dgraph.c
===================================================================
--- grass/trunk/lib/vector/Vlib/dgraph.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/dgraph.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,12 +13,10 @@
\author Rewritten by Rosen Matev (Google Summer of Code 2008)
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <grass/vector.h>
-#include <grass/gis.h>
#include <grass/glocale.h>
#include "dgraph.h"
#include "e_intersect.h"
Modified: grass/trunk/lib/vector/Vlib/error.c
===================================================================
--- grass/trunk/lib/vector/Vlib/error.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/error.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,9 +14,7 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <string.h>
-#include <grass/gis.h>
#include <grass/vector.h>
static int fatal_err = GV_FATAL_EXIT;
Modified: grass/trunk/lib/vector/Vlib/field.c
===================================================================
--- grass/trunk/lib/vector/Vlib/field.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/field.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -19,12 +19,10 @@
\author Various updates by Martin Landa <landa.martin gmail.com>, 2009
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <grass/glocale.h>
-#include <grass/gis.h>
#include <grass/dbmi.h>
#include <grass/vector.h>
Modified: grass/trunk/lib/vector/Vlib/find.c
===================================================================
--- grass/trunk/lib/vector/Vlib/find.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/find.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,9 +15,7 @@
* \author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#ifndef HUGE_VAL
Modified: grass/trunk/lib/vector/Vlib/geos.c
===================================================================
--- grass/trunk/lib/vector/Vlib/geos.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/geos.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,8 +13,6 @@
\author Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/graph.c
===================================================================
--- grass/trunk/lib/vector/Vlib/graph.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/graph.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,10 +15,8 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <string.h>
-#include <grass/gis.h>
#include <grass/dbmi.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/header.c
===================================================================
--- grass/trunk/lib/vector/Vlib/header.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/header.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,10 +15,8 @@
\author Update to GRASS 7 (OGR support) by Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <string.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/hist.c
===================================================================
--- grass/trunk/lib/vector/Vlib/hist.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/hist.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,7 +13,6 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
Modified: grass/trunk/lib/vector/Vlib/init_head.c
===================================================================
--- grass/trunk/lib/vector/Vlib/init_head.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/init_head.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -18,9 +18,7 @@
\author Various updates by Martin Landa <landa.martin gmail.com>, 2009
*/
-#include <grass/config.h>
#include <string.h>
-#include <grass/gis.h>
#include <grass/vector.h>
/*!
Modified: grass/trunk/lib/vector/Vlib/intersect.c
===================================================================
--- grass/trunk/lib/vector/Vlib/intersect.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/intersect.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -65,12 +65,10 @@
\author Update to GRASS 5.7 Radim Blazek.
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/legal_vname.c
===================================================================
--- grass/trunk/lib/vector/Vlib/legal_vname.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/legal_vname.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -11,9 +11,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <string.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/level_two.c
===================================================================
--- grass/trunk/lib/vector/Vlib/level_two.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/level_two.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -12,9 +12,7 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/line.c
===================================================================
--- grass/trunk/lib/vector/Vlib/line.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/line.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,10 +13,8 @@
\author Some updates for GRASS 7 by Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/list.c
===================================================================
--- grass/trunk/lib/vector/Vlib/list.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/list.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -16,10 +16,8 @@
* \author Update to GRASS 5.7 Radim Blazek and David D. Gray
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <grass/vector.h>
-#include <grass/gis.h>
/**
* \brief Creates and initializes a struct ilist.
Modified: grass/trunk/lib/vector/Vlib/map.c
===================================================================
--- grass/trunk/lib/vector/Vlib/map.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/map.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,7 +15,6 @@
* \author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <dirent.h>
@@ -25,7 +24,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <grass/glocale.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/merge_lines.c
===================================================================
--- grass/trunk/lib/vector/Vlib/merge_lines.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/merge_lines.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,10 +15,8 @@
\author Markus Metz
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/net.c
===================================================================
--- grass/trunk/lib/vector/Vlib/net.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/net.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,11 +13,9 @@
* \author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
-#include <grass/gis.h>
#include <grass/dbmi.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/open.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/open.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,7 +15,6 @@
* \author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -23,7 +22,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/open_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open_nat.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/open_nat.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,13 +14,11 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <grass/vector.h>
-#include <grass/gis.h>
#include <grass/glocale.h>
static char name_buf[GPATH_MAX];
Modified: grass/trunk/lib/vector/Vlib/open_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open_ogr.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/open_ogr.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,13 +15,11 @@
\author Update to GRASS 7.0 Martin Landa <landa.martin gmail.com> (2009)
*/
-#include <grass/config.h>
#include <unistd.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/gprojects.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/overlap.c
===================================================================
--- grass/trunk/lib/vector/Vlib/overlap.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/overlap.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,8 +14,6 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
-#include <grass/gis.h>
#include <grass/vector.h>
/*!
Modified: grass/trunk/lib/vector/Vlib/overlay.c
===================================================================
--- grass/trunk/lib/vector/Vlib/overlay.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/overlay.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -16,7 +16,6 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <string.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/poly.c
===================================================================
--- grass/trunk/lib/vector/Vlib/poly.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/poly.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,11 +14,9 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <math.h>
#include <stdlib.h>
#include <grass/vector.h>
-#include <grass/gis.h>
#include <grass/linkm.h>
#include <grass/glocale.h>
@@ -445,9 +443,8 @@
/* get centroid */
Vect_find_poly_centroid(Points, ¢_x, ¢_y);
/* is it w/in poly? */
- if (Vect_point_in_poly(cent_x, cent_y, Points) == 1)
- /* if the point is iside the polygon */
- {
+ if (Vect_point_in_poly(cent_x, cent_y, Points) == 1) {
+ /* if the point is inside the polygon */
for (i = 0; i < n_isles; i++) {
if (Vect_point_in_poly(cent_x, cent_y, IPoints[i]) >= 1) {
point_in_sles = 1;
Modified: grass/trunk/lib/vector/Vlib/read.c
===================================================================
--- grass/trunk/lib/vector/Vlib/read.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/read.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,7 +14,6 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <sys/types.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/read_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/read_nat.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/read_nat.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -19,9 +19,7 @@
\author Update to GRASS 5.7 Radim Blazek and David D. Gray.
*/
-#include <grass/config.h>
#include <sys/types.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/read_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/read_ogr.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/read_ogr.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,8 +14,6 @@
\author Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/remove_areas.c
===================================================================
--- grass/trunk/lib/vector/Vlib/remove_areas.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/remove_areas.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,9 +13,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/remove_duplicates.c
===================================================================
--- grass/trunk/lib/vector/Vlib/remove_duplicates.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/remove_duplicates.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,9 +13,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/rewind_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/rewind_ogr.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/rewind_ogr.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,8 +13,6 @@
\author Radim Blazek, Piero Cavalieri
*/
-#include <grass/config.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#ifdef HAVE_OGR
Modified: grass/trunk/lib/vector/Vlib/select.c
===================================================================
--- grass/trunk/lib/vector/Vlib/select.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/select.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,13 +13,10 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <string.h>
-#include <grass/glocale.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/sindex.c
===================================================================
--- grass/trunk/lib/vector/Vlib/sindex.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/sindex.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,9 +13,7 @@
\author Radim Blazek
*/
-#include <grass/config.h>
#include <stdlib.h>
-#include <grass/gis.h>
#include <grass/vector.h>
/*!
Modified: grass/trunk/lib/vector/Vlib/snap.c
===================================================================
--- grass/trunk/lib/vector/Vlib/snap.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/snap.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,13 +14,11 @@
* \author update to GRASS 7 Markus Metz
*/
-#include <grass/config.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/type.c
===================================================================
--- grass/trunk/lib/vector/Vlib/type.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/type.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -13,8 +13,6 @@
\author Radim Blazek
*/
-#include <grass/config.h>
-#include <grass/gis.h>
#include <grass/vector.h>
/*!
Modified: grass/trunk/lib/vector/Vlib/write.c
===================================================================
--- grass/trunk/lib/vector/Vlib/write.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/write.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -14,9 +14,7 @@
\author Updated by Martin Landa <landa.martin gmail.com> (restore lines, OGR support)
*/
-#include <grass/config.h>
#include <sys/types.h>
-#include <grass/gis.h>
#include <grass/glocale.h>
#include <grass/vector.h>
Modified: grass/trunk/lib/vector/Vlib/write_nat.c
===================================================================
--- grass/trunk/lib/vector/Vlib/write_nat.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/write_nat.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -21,12 +21,10 @@
\author V*_restore_line() by Martin Landa <landa.martin gmail.com> (2008)
*/
-#include <grass/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-#include <grass/gis.h>
#include <grass/vector.h>
#include <grass/glocale.h>
Modified: grass/trunk/lib/vector/Vlib/write_ogr.c
===================================================================
--- grass/trunk/lib/vector/Vlib/write_ogr.c 2011-01-20 16:10:11 UTC (rev 45104)
+++ grass/trunk/lib/vector/Vlib/write_ogr.c 2011-01-20 16:17:00 UTC (rev 45105)
@@ -15,7 +15,6 @@
\author Martin Landa <landa.martin gmail.com>
*/
-#include <grass/config.h>
#include <grass/vector.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
More information about the grass-commit
mailing list