[GRASS-SVN] r42316 - in grass/trunk/vector/lidar: lidarlib r.resamp.bspline v.lidar.correction v.lidar.edgedetection v.lidar.growing v.outlier v.surf.bspline

svn_grass at osgeo.org svn_grass at osgeo.org
Wed May 19 04:50:10 EDT 2010


Author: mmetz
Date: 2010-05-19 04:50:08 -0400 (Wed, 19 May 2010)
New Revision: 42316

Added:
   grass/trunk/vector/lidar/lidarlib/lidar.h
Removed:
   grass/trunk/vector/lidar/lidarlib/PolimiFunct.h
Modified:
   grass/trunk/vector/lidar/lidarlib/InterpSpline.c
   grass/trunk/vector/lidar/lidarlib/Makefile
   grass/trunk/vector/lidar/lidarlib/raster.c
   grass/trunk/vector/lidar/lidarlib/zones.c
   grass/trunk/vector/lidar/r.resamp.bspline/bspline.h
   grass/trunk/vector/lidar/r.resamp.bspline/crosscorr.c
   grass/trunk/vector/lidar/r.resamp.bspline/main.c
   grass/trunk/vector/lidar/r.resamp.bspline/resamp.c
   grass/trunk/vector/lidar/v.lidar.correction/correction.c
   grass/trunk/vector/lidar/v.lidar.correction/correction.h
   grass/trunk/vector/lidar/v.lidar.correction/main.c
   grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c
   grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.h
   grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
   grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c
   grass/trunk/vector/lidar/v.lidar.growing/growing.c
   grass/trunk/vector/lidar/v.lidar.growing/growing.h
   grass/trunk/vector/lidar/v.lidar.growing/main.c
   grass/trunk/vector/lidar/v.outlier/main.c
   grass/trunk/vector/lidar/v.outlier/outlier.c
   grass/trunk/vector/lidar/v.outlier/outlier.h
   grass/trunk/vector/lidar/v.surf.bspline/bspline.h
   grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c
   grass/trunk/vector/lidar/v.surf.bspline/main.c
Log:
reorganizing lidar tools: update headers

Modified: grass/trunk/vector/lidar/lidarlib/InterpSpline.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/InterpSpline.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/lidarlib/InterpSpline.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -22,9 +22,8 @@
 #include <float.h>
 #include <math.h>
 #include <string.h>
+#include <grass/lidar.h>
 
-#include "PolimiFunct.h"
-
 /*----------------------------------------------------------------------------*/
 /* Abscissa node index computation */
 

Modified: grass/trunk/vector/lidar/lidarlib/Makefile
===================================================================
--- grass/trunk/vector/lidar/lidarlib/Makefile	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/lidarlib/Makefile	2010-05-19 08:50:08 UTC (rev 42316)
@@ -8,7 +8,8 @@
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: $(ARCH_INCDIR)/PolimiFunct.h lib
+default: $(ARCH_INCDIR)/lidar.h
+	$(MAKE) lib
 
-$(ARCH_INCDIR)/PolimiFunct.h: PolimiFunct.h
-	cp PolimiFunct.h $(ARCH_INCDIR)/PolimiFunct.h
+$(ARCH_INCDIR)/lidar.h: lidar.h
+	$(INSTALL_DATA) lidar.h $(ARCH_INCDIR)/lidar.h

