[DebianGIS-dev] [SCM] saga branch, master, updated. 351bb38cf9c3189573d0da6962fa07b23ca45fca
Johan Van de Wauw
johan.vandewauw at gmail.com
Fri Mar 19 10:11:51 UTC 2010
The following commit has been merged in the master branch:
commit 351bb38cf9c3189573d0da6962fa07b23ca45fca
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date: Fri Mar 5 00:52:45 2010 +0100
Remove Modified Shepard module that also relies on triangle.c
diff --git a/configure b/configure
index c52b642..f470fcd 100755
--- a/configure
+++ b/configure
@@ -15356,7 +15356,7 @@ fi
#AC_CONFIG_FILES([Makefile])
-ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_gui/Makefile src/modules/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_discretisation/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_simulation/fire/Makefile src/modules_simulation/fire/sim_fire_spreading/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/saga_core/Makefile src/saga_core/saga_api/Makefile src/saga_core/saga_gdi/Makefile src/saga_core/saga_cmd/Makefile src/saga_core/saga_gui/Makefile src/modules/Makefile src/modules/grid/Makefile src/modules/grid/grid_analysis/Makefile src/modules/grid/grid_calculus/Makefile src/modules/grid/grid_discretisation/Makefile src/modules/grid/grid_filter/Makefile src/modules/grid/grid_gridding/Makefile src/modules/grid/grid_spline/Makefile src/modules/grid/grid_tools/Makefile src/modules/grid/grid_visualisation/Makefile src/modules/pointcloud/Makefile src/modules/pointcloud/pointcloud_tools/Makefile src/modules/pointcloud/pointcloud_viewer/Makefile src/modules/shapes/Makefile src/modules/shapes/shapes_grid/Makefile src/modules/shapes/shapes_lines/Makefile src/modules/shapes/shapes_points/Makefile src/modules/shapes/shapes_polygons/Makefile src/modules/shapes/shapes_tools/Makefile src/modules/table/Makefile src/modules/table/table_calculus/Makefile src/modules/table/table_tools/Makefile src/modules/tin/Makefile src/modules/tin/tin_tools/Makefile src/modules_contrib/Makefile src/modules_contrib/contrib_a_perego/Makefile src/modules_contrib/contrib_a_perego/contrib_a_perego/Makefile src/modules_geostatistics/Makefile src/modules_geostatistics/geostatistics/Makefile src/modules_geostatistics/geostatistics/geostatistics_points/Makefile src/modules_geostatistics/geostatistics/geostatistics_grid/Makefile src/modules_geostatistics/geostatistics/geostatistics_kriging/Makefile src/modules_io/Makefile src/modules_io/esri_e00/Makefile src/modules_io/esri_e00/io_esri_e00/Makefile src/modules_io/shapes/Makefile src/modules_io/shapes/io_shapes/Makefile src/modules_io/shapes/io_shapes_dxf/Makefile src/modules_io/grid/Makefile src/modules_io/grid/io_grid/Makefile src/modules_io/grid/io_grid_image/Makefile src/modules_io/grid/io_grid_grib2/Makefile src/modules_io/gps/Makefile src/modules_io/gps/io_gps/Makefile src/modules_io/table/Makefile src/modules_io/table/io_table/Makefile src/modules_io/gdal/Makefile src/modules_io/gdal/io_gdal/Makefile src/modules_lectures/Makefile src/modules_lectures/lectures/Makefile src/modules_lectures/lectures/lectures_introduction/Makefile src/modules_projection/Makefile src/modules_projection/pj_georeference/Makefile src/modules_projection/pj_georeference/pj_georeference/Makefile src/modules_projection/pj_proj4/Makefile src/modules_projection/pj_proj4/pj_proj4/Makefile src/modules_recreations/Makefile src/modules_recreations/recreations/Makefile src/modules_recreations/recreations/recreations_fractals/Makefile src/modules_recreations/recreations/recreations_games/Makefile src/modules_simulation/Makefile src/modules_simulation/hydrology/Makefile src/modules_simulation/hydrology/sim_hydrology/Makefile src/modules_simulation/cellular_automata/Makefile src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile src/modules_simulation/ecosystems/Makefile src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile src/modules_terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/Makefile src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile src/modules_terrain_analysis/terrain_analysis/ta_hydrology/Makefile src/modules_terrain_analysis/terrain_analysis/ta_lighting/Makefile src/modules_terrain_analysis/terrain_analysis/ta_morphometry/Makefile src/modules_terrain_analysis/terrain_analysis/ta_preprocessor/Makefile src/modules_terrain_analysis/terrain_analysis/ta_profiles/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -16512,8 +16512,6 @@ do
"src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/cellular_automata/sim_cellular_automata/Makefile" ;;
"src/modules_simulation/ecosystems/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/Makefile" ;;
"src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/ecosystems/sim_ecosystems_hugget/Makefile" ;;
- "src/modules_simulation/fire/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/fire/Makefile" ;;
- "src/modules_simulation/fire/sim_fire_spreading/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_simulation/fire/sim_fire_spreading/Makefile" ;;
"src/modules_terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/Makefile" ;;
"src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules_terrain_analysis/terrain_analysis/ta_channels/Makefile" ;;
diff --git a/debian/changelog b/debian/changelog
index 8b5f4ba..78ca87b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ saga (2.0.4+dfsg1) unstable; urgency=low
* Use grib2 in debian instead of static linked version
* Separate saga-dev package
* Fix sonumbers for saga_api.so and saga_gdi
- * Add Provides: info for libsaga_api and libsaga_gdi
+ * Remove non-free components (in grid_gridding and fire_simulation)
[ Francesco Paolo Lovergine ]
* Maintainer set to DebianGis team, with git maintenance.
diff --git a/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp b/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp
deleted file mode 100644
index a8fc9d9..0000000
--- a/src/modules/grid/grid_gridding/Interpolation_Shepard.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-
-///////////////////////////////////////////////////////////
-// //
-// SAGA //
-// //
-// System for Automated Geoscientific Analyses //
-// //
-// Module Library: //
-// Grid_Gridding //
-// //
-//-------------------------------------------------------//
-// //
-// Interpolation_Shepard.cpp //
-// //
-// Copyright (C) 2003 by //
-// Andre Ringeler //
-// //
-//-------------------------------------------------------//
-// //
-// This file is part of 'SAGA - System for Automated //
-// Geoscientific Analyses'. SAGA is free software; you //
-// can redistribute it and/or modify it under the terms //
-// of the GNU General Public License as published by the //
-// Free Software Foundation; version 2 of the License. //
-// //
-// SAGA is distributed in the hope that it will be //
-// useful, but WITHOUT ANY WARRANTY; without even the //
-// implied warranty of MERCHANTABILITY or FITNESS FOR A //
-// PARTICULAR PURPOSE. See the GNU General Public //
-// License for more details. //
-// //
-// You should have received a copy of the GNU General //
-// Public License along with this program; if not, //
-// write to the Free Software Foundation, Inc., //
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, //
-// USA. //
-// //
-//-------------------------------------------------------//
-// //
-// e-mail: aringel at gwdg.de //
-// //
-// contact: Andre Ringeler //
-// Institute of Geography //
-// University of Goettingen //
-// Goldschmidtstr. 5 //
-// 37077 Goettingen //
-// Germany //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-#include "Interpolation_Shepard.h"
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-CInterpolation_Shepard::CInterpolation_Shepard(void)
-{
- Set_Name (_TL("Modifed Quadratic Shepard"));
-
- Set_Author (_TL("Copyrights (c) 2003 by Andre Ringeler"));
-
- Set_Description (_TW(
- "Modified Quadratic Shepard method for grid interpolation "
- "from irregular distributed points. This module is based on "
- "Module 660 in TOMS.\n"
-
- "QSHEP2D: Fortran routines implementing the Quadratic Shepard "
- "method for bivariate interpolation of scattered data "
- "(see R. J. Renka, ACM TOMS 14 (1988) pp.149-150).\n"
-
- "Classes: E2b. Interpolation of scattered, non-gridded multivariate data."
- ));
-
- Parameters.Add_Value(
- NULL , "QUADRATIC_NEIGHBORS" , _TL("Quadratic Neighbors"),
- _TL(""),
- PARAMETER_TYPE_Int , 13, 5, true
- );
-
- Parameters.Add_Value(
- NULL , "WEIGHTING_NEIGHBORS" , _TL("Weighting Neighbors"),
- _TL(""),
- PARAMETER_TYPE_Int , 19, 3, true
- );
-
-
-}
-
-//---------------------------------------------------------
-CInterpolation_Shepard::~CInterpolation_Shepard(void)
-{}
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-bool CInterpolation_Shepard::On_Initialize(void)
-{
- Quadratic_Neighbors = Parameters("QUADRATIC_NEIGHBORS") ->asInt();
- Weighting_Neighbors = Parameters("WEIGHTING_NEIGHBORS") ->asInt();
-
- m_pShapes = Get_Points();
- MaxPoints = m_pShapes->Get_Count();
-
- if( MaxPoints > 1 )
- {
- x_vals = (double *)malloc(MaxPoints*sizeof(double));
- y_vals = (double *)malloc(MaxPoints*sizeof(double));
- f_vals = (double *)malloc(MaxPoints*sizeof(double));
-
- for(int iPoint=0; iPoint<MaxPoints; iPoint++)
- {
- x_vals[iPoint] = m_pShapes->Get_Shape(iPoint)->Get_Point(0).x;
- y_vals[iPoint] = m_pShapes->Get_Shape(iPoint)->Get_Point(0).y;
- f_vals[iPoint] = m_pShapes->Get_Shape(iPoint)->asDouble(m_zField);
- }
-
- Remove_Duplicate();
-
- Interpolator.Interpolate(x_vals, y_vals, f_vals, MaxPoints - 1, Quadratic_Neighbors, Weighting_Neighbors);
- }
-
- return( MaxPoints > 1 );
-}
-
-//---------------------------------------------------------
-bool CInterpolation_Shepard::On_Finalize(void)
-{
- free(x_vals);
- free(y_vals);
- free(f_vals);
-
- return( true );
-}
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-bool CInterpolation_Shepard::Get_Value(double x, double y, double &z)
-{
- Interpolator.GetValue(x, y, z);
-
- return( true );
-}
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-static int Comp_Func(const void * vData1, const void * vData2)
-{
- Data_Point * val_1 = (Data_Point *)vData1;
- Data_Point * val_2 = (Data_Point *)vData2;
-
- if (val_1->y < val_2->y)
- {
- return (-1);
- }
- if (val_1->y > val_2->y)
- {
- return (1);
- }
- if (val_1->x < val_2->x)
- {
- return (-1);
- }
- if (val_1->x > val_2->x)
- {
- return (1);
- }
- return (0);
-}
-
-//---------------------------------------------------------
-#define eps 1e-7
-
-//---------------------------------------------------------
-void CInterpolation_Shepard::Remove_Duplicate()
-{
- Data_Point * Data;
- int i,j;
-
- Data = (Data_Point * ) malloc (MaxPoints * sizeof(Data_Point) );
-
- for (i = 0; i < MaxPoints; i++)
- {
- Data[i].x = x_vals[i];
- Data[i].y = y_vals[i];
- Data[i].val = f_vals[i];
- }
-
- qsort((void *)Data, MaxPoints, sizeof(Data_Point), Comp_Func);
-
- bool durty = true;
-
- while (durty)
- {
- durty = false;
- for (i = 0; i < MaxPoints -1; ++i)
- {
- if (fabs(Data[i].y - Data[i + 1].y) < eps)
- if (fabs(Data[i].x - Data[i + 1].x) < eps)
- {
- for (j = i; j < MaxPoints -1; j++)
- {
- Data[j].x = Data[j + 1].x;
- Data[j].y = Data[j + 1].y;
- Data[j].val = Data[j + 1].val;
- }
-
- MaxPoints--;
- durty = true;
- }
- }
- qsort((void *)Data, MaxPoints, sizeof(Data_Point), Comp_Func);
- }
-
- for (i = 0; i < MaxPoints; i++)
- {
- x_vals[i] = Data[i].x;
- y_vals[i] = Data[i].y;
- f_vals[i] = Data[i].val;
- }
-
- free( Data );
-}
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
diff --git a/src/modules/grid/grid_gridding/Interpolation_Shepard.h b/src/modules/grid/grid_gridding/Interpolation_Shepard.h
deleted file mode 100644
index 06913cb..0000000
--- a/src/modules/grid/grid_gridding/Interpolation_Shepard.h
+++ /dev/null
@@ -1,135 +0,0 @@
-
-///////////////////////////////////////////////////////////
-// //
-// SAGA //
-// //
-// System for Automated Geoscientific Analyses //
-// //
-// Module Library: //
-// Grid_Gridding //
-// //
-//-------------------------------------------------------//
-// //
-// Interpolation_Shepard.h //
-// //
-// Copyright (C) 2003 by //
-// Andre Ringeler //
-// //
-//-------------------------------------------------------//
-// //
-// This file is part of 'SAGA - System for Automated //
-// Geoscientific Analyses'. SAGA is free software; you //
-// can redistribute it and/or modify it under the terms //
-// of the GNU General Public License as published by the //
-// Free Software Foundation; version 2 of the License. //
-// //
-// SAGA is distributed in the hope that it will be //
-// useful, but WITHOUT ANY WARRANTY; without even the //
-// implied warranty of MERCHANTABILITY or FITNESS FOR A //
-// PARTICULAR PURPOSE. See the GNU General Public //
-// License for more details. //
-// //
-// You should have received a copy of the GNU General //
-// Public License along with this program; if not, //
-// write to the Free Software Foundation, Inc., //
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, //
-// USA. //
-// //
-//-------------------------------------------------------//
-// //
-// e-mail: aringel at gwdg.de //
-// //
-// contact: Andre Ringeler //
-// Institute of Geography //
-// University of Goettingen //
-// Goldschmidtstr. 5 //
-// 37077 Goettingen //
-// Germany //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-
-
-///////////////////////////////////////////////////////////
-// //
-// Interpolation_Shepard.h //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-#ifndef HEADER_INCLUDED__Interpolation_Shepard_H
-#define HEADER_INCLUDED__Interpolation_Shepard_H
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-#include "Interpolation.h"
-#include "Shepard.h"
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-typedef struct
-{
- double x ;
- double y ;
- double val;
-}
-Data_Point;
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-class CInterpolation_Shepard : public CInterpolation
-{
-public:
- CInterpolation_Shepard(void);
- virtual ~CInterpolation_Shepard(void);
-
-
-protected:
-
- virtual bool On_Initialize (void);
- virtual bool On_Finalize (void);
-
- virtual bool Get_Value (double x, double y, double &z);
-
-
-private:
-
- int MaxPoints, Quadratic_Neighbors, Weighting_Neighbors;
-
- double *x_vals, *y_vals, *f_vals;
-
- CShepard2d Interpolator;
-
-
- void Remove_Duplicate (void);
-
-};
-
-
-///////////////////////////////////////////////////////////
-// //
-// //
-// //
-///////////////////////////////////////////////////////////
-
-//---------------------------------------------------------
-#endif // #ifndef HEADER_INCLUDED__Interpolation_Shepard_H
diff --git a/src/modules/grid/grid_gridding/MLB_Interface.cpp b/src/modules/grid/grid_gridding/MLB_Interface.cpp
index f6342ee..d469fd9 100644
--- a/src/modules/grid/grid_gridding/MLB_Interface.cpp
+++ b/src/modules/grid/grid_gridding/MLB_Interface.cpp
@@ -93,7 +93,6 @@ const SG_Char * Get_Info(int i)
#include "Interpolation_InverseDistance.h"
#include "Interpolation_NearestNeighbour.h"
-#include "Interpolation_Shepard.h"
#include "Interpolation_Triangulation.h"
#include "Shapes2Grid.h"
@@ -108,8 +107,7 @@ CSG_Module * Create_Module(int i)
case 0: return( new CShapes2Grid );
case 1: return( new CInterpolation_InverseDistance );
case 2: return( new CInterpolation_NearestNeighbour );
- case 3: return( new CInterpolation_Shepard );
- case 4: return( new CInterpolation_Triangulation );
+ case 3: return( new CInterpolation_Triangulation );
}
return( NULL );
diff --git a/src/modules/grid/grid_gridding/Makefile.am b/src/modules/grid/grid_gridding/Makefile.am
index 9199c5c..9b4aba8 100644
--- a/src/modules/grid/grid_gridding/Makefile.am
+++ b/src/modules/grid/grid_gridding/Makefile.am
@@ -18,37 +18,16 @@ pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES =\
Interpolation.cpp\
Interpolation_InverseDistance.cpp\
-Interpolation_NaturalNeighbour.cpp\
Interpolation_NearestNeighbour.cpp\
-Interpolation_Shepard.cpp\
Interpolation_Triangulation.cpp\
MLB_Interface.cpp\
Shapes2Grid.cpp\
-Shepard.cpp\
-./nn/delaunay.c\
-./nn/hash.c\
-./nn/istack.c\
-./nn/lpi.c\
-./nn/nnai.c\
-./nn/nncommon.c\
-./nn/nnpi.c\
-./nn/triangle.c\
Interpolation.h\
Interpolation_InverseDistance.h\
-Interpolation_NaturalNeighbour.h\
Interpolation_NearestNeighbour.h\
-Interpolation_Shepard.h\
Interpolation_Triangulation.h\
MLB_Interface.h\
-Shapes2Grid.h\
-Shepard.h\
-./nn/delaunay.h\
-./nn/hash.h\
-./nn/istack.h\
-./nn/nan.h\
-./nn/nn.h\
-./nn/triangle.h\
-./nn/version.h
+Shapes2Grid.h
libgrid_gridding_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
diff --git a/src/modules/grid/grid_gridding/Makefile.in b/src/modules/grid/grid_gridding/Makefile.in
index 0748721..4a6aa3c 100644
--- a/src/modules/grid/grid_gridding/Makefile.in
+++ b/src/modules/grid/grid_gridding/Makefile.in
@@ -71,25 +71,13 @@ libgrid_gridding_la_DEPENDENCIES = \
$(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
am_libgrid_gridding_la_OBJECTS = Interpolation.lo \
Interpolation_InverseDistance.lo \
- Interpolation_NaturalNeighbour.lo \
- Interpolation_NearestNeighbour.lo Interpolation_Shepard.lo \
- Interpolation_Triangulation.lo MLB_Interface.lo Shapes2Grid.lo \
- Shepard.lo delaunay.lo hash.lo istack.lo lpi.lo nnai.lo \
- nncommon.lo nnpi.lo triangle.lo
+ Interpolation_NearestNeighbour.lo \
+ Interpolation_Triangulation.lo MLB_Interface.lo Shapes2Grid.lo
libgrid_gridding_la_OBJECTS = $(am_libgrid_gridding_la_OBJECTS)
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -99,6 +87,15 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
SOURCES = $(libgrid_gridding_la_SOURCES)
DIST_SOURCES = $(libgrid_gridding_la_SOURCES)
ETAGS = etags
@@ -236,43 +233,22 @@ pkglib_LTLIBRARIES = libgrid_gridding.la
libgrid_gridding_la_SOURCES = \
Interpolation.cpp\
Interpolation_InverseDistance.cpp\
-Interpolation_NaturalNeighbour.cpp\
Interpolation_NearestNeighbour.cpp\
-Interpolation_Shepard.cpp\
Interpolation_Triangulation.cpp\
MLB_Interface.cpp\
Shapes2Grid.cpp\
-Shepard.cpp\
-./nn/delaunay.c\
-./nn/hash.c\
-./nn/istack.c\
-./nn/lpi.c\
-./nn/nnai.c\
-./nn/nncommon.c\
-./nn/nnpi.c\
-./nn/triangle.c\
Interpolation.h\
Interpolation_InverseDistance.h\
-Interpolation_NaturalNeighbour.h\
Interpolation_NearestNeighbour.h\
-Interpolation_Shepard.h\
Interpolation_Triangulation.h\
MLB_Interface.h\
-Shapes2Grid.h\
-Shepard.h\
-./nn/delaunay.h\
-./nn/hash.h\
-./nn/istack.h\
-./nn/nan.h\
-./nn/nn.h\
-./nn/triangle.h\
-./nn/version.h
+Shapes2Grid.h
libgrid_gridding_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
+.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -345,98 +321,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Interpolation.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Interpolation_InverseDistance.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Interpolation_NaturalNeighbour.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Interpolation_NearestNeighbour.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Interpolation_Shepard.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Interpolation_Triangulation.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MLB_Interface.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Shapes2Grid.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Shepard.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/delaunay.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hash.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/istack.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lpi.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nnai.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nncommon.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nnpi.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/triangle.Plo at am__quote@
-
-.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
- at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-delaunay.lo: ./nn/delaunay.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT delaunay.lo -MD -MP -MF $(DEPDIR)/delaunay.Tpo -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/delaunay.Tpo $(DEPDIR)/delaunay.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/delaunay.c' object='delaunay.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o delaunay.lo `test -f './nn/delaunay.c' || echo '$(srcdir)/'`./nn/delaunay.c
-
-hash.lo: ./nn/hash.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT hash.lo -MD -MP -MF $(DEPDIR)/hash.Tpo -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/hash.Tpo $(DEPDIR)/hash.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/hash.c' object='hash.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hash.lo `test -f './nn/hash.c' || echo '$(srcdir)/'`./nn/hash.c
-
-istack.lo: ./nn/istack.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT istack.lo -MD -MP -MF $(DEPDIR)/istack.Tpo -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/istack.Tpo $(DEPDIR)/istack.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/istack.c' object='istack.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o istack.lo `test -f './nn/istack.c' || echo '$(srcdir)/'`./nn/istack.c
-
-lpi.lo: ./nn/lpi.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lpi.lo -MD -MP -MF $(DEPDIR)/lpi.Tpo -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lpi.Tpo $(DEPDIR)/lpi.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/lpi.c' object='lpi.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lpi.lo `test -f './nn/lpi.c' || echo '$(srcdir)/'`./nn/lpi.c
-
-nnai.lo: ./nn/nnai.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnai.lo -MD -MP -MF $(DEPDIR)/nnai.Tpo -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nnai.Tpo $(DEPDIR)/nnai.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nnai.c' object='nnai.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnai.lo `test -f './nn/nnai.c' || echo '$(srcdir)/'`./nn/nnai.c
-
-nncommon.lo: ./nn/nncommon.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nncommon.lo -MD -MP -MF $(DEPDIR)/nncommon.Tpo -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nncommon.Tpo $(DEPDIR)/nncommon.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nncommon.c' object='nncommon.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nncommon.lo `test -f './nn/nncommon.c' || echo '$(srcdir)/'`./nn/nncommon.c
-
-nnpi.lo: ./nn/nnpi.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nnpi.lo -MD -MP -MF $(DEPDIR)/nnpi.Tpo -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/nnpi.Tpo $(DEPDIR)/nnpi.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/nnpi.c' object='nnpi.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o nnpi.lo `test -f './nn/nnpi.c' || echo '$(srcdir)/'`./nn/nnpi.c
-
-triangle.lo: ./nn/triangle.c
- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT triangle.lo -MD -MP -MF $(DEPDIR)/triangle.Tpo -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c
- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/triangle.Tpo $(DEPDIR)/triangle.Plo
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='./nn/triangle.c' object='triangle.lo' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o triangle.lo `test -f './nn/triangle.c' || echo '$(srcdir)/'`./nn/triangle.c
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--
Saga GIS
More information about the Pkg-grass-devel
mailing list