[GRASS-SVN] r38992 - in grass/trunk: include lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-09-05 13:04:45 -0400 (Sat, 05 Sep 2009)
New Revision: 38992

Modified:
   grass/trunk/include/vector.h
   grass/trunk/lib/vector/Vlib/level_two.c
Log:
Vect_get_num return long


Modified: grass/trunk/include/vector.h
===================================================================
--- grass/trunk/include/vector.h	2009-09-05 17:04:08 UTC (rev 38991)
+++ grass/trunk/include/vector.h	2009-09-05 17:04:45 UTC (rev 38992)
@@ -186,15 +186,15 @@
 
 /* Get map level 2 informations */
 int Vect_level(const struct Map_info *);
-int Vect_get_num_nodes(const struct Map_info *);
-int Vect_get_num_primitives(const struct Map_info *, int);
-int Vect_get_num_lines(const struct Map_info *);
-int Vect_get_num_areas(const struct Map_info *);
-int Vect_get_num_faces(const struct Map_info *);
-int Vect_get_num_kernels(struct Map_info *);
-int Vect_get_num_volumes(struct Map_info *);
-int Vect_get_num_islands(const struct Map_info *);
-int Vect_get_num_holes(struct Map_info *);
+long Vect_get_num_nodes(const struct Map_info *);
+long Vect_get_num_primitives(const struct Map_info *, int);
+long Vect_get_num_lines(const struct Map_info *);
+long Vect_get_num_areas(const struct Map_info *);
+long Vect_get_num_faces(const struct Map_info *);
+long Vect_get_num_kernels(const struct Map_info *);
+long Vect_get_num_volumes(const struct Map_info *);
+long Vect_get_num_islands(const struct Map_info *);
+long Vect_get_num_holes(const struct Map_info *);
 int Vect_get_line_box(const struct Map_info *, int, struct bound_box *);
 int Vect_get_area_box(const struct Map_info *, int, struct bound_box *);
 int Vect_get_isle_box(const struct Map_info *, int, struct bound_box *);

Modified: grass/trunk/lib/vector/Vlib/level_two.c
===================================================================
--- grass/trunk/lib/vector/Vlib/level_two.c	2009-09-05 17:04:08 UTC (rev 38991)
+++ grass/trunk/lib/vector/Vlib/level_two.c	2009-09-05 17:04:45 UTC (rev 38992)
@@ -25,7 +25,7 @@
 
    \return number of nodes
  */
-int Vect_get_num_nodes(const struct Map_info *map)
+long Vect_get_num_nodes(const struct Map_info *map)
 {
     return (map->plus.n_nodes);
 }
@@ -38,9 +38,9 @@
 
    \return number of primitives
  */
-int Vect_get_num_primitives(const struct Map_info *map, int type)
+long Vect_get_num_primitives(const struct Map_info *map, int type)
 {
-    int num = 0;
+    long int num = 0;
 
     if (type & GV_POINT)
 	num += map->plus.n_plines;
@@ -65,7 +65,7 @@
 
    \return number of features
  */
-int Vect_get_num_lines(const struct Map_info *map)
+long Vect_get_num_lines(const struct Map_info *map)
 {
     return (map->plus.n_lines);
 }
@@ -77,7 +77,7 @@
 
    \return number of areas
  */
-int Vect_get_num_areas(const struct Map_info *map)
+long Vect_get_num_areas(const struct Map_info *map)
 {
     return (map->plus.n_areas);
 }
@@ -89,7 +89,7 @@
 
    \return number of kernels
  */
-int Vect_get_num_kernels(struct Map_info *map)
+long Vect_get_num_kernels(const struct Map_info *map)
 {
     return (map->plus.n_klines);
 }
@@ -102,7 +102,7 @@
 
    \return number of faces
  */
-int Vect_get_num_faces(const struct Map_info *map)
+long Vect_get_num_faces(const struct Map_info *map)
 {
     return (map->plus.n_flines);
 }
@@ -115,7 +115,7 @@
 
    \return number of volumes
  */
-int Vect_get_num_volumes(struct Map_info *map)
+long Vect_get_num_volumes(const struct Map_info *map)
 {
     return (map->plus.n_volumes);
 }
@@ -128,7 +128,7 @@
 
    \return number of islands
  */
-int Vect_get_num_islands(const struct Map_info *map)
+long Vect_get_num_islands(const struct Map_info *map)
 {
     return (map->plus.n_isles);
 }
@@ -141,7 +141,7 @@
 
    \return number of holes
  */
-int Vect_get_num_holes(struct Map_info *map)
+long Vect_get_num_holes(const struct Map_info *map)
 {
     return (map->plus.n_holes);
 }