Deleted: grass/trunk/vector/lidar/lidarlib/PolimiFunct.h
===================================================================
--- grass/trunk/vector/lidar/lidarlib/PolimiFunct.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/lidarlib/PolimiFunct.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,218 +0,0 @@
-
-/***********************************************************************
- *
- * MODULE:       lidarlib
- *
- * AUTHOR(S):    Roberto Antolin
- *
- * PURPOSE:      LIDAR library
- *
- * COPYRIGHT:    (C) 2006 by Politecnico di Milano -
- *                           Polo Regionale di Como
- *
- *               This program is free software under the
- *               GNU General Public License (>=v2).
- *               Read the file COPYING that comes with GRASS
- *               for details.
- *
- **************************************************************************/
-
-#ifndef _POLIMIFUNCT_H_
-#define _POLIMIFUNCT_H_
-
-#include <grass/config.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/gmath.h>
-
-/*----------------------------------------------------------------------------------------------------------*/
-/*CONSTANTS DECLARATION */
-
-#define NSPLX_MAX 	      150	/* Maximum number of splines along East direction used in the subregions interpolation */
-#define NSPLY_MAX	      150	/* Maximum number of splines along North direction used in the subregions interpolation */
-#define OVERLAP_SIZE 	       10	/* Subregions overlapping size. */
-#define LATO 		     1000	/* Side's size for v.lidar.growing. */
-#define CONTOUR		       15 	/**/
-#define GENERAL_ROW 		0
-#define GENERAL_COLUMN 	        1
-#define FIRST_ROW 		2
-#define LAST_ROW 		3
-#define FIRST_COLUMN	 	4
-#define LAST_COLUMN 		5
-    /* FIELDS ID */
-#define F_EDGE_DETECTION_CLASS	1
-#define F_CLASSIFICATION	2
-#define F_INTERPOLATION		3
-#define F_COUNTER_OBJ		4
-    /* PRE-CLASSIFICATION */
-#define PRE_TERRAIN 		1
-#define PRE_EDGE		2
-#define PRE_UNKNOWN		3
-    /* FINAL CLASSIFICATION */
-#define TERRAIN_SINGLE 	        1
-#define TERRAIN_DOUBLE	        2
-#define OBJECT_DOUBLE		3
-#define OBJECT_SINGLE		4
-    /* SINGLE OR DOUBLE PULSE */
-#define SINGLE_PULSE	        1
-#define DOUBLE_PULSE	        2
-    /* INTERPOLATOR */
-#define P_BILINEAR 		1
-#define P_BICUBIC 		0
-    /* Boolean definitions */
-#define TRUE 			1
-#define FALSE 			0
-
-/*----------------------------------------------------------------------------------------------------------*/
-    /*STRUCTS DECLARATION */
-    struct Reg_dimens
-{
-    double edge_h;		/*Horizontal tile edge */
-    double edge_v;		/*Vertical tile edge */
-    double overlap;		/*Tile's overlapping size */
-    double sn_size;		/*South-North side size */
-    double ew_size;		/*East-West side size */
-};
-
-struct Point
-{
-    double coordX;
-    double coordY;
-    double coordZ;
-    int lineID;
-    int cat;
-};
-
-struct element
-{
-    double value;
-    double residual;
-    int freq;
-};
-
-/*----------------------------------------------------------------------------------------------------------*/
-/*FUNCTIONS DECLARATION */
-/*zones */
-void P_zero_dim(struct Reg_dimens * /**/);
-int P_set_dim(struct Reg_dimens *, double, double, int *, int *);
-
-int P_set_regions(struct Cell_head *, /**/
-		  struct bound_box *, /**/
-		  struct bound_box *, /**/ struct Reg_dimens, /**/ int /**/);
-
-int P_get_edge(int, /**/ struct Reg_dimens *, /**/ double, /**/ double /**/);
-
-int P_get_BandWidth(int, /**/ int /**/);
-
-double P_estimate_splinestep(struct Map_info *, double *, double *);
-
-struct Point *P_Read_Vector_Region_Map(struct Map_info *, /**/
-				       struct Cell_head *, /**/
-				       int *, /**/ int, /**/ int /**/);
-
-struct Point *P_Read_Raster_Region_Map(double **, /**/
-				       struct Cell_head *, /**/
-				       struct Cell_head *, /**/
-				       int *, /**/ int *, /**/ int /**/);
-
-double P_Mean_Calc(struct Cell_head *, /**/ struct Point *, /**/ int /**/);
-
-/*----------------------------------------------------------------------------------------------------------*/
-void
-P_Sparse_Points(struct Map_info *, /**/
-		struct Cell_head *, /**/
-		struct bound_box, /**/
-		struct bound_box, /**/
-		double **, /**/
-		double *, /**/
-		int *, /**/
-		double, /**/
-		double, /**/
-		double, /**/
-		int, /**/
-		int, /**/
-		int, /**/
-		int, /**/
-		struct line_cats *, /**/
-		dbDriver *, /**/ double, /**/ char * /**/);
-
-double **P_Regular_Points(struct Cell_head *, /**/
-                          struct Cell_head *, /**/
-			  struct bound_box, /**/
-			  struct bound_box, /**/
-			  double **, /**/
-			  double *, /**/
-			  double, /**/
-			  double, /**/
-			  double, /**/
-			  double, /**/
-			  int, /**/ int, /**/ int, /**/ int, /**/ int /**/);
-
-/*----------------------------------------------------------------------------------------------------------*/
-int P_Create_Aux2_Table(dbDriver *, /**/ char * /**/);
-
-int P_Create_Aux4_Table(dbDriver *, /**/ char * /**/);
-
-int P_Drop_Aux_Table(dbDriver *, /**/ char * /**/);
-
-/*----------------------------------------------------------------------------------------------------------*/
-void P_Aux_to_Raster(double **, /**/ int /**/);
-
-void P_Aux_to_Vector(struct Map_info *, /**/
-		     struct Map_info *, /**/ dbDriver *, /**/ char * /**/);
-
-double **P_Null_Matrix(double ** /**/);
-
-/*---------------------------------------------------------------------------------------*/
-/*interpSpline */
-void normalDefBicubic(double **N, double *TN, double *Q, double **obsVect,
-		      double deltaX, double deltaY, int xNum, int yNum,
-		      double xMin, double yMin, int obsNum, int parNum,
-		      int BW);
-
-void normalDefBilin(double **N, double *TN, double *Q, double **obsVect,
-		    double deltaX, double deltaY, int xNum, int yNum,
-		    double xMin, double yMin, int obsNum, int parNum, int BW);
-
-void nCorrectLapl(double **N,	/* Normal Matrix () */
-		  double lambda,	/*  */
-		  int xNum,	/*  */
-		  int yNum,	/*  */
-		  double deltaX,	/*  */
-		  double deltaY);	/*  */
-
-void nCorrectGrad(double **N, double lambda, int xNum, int yNum,
-		  double deltaX, double deltaY);
-
-void obsEstimateBicubic(double **obsV,	/*  */
-			double *obsE,	/*  */
-			double *parV,	/*  */
-			double deltX,	/*  */
-			double deltY,	/*  */
-			int xNm,	/*  */
-			int yNm,	/*  */
-			double xMi,	/*  */
-			double yMi,	/*  */
-			int obsN);	/*  */
-
-double dataInterpolateBicubic(double x,	/*  */
-			      double y,	/*  */
-			      double deltaX,	/*  */
-			      double deltaY,	/*  */
-			      int xNum,	/*  */
-			      int yNum,	/*  */
-			      double xMin,	/*  */
-			      double yMin,	/*  */
-			      double *parVect);	/*  */
-
-void obsEstimateBilin(double **obsV, double *obsE, double *parV, double deltX,
-		      double deltY, int xNm, int yNm, double xMi, double yMi,
-		      int obsN);
-
-double dataInterpolateBilin(double x, double y, double deltaX, double deltaY,
-			    int xNum, int yNum, double xMin, double yMin,
-			    double *parVect);
-
-#endif

Copied: grass/trunk/vector/lidar/lidarlib/lidar.h (from rev 42312, grass/trunk/vector/lidar/lidarlib/PolimiFunct.h)
===================================================================
--- grass/trunk/vector/lidar/lidarlib/lidar.h	                        (rev 0)
+++ grass/trunk/vector/lidar/lidarlib/lidar.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -0,0 +1,218 @@
+
+/***********************************************************************
+ *
+ * MODULE:       lidarlib
+ *
+ * AUTHOR(S):    Roberto Antolin
+ *
+ * PURPOSE:      LIDAR library
+ *
+ * COPYRIGHT:    (C) 2006 by Politecnico di Milano -
+ *                           Polo Regionale di Como
+ *
+ *               This program is free software under the
+ *               GNU General Public License (>=v2).
+ *               Read the file COPYING that comes with GRASS
+ *               for details.
+ *
+ **************************************************************************/
+
+#ifndef _POLIMIFUNCT_H_
+#define _POLIMIFUNCT_H_
+
+#include <grass/gis.h>
+#include <grass/gmath.h>
+#include <grass/vector.h>
+#include <grass/dbmi.h>
+#include <grass/raster.h>
+#include <grass/glocale.h>
+
+/*----------------------------------------------------------------------------------------------------------*/
+/*CONSTANTS DECLARATION */
+
+#define NSPLX_MAX 	      150	/* Maximum number of splines along East direction used in the subregions interpolation */
+#define NSPLY_MAX	      150	/* Maximum number of splines along North direction used in the subregions interpolation */
+#define OVERLAP_SIZE 	       10	/* Subregions overlapping size. */
+#define LATO 		     1000	/* Side's size for v.lidar.growing. */
+#define CONTOUR		       15 	/**/
+#define GENERAL_ROW 		0
+#define GENERAL_COLUMN 	        1
+#define FIRST_ROW 		2
+#define LAST_ROW 		3
+#define FIRST_COLUMN	 	4
+#define LAST_COLUMN 		5
+    /* FIELDS ID */
+#define F_EDGE_DETECTION_CLASS	1
+#define F_CLASSIFICATION	2
+#define F_INTERPOLATION		3
+#define F_COUNTER_OBJ		4
+    /* PRE-CLASSIFICATION */
+#define PRE_TERRAIN 		1
+#define PRE_EDGE		2
+#define PRE_UNKNOWN		3
+    /* FINAL CLASSIFICATION */
+#define TERRAIN_SINGLE 	        1
+#define TERRAIN_DOUBLE	        2
+#define OBJECT_DOUBLE		3
+#define OBJECT_SINGLE		4
+    /* SINGLE OR DOUBLE PULSE */
+#define SINGLE_PULSE	        1
+#define DOUBLE_PULSE	        2
+    /* INTERPOLATOR */
+#define P_BILINEAR 		1
+#define P_BICUBIC 		0
+    /* Boolean definitions */
+#define TRUE 			1
+#define FALSE 			0
+
+/*----------------------------------------------------------------------------------------------------------*/
+    /*STRUCTS DECLARATION */
+    struct Reg_dimens
+{
+    double edge_h;		/*Horizontal tile edge */
+    double edge_v;		/*Vertical tile edge */
+    double overlap;		/*Tile's overlapping size */
+    double sn_size;		/*South-North side size */
+    double ew_size;		/*East-West side size */
+};
+
+struct Point
+{
+    double coordX;
+    double coordY;
+    double coordZ;
+    int lineID;
+    int cat;
+};
+
+struct element
+{
+    double value;
+    double residual;
+    int freq;
+};
+
+/*----------------------------------------------------------------------------------------------------------*/
+/*FUNCTIONS DECLARATION */
+/*zones */
+void P_zero_dim(struct Reg_dimens * /**/);
+int P_set_dim(struct Reg_dimens *, double, double, int *, int *);
+
+int P_set_regions(struct Cell_head *, /**/
+		  struct bound_box *, /**/
+		  struct bound_box *, /**/ struct Reg_dimens, /**/ int /**/);
+
+int P_get_edge(int, /**/ struct Reg_dimens *, /**/ double, /**/ double /**/);
+
+int P_get_BandWidth(int, /**/ int /**/);
+
+double P_estimate_splinestep(struct Map_info *, double *, double *);
+
+struct Point *P_Read_Vector_Region_Map(struct Map_info *, /**/
+				       struct Cell_head *, /**/
+				       int *, /**/ int, /**/ int /**/);
+
+struct Point *P_Read_Raster_Region_Map(double **, /**/
+				       struct Cell_head *, /**/
+				       struct Cell_head *, /**/
+				       int *, /**/ int *, /**/ int /**/);
+
+double P_Mean_Calc(struct Cell_head *, /**/ struct Point *, /**/ int /**/);
+
+/*----------------------------------------------------------------------------------------------------------*/
+void
+P_Sparse_Points(struct Map_info *, /**/
+		struct Cell_head *, /**/
+		struct bound_box, /**/
+		struct bound_box, /**/
+		double **, /**/
+		double *, /**/
+		int *, /**/
+		double, /**/
+		double, /**/
+		double, /**/
+		int, /**/
+		int, /**/
+		int, /**/
+		int, /**/
+		struct line_cats *, /**/
+		dbDriver *, /**/ double, /**/ char * /**/);
+
+double **P_Regular_Points(struct Cell_head *, /**/
+                          struct Cell_head *, /**/
+			  struct bound_box, /**/
+			  struct bound_box, /**/
+			  double **, /**/
+			  double *, /**/
+			  double, /**/
+			  double, /**/
+			  double, /**/
+			  double, /**/
+			  int, /**/ int, /**/ int, /**/ int, /**/ int /**/);
+
+/*----------------------------------------------------------------------------------------------------------*/
+int P_Create_Aux2_Table(dbDriver *, /**/ char * /**/);
+
+int P_Create_Aux4_Table(dbDriver *, /**/ char * /**/);
+
+int P_Drop_Aux_Table(dbDriver *, /**/ char * /**/);
+
+/*----------------------------------------------------------------------------------------------------------*/
+void P_Aux_to_Raster(double **, /**/ int /**/);
+
+void P_Aux_to_Vector(struct Map_info *, /**/
+		     struct Map_info *, /**/ dbDriver *, /**/ char * /**/);
+
+double **P_Null_Matrix(double ** /**/);
+
+/*---------------------------------------------------------------------------------------*/
+/*interpSpline */
+void normalDefBicubic(double **N, double *TN, double *Q, double **obsVect,
+		      double deltaX, double deltaY, int xNum, int yNum,
+		      double xMin, double yMin, int obsNum, int parNum,
+		      int BW);
+
+void normalDefBilin(double **N, double *TN, double *Q, double **obsVect,
+		    double deltaX, double deltaY, int xNum, int yNum,
+		    double xMin, double yMin, int obsNum, int parNum, int BW);
+
+void nCorrectLapl(double **N,	/* Normal Matrix () */
+		  double lambda,	/*  */
+		  int xNum,	/*  */
+		  int yNum,	/*  */
+		  double deltaX,	/*  */
+		  double deltaY);	/*  */
+
+void nCorrectGrad(double **N, double lambda, int xNum, int yNum,
+		  double deltaX, double deltaY);
+
+void obsEstimateBicubic(double **obsV,	/*  */
+			double *obsE,	/*  */
+			double *parV,	/*  */
+			double deltX,	/*  */
+			double deltY,	/*  */
+			int xNm,	/*  */
+			int yNm,	/*  */
+			double xMi,	/*  */
+			double yMi,	/*  */
+			int obsN);	/*  */
+
+double dataInterpolateBicubic(double x,	/*  */
+			      double y,	/*  */
+			      double deltaX,	/*  */
+			      double deltaY,	/*  */
+			      int xNum,	/*  */
+			      int yNum,	/*  */
+			      double xMin,	/*  */
+			      double yMin,	/*  */
+			      double *parVect);	/*  */
+
+void obsEstimateBilin(double **obsV, double *obsE, double *parV, double deltX,
+		      double deltY, int xNm, int yNm, double xMi, double yMi,
+		      int obsN);
+
+double dataInterpolateBilin(double x, double y, double deltaX, double deltaY,
+			    int xNum, int yNum, double xMin, double yMin,
+			    double *parVect);
+
+#endif

Modified: grass/trunk/vector/lidar/lidarlib/raster.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/raster.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/lidarlib/raster.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,16 +1,9 @@
+#include <grass/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <grass/lidar.h>
 
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-
-#include "PolimiFunct.h"
-
 /*------------------------------------------------------------------------------------------------*/
 void
 P_Sparse_Points(struct Map_info *Out, struct Cell_head *Elaboration,

Modified: grass/trunk/vector/lidar/lidarlib/zones.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/zones.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/lidarlib/zones.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,16 +1,9 @@
+#include <grass/config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <grass/lidar.h>
 
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-
-#include "PolimiFunct.h"
-
 /*----------------------------------------------------------------------------------------*/
 void P_zero_dim(struct Reg_dimens *dim)
 {

Modified: grass/trunk/vector/lidar/r.resamp.bspline/bspline.h
===================================================================
--- grass/trunk/vector/lidar/r.resamp.bspline/bspline.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/r.resamp.bspline/bspline.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -18,15 +18,7 @@
  **************************************************************************/
 
  /*INCLUDES*/
-#include <stdlib.h>
-#include <string.h>
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
+#include <grass/lidar.h>
      /*STRUCTURES*/ struct Stats
 {
     double *estima;

Modified: grass/trunk/vector/lidar/r.resamp.bspline/crosscorr.c
===================================================================
--- grass/trunk/vector/lidar/r.resamp.bspline/crosscorr.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/r.resamp.bspline/crosscorr.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,9 +1,10 @@
 
 /***********************************************************************
  *
- * MODULE:       v.surf.bspline
+ * MODULE:       r.resamp.bspline
  *
- * AUTHOR(S):    Roberto Antolin
+ * AUTHOR(S):    Roberto Antolin (v.surf.bspline)
+ *               Markus Metz (adapted for r.resamp.bspline)
  *
  * PURPOSE:      Spline Interpolation and cross correlation
  *
@@ -18,16 +19,12 @@
  **************************************************************************/
 
  /*INCLUDES*/
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
 #include "bspline.h"
+
 #define NDATA_MAX 100
 #define PARAM_LAMBDA 6
 #define PARAM_SPLINE 0

Modified: grass/trunk/vector/lidar/r.resamp.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/r.resamp.bspline/main.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/r.resamp.bspline/main.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -17,16 +17,10 @@
  **********************************************************************/
 
 /* INCLUDES */
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
 #include "bspline.h"
 
 /*--------------------------------------------------------------------*/

Modified: grass/trunk/vector/lidar/r.resamp.bspline/resamp.c
===================================================================
--- grass/trunk/vector/lidar/r.resamp.bspline/resamp.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/r.resamp.bspline/resamp.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -16,6 +16,10 @@
  *
  **************************************************************************/
 
+#include <grass/config.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
 #include "bspline.h"
 
 struct Point *P_Read_Raster_Region_Nulls(double **matrix,

Modified: grass/trunk/vector/lidar/v.lidar.correction/correction.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/correction.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.correction/correction.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,30 +1,27 @@
 
-/**************************************************************
- *									*
- * MODULE:       v.lidar.correction					*
- * 									*
- * AUTHOR(S):    Roberto Antolin & Gonzalo Moreno			*
- *               							*
- * PURPOSE:      Correction of the v.growing output			*
- *               							*
- * COPYRIGHT:    (C) 2006 by Politecnico di Milano - 			*
- *			     Polo Regionale di Como			*
- *									*
- *               This program is free software under the 		*
- *               GNU General Public License (>=v2). 			*
- *               Read the file COPYING that comes with GRASS		*
- *               for details.						*
- *									*
- **************************************************************/
+/********************************************************************
+ *								    *
+ * MODULE:       v.lidar.correction				    *
+ * 								    *
+ * AUTHOR(S):    Roberto Antolin & Gonzalo Moreno                   *
+ *               general update Markus Metz      		    *
+ *               						    *
+ * PURPOSE:      Correction of the v.growing output		    *
+ *               						    *
+ * COPYRIGHT:    (C) 2006 by Politecnico di Milano - 		    *
+ *			     Polo Regionale di Como		    *
+ *								    *
+ *               This program is free software under the 	    *
+ *               GNU General Public License (>=v2). 		    *
+ *               Read the file COPYING that comes with GRASS	    *
+ *               for details.					    *
+ *								    *
+ ********************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-
 #include "correction.h"
 
 void

Modified: grass/trunk/vector/lidar/v.lidar.correction/correction.h
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/correction.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.correction/correction.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -3,10 +3,10 @@
 #include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/dbmi.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
+#include <grass/lidar.h>
 
-#include <grass/PolimiFunct.h>
-
 struct lidar_cat
 {
     int cat_edge;     /* category in layer F_EDGE_DETECTION_CLASS */

Modified: grass/trunk/vector/lidar/v.lidar.correction/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.correction/main.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.correction/main.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,33 +1,28 @@
 
-/**************************************************************
- *									*
- * MODULE:       v.lidar.correction					*
- * 									*
- * AUTHOR(S):    Roberto Antolin & Gonzalo Moreno			*
- *               							*
- * PURPOSE:      Correction of the v.growing output			*
- *               							*
- * COPYRIGHT:    (C) 2005 by Politecnico di Milano - 			*
- *			     Polo Regionale di Como			*
- *									*
- *               This program is free software under the 		*
- *               GNU General Public License (>=v2). 			*
- *               Read the file COPYING that comes with GRASS		*
- *               for details.						*
- *									*
- **************************************************************/
+/********************************************************************
+ *								    *
+ * MODULE:       v.lidar.correction				    *
+ * 								    *
+ * AUTHOR(S):    Roberto Antolin & Gonzalo Moreno                   *
+ *               general update Markus Metz      		    *
+ *               						    *
+ * PURPOSE:      Correction of the v.growing output		    *
+ *               						    *
+ * COPYRIGHT:    (C) 2005 by Politecnico di Milano - 		    *
+ *			     Polo Regionale di Como		    *
+ *								    *
+ *               This program is free software under the 	    *
+ *               GNU General Public License (>=v2). 		    *
+ *               Read the file COPYING that comes with GRASS	    *
+ *               for details.					    *
+ *								    *
+ ********************************************************************/
 
  /*INCLUDES*/
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/config.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/raster.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/PolimiFunct.h>
 #include "correction.h"
 
 /*----------------------------------------------------------------------------------------------------------*/

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -27,11 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-    /* #include <grass/PolimiFunct.h> */
 #include "edgedetection.h"
 
 int edge_detection(struct Cell_head elaboration_reg, struct bound_box Overlap_Box,

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.h
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/edgedetection.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -26,8 +26,9 @@
 #include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/dbmi.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
-#include <grass/PolimiFunct.h>
+#include <grass/lidar.h>
 
 /*---------------------------------------------------------------------------------------*/
 int edge_detection(struct Cell_head, /**/

Modified: grass/trunk/vector/lidar/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.edgedetection/main.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -23,15 +23,10 @@
  **************************************************************/
 
  /*INCLUDES*/
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
 #include "edgedetection.h"
 
 int nsply, nsplx, line_out_counter;

Modified: grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.growing/ConvexHull.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grass/gis.h>
+#include <assert.h>
 
 #include "growing.h"
 

Modified: grass/trunk/vector/lidar/v.lidar.growing/growing.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/growing.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.growing/growing.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,9 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-
 #include "growing.h"
 
 void P_Aux_to_Coor(struct Map_info *In, struct Map_info *Out,

Modified: grass/trunk/vector/lidar/v.lidar.growing/growing.h
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/growing.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.growing/growing.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -1,10 +1,9 @@
-#include <assert.h>
-
 #include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/dbmi.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
-#include <grass/PolimiFunct.h>
+#include <grass/lidar.h>
 
 /*--------------------------------------------------------------------------*/
 /* Definitions for Convex-Hull algorithm */

Modified: grass/trunk/vector/lidar/v.lidar.growing/main.c
===================================================================
--- grass/trunk/vector/lidar/v.lidar.growing/main.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.lidar.growing/main.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -20,16 +20,12 @@
  ****************************************************************/
 
  /*INCLUDES*/
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/config.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/raster.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
 #include "growing.h"
+
     /* GLOBAL DEFINITIONS */
 int nsply, nsplx, count_obj;
 double stepN, stepE;

Modified: grass/trunk/vector/lidar/v.outlier/main.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/main.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.outlier/main.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -18,16 +18,12 @@
  ************************************************************************/
 
  /*INCLUDES*/
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/config.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/PolimiFunct.h>
 #include "outlier.h"
+
     /* GLOBAL VARIABLES DEFINITIONS */
 int nsply, nsplx;
 double stepN, stepE, Thres_Outlier;

Modified: grass/trunk/vector/lidar/v.outlier/outlier.c
===================================================================
--- grass/trunk/vector/lidar/v.outlier/outlier.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.outlier/outlier.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -2,10 +2,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-
 #include "outlier.h"
 
 extern double Thres_Outlier;

Modified: grass/trunk/vector/lidar/v.outlier/outlier.h
===================================================================
--- grass/trunk/vector/lidar/v.outlier/outlier.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.outlier/outlier.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -2,9 +2,8 @@
 #include <grass/vector.h>
 #include <grass/dbmi.h>
 #include <grass/glocale.h>
+#include <grass/lidar.h>
 
-#include <grass/PolimiFunct.h>
-
 /*--------------------------------------------------------------------------*/
 /*FUNCTIONS DECLARATION */
 void

Modified: grass/trunk/vector/lidar/v.surf.bspline/bspline.h
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/bspline.h	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.surf.bspline/bspline.h	2010-05-19 08:50:08 UTC (rev 42316)
@@ -18,15 +18,15 @@
  **************************************************************************/
 
  /*INCLUDES*/
-#include <stdlib.h>
-#include <string.h>
 #include <grass/gis.h>
 #include <grass/vector.h>
 #include <grass/dbmi.h>
+#include <grass/raster.h>
 #include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
-     /*STRUCTURES*/ struct Stats
+#include <grass/lidar.h>
+
+/*STRUCTURES*/
+struct Stats
 {
     double *estima;
     double *error;

Modified: grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.surf.bspline/crosscorr.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -18,16 +18,12 @@
  **************************************************************************/
 
  /*INCLUDES*/
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
 #include "bspline.h"
+
 #define NDATA_MAX 100
 #define PARAM_LAMBDA 6
 #define PARAM_SPLINE 0

Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c	2010-05-19 07:44:52 UTC (rev 42315)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c	2010-05-19 08:50:08 UTC (rev 42316)
@@ -19,16 +19,10 @@
  **********************************************************************/
 
 /* INCLUDES */
+#include <grass/config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <grass/gis.h>
-#include <grass/raster.h>
-#include <grass/vector.h>
-#include <grass/dbmi.h>
-#include <grass/glocale.h>
-#include <grass/config.h>
-#include <grass/PolimiFunct.h>
 #include "bspline.h"
 
 /* GLOBAL VARIABLES */



More information about the grass-commit mailing list