[saga] 01/05: Refresh patches
Johan Van de Wauw
johanvdw-guest at moszumanska.debian.org
Fri Apr 1 18:30:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository saga.
commit 62fe3a63933b8328a4fbc65d273ecadf4068241c
Author: Johan Van de Wauw <johan at vandewauw.be>
Date: Thu Mar 31 17:09:40 2016 +0200
Refresh patches
Most patches applied upstream
---
debian/patches/0001-vigra-hdf5-include.patch | 19 +-
debian/patches/Use-debian-version-of-libsvm.patch | 7 +-
debian/patches/disable-grid-gridding.patch | 9 -
debian/patches/disable-jasper.patch | 51 ----
debian/patches/series | 5 -
debian/patches/spelling-errors.patch | 347 ----------------------
6 files changed, 9 insertions(+), 429 deletions(-)
diff --git a/debian/patches/0001-vigra-hdf5-include.patch b/debian/patches/0001-vigra-hdf5-include.patch
index 4c65787..7ab954d 100644
--- a/debian/patches/0001-vigra-hdf5-include.patch
+++ b/debian/patches/0001-vigra-hdf5-include.patch
@@ -3,23 +3,12 @@ Author: Johan Van de Wauw <johan at vandewauw.be>
--- a/src/modules/imagery/imagery_vigra/Makefile.am
+++ b/src/modules/imagery/imagery_vigra/Makefile.am
-@@ -9,7 +9,7 @@ UC_DEFS = -D_SAGA_UNICODE
- endif
+@@ -7,7 +7,7 @@
+
if HAVE_VIGRA
- DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
+ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
-CXX_INCS = -I$(top_srcdir)/src/saga_core
+CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/hdf5/serial
- AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
+ AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
AM_LDFLAGS = -fPIC -shared -avoid-version -lvigraimpex -lfftw3
pkglib_LTLIBRARIES = libimagery_vigra.la
---- a/src/modules/io/io_grid_grib2/grib2_import.h
-+++ b/src/modules/io/io_grid_grib2/grib2_import.h
-@@ -11,7 +11,7 @@
-
- #include "MLB_Interface.h"
- extern "C" {
--#include "g2clib-1.0.4/grib2.h"
-+#include "grib2.h"
- }
-
-
diff --git a/debian/patches/Use-debian-version-of-libsvm.patch b/debian/patches/Use-debian-version-of-libsvm.patch
index 8140814..156140c 100644
--- a/debian/patches/Use-debian-version-of-libsvm.patch
+++ b/debian/patches/Use-debian-version-of-libsvm.patch
@@ -1,8 +1,11 @@
--- a/src/modules/imagery/imagery_svm/Makefile.am
+++ b/src/modules/imagery/imagery_svm/Makefile.am
-@@ -5,14 +5,12 @@
+@@ -3,16 +3,14 @@
+ endif
+
DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
- CXX_INCS = -I$(top_srcdir)/src/saga_core
+-CXX_INCS = -I$(top_srcdir)/src/saga_core
++CXX_INCS = -I$(top_srcdir)/src/saga_core -I/usr/include/libsvm
AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
-AM_LDFLAGS = -fPIC -shared -avoid-version
+AM_LDFLAGS = -fPIC -shared -avoid-version -lsvm
diff --git a/debian/patches/disable-grid-gridding.patch b/debian/patches/disable-grid-gridding.patch
deleted file mode 100644
index abef9a3..0000000
--- a/debian/patches/disable-grid-gridding.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Description: Disable grid_gridding module, fails to build with --disabled-triangle.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://sourceforge.net/p/saga-gis/bugs/216/
-
---- a/src/modules/grid/Makefile.am
-+++ b/src/modules/grid/Makefile.am
-@@ -1 +1 @@
--SUBDIRS = grid_visualisation grid_tools grid_spline grid_gridding grid_filter grid_calculus grid_calculus_bsl grid_analysis
-+SUBDIRS = grid_visualisation grid_tools grid_spline grid_filter grid_calculus grid_calculus_bsl grid_analysis
diff --git a/debian/patches/disable-jasper.patch b/debian/patches/disable-jasper.patch
deleted file mode 100644
index 5d55eeb..0000000
--- a/debian/patches/disable-jasper.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Add --disable-jasper option to configure.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/818218
-Forwarded: https://sourceforge.net/p/saga-gis/bugs/224/
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,6 @@ AC_PROG_LIBTOOL
- AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
- AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
- AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
--AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
- AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
- AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
- AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found])
-@@ -192,6 +191,19 @@ if test "x$use_libfire" != xyes; then
- AC_MSG_RESULT([ Libfire disabled])
- fi
-
-+AC_ARG_ENABLE(jasper,
-+ AS_HELP_STRING([--disable-jasper],[ Compile without jasper ]),
-+ ,
-+ [use_jasper=yes])
-+
-+AM_CONDITIONAL(JASPER, [test x$use_jasper = xyes])
-+
-+if test "x$use_jasper" != xyes; then
-+ AC_MSG_RESULT([ Jasper disabled])
-+else
-+ AC_CHECK_LIB([jasper], [jas_calloc],JASPERFOUND=1,,)
-+fi
-+
- #AM_CONDITIONAL(X86_64, test "`uname -m`" = "x86_64")
- AM_CONDITIONAL(HAVE_CV, test -n "$CVFOUND")
- AM_CONDITIONAL(HAVE_LLAS, test -n "$LASFOUND")
---- a/src/modules/io/io_grid_grib2/Makefile.am
-+++ b/src/modules/io/io_grid_grib2/Makefile.am
-@@ -10,8 +10,11 @@ endif
- DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -DUSE_JPEG2000 -DUSE_PNG
- CXX_INCS = -I$(top_srcdir)/src/saga_core $(LOCAL_INCS)
- AM_CXXFLAGS = -fPIC $(CXX_INCS) $(DEF_SAGA) $(UC_DEFS) $(DBGFLAGS) $(GOMPFLAGS)
--#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq -ljasper
--AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS) -ljasper
-+#AM_LDFLAGS = -fPIC -shared -avoid-version -lpq
-+AM_LDFLAGS = -fPIC -shared -avoid-version $(LOCAL_LIBS)
-+if JASPER
-+AM_LDFLAGS +=-ljasper
-+endif
- pkglib_LTLIBRARIES = libio_grid_grib2.la
- libio_grid_grib2_la_SOURCES =\
- grib2_import.cpp\
diff --git a/debian/patches/series b/debian/patches/series
index cf9631d..6eeda72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
Use-debian-version-of-libsvm.patch
0001-vigra-hdf5-include.patch
-disable-grid-gridding.patch
-desktop-keywords.patch
-spelling-errors.patch
-install-icons.patch
-disable-jasper.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 74bb551..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-Description: Fix various spelling errors.
- decribes -> describes
- splitted -> split
- allows to <verb> -> allows <verb>ing
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://sourceforge.net/p/saga-gis/bugs/220/
-Applied-Upstream: https://sourceforge.net/p/saga-gis/code-0/2841/
-
---- a/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp
-+++ b/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp
-@@ -79,11 +79,11 @@ CPointCloud_Remove_Overlap_From_SPCVF::C
- Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
-
- Set_Description (_TW(
-- "The module allows to remove the overlap from point cloud "
-+ "The module allows removing the overlap from point cloud "
- "tiles created from a virtual point cloud dataset. The "
- "tiles must have been created with an overlap and a spcvf "
- "tile info file must have been outputted too. The latter "
-- "decribes the original bounding boxes of the tiles (i.e. "
-+ "describes the original bounding boxes of the tiles (i.e. "
- "without overlap) and is used by this module to remove "
- "the overlap.\n"
- "A virtual point cloud dataset is a simple XML format "
---- a/src/modules/io/io_gdal/gdal_catalogue.cpp
-+++ b/src/modules/io/io_gdal/gdal_catalogue.cpp
-@@ -226,7 +226,7 @@ CGDAL_Catalogues::CGDAL_Catalogues(void)
-
- Description = _TW(
- "Creates raster catalogues from all raster files found in the selected directory. "
-- "Catalogues are splitted according to the coordinate reference system used by the "
-+ "Catalogues are split according to the coordinate reference system used by the "
- "different raster files. Output are polygon layers that show the extent for each "
- "raster file in it. Each extent is attributed with the original file path and "
- "raster system properties.\n"
---- a/src/modules/shapes/shapes_lines/line_split_with_lines.cpp
-+++ b/src/modules/shapes/shapes_lines/line_split_with_lines.cpp
-@@ -134,7 +134,7 @@ bool CLine_Split_with_Lines::On_Execute(
-
- //--------------------------------------------------------
- pIntersect->Create(SHAPE_TYPE_Line,
-- CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Splitted"), pSplit->Get_Name()),
-+ CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Split"), pSplit->Get_Name()),
- pLines
- );
-
-@@ -304,7 +304,7 @@ bool CLine_Split_at_Points::On_Execute(v
-
- //--------------------------------------------------------
- pIntersect->Create(SHAPE_TYPE_Line,
-- CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Splitted"), pSplit->Get_Name()),
-+ CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Split"), pSplit->Get_Name()),
- pLines
- );
-
---- a/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp
-+++ b/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp
-@@ -103,7 +103,7 @@ CGrid_Profile_From_Lines::CGrid_Profile_
-
- Parameters.Add_Table_Field(
- pNode , "NAME" , _TL("Name"),
-- _TL("naming for splitted lines"),
-+ _TL("naming for split lines"),
- true
- );
-
---- a/src/saga_core/saga_gui/res/saga.bra.txt
-+++ b/src/saga_core/saga_gui/res/saga.bra.txt
-@@ -406,8 +406,8 @@ TEXT TRANSLATION
- "Allow longitudes outside -180 to 180 Range" "Permitir longitudes fora do alcance 180 a 180"
- "Allow multiple observer positions." "Permitir v�rias posi��es de observa��o."
- "Allows one to scale shade brightness [%]" "Permite escala de brilho de sombra [%]"
--"Allows to scale shade brightness, [percent]" "Permite escala de brilho de sombra, [porcento]"
--"Allows to write cell values from additional grids to the output" "Permite escrever valores de c�lulas de grades adicionais para a sa�da"
-+"Allows scaling shade brightness, [percent]" "Permite escala de brilho de sombra, [porcento]"
-+"Allows writing cell values from additional grids to the output" "Permite escrever valores de c�lulas de grades adicionais para a sa�da"
- "Alpha" "Alfa"
- "Alpha Max (Degree)" "Alfa m�ximo (Graus)"
- "Altura de llama" "Altura de lhama"
-@@ -4679,7 +4679,7 @@ TEXT TRANSLATION
- "Split Shapes Layer Randomly" "Dividir camada Shapes aleatoriamente"
- "Split Table/Shapes by Attribute" "Dividir tabela/shapes por atributo"
- "Split with Line" "Dividir com a linha"
--"Splitted" "Dividido"
-+"Split" "Dividido"
- "Spring" "Primavera"
- "Spur" "Espor�o"
- "Square" "Quadrado"
-@@ -5038,7 +5038,7 @@ TEXT TRANSLATION
- "The smoothing preservation factor [-]." "Factor de preserva��o de alisamento [-]."
- "The start value to use for the identifier." "Valor inicial a ser usado para o identificador."
- "The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." "Tabela com os valores (num�ricos) de dados para cada classe. O m�dulo cria uma grade para cada coluna da tabela (al�m da ID)."
--"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "O fator exagero de terreno permite aumentar os contrastes de sombra em �reas planas."
-+"The terrain exaggeration factor allows increasing the shading contrasts in flat areas." "O fator exagero de terreno permite aumentar os contrastes de sombra em �reas planas."
- "The transmittance of the atmosphere, usually between 60 and 80 percent." "Transmit�ncia da atmosfera, geralmente entre 60 e 80 por cento."
- "The transparency of the shade [%]" "Transpar�ncia da sombra[%]"
- "The unobstructed hemisphere given as percentage." "Hemisf�rio desobstru�do dado em percentagem."
-@@ -6483,7 +6483,7 @@ TEXT TRANSLATION
- "n" "n"
- "n-fold cross validation: n must > 1" "valida��o cruzada n-fold: n preciso > 1"
- "name" "nome"
--"naming for splitted lines" "nomea��o para linhas parceladas"
-+"naming for split lines" "nomea��o para linhas parceladas"
- "nearest neighbour" "vizinho mais pr�ximo"
- "needs at least two attributes in selection" "precisa de pelo menos dois atributos na sele��o"
- "nein" "nein"
---- a/src/saga_core/saga_gui/res/saga.ger.txt
-+++ b/src/saga_core/saga_gui/res/saga.ger.txt
-@@ -406,8 +406,8 @@ TEXT TRANSLATION
- "Allow longitudes outside -180 to 180 Range" "Ber�cksichtige L�ngen au�erhalb -180 bis 180 Bereich"
- "Allow multiple observer positions." ""
- "Allows one to scale shade brightness [%]" ""
--"Allows to scale shade brightness, [percent]" ""
--"Allows to write cell values from additional grids to the output" "Ber�cksichtige Zellwerte zus�tzlicher Rasterdateien bei der Ausgabe"
-+"Allows scaling shade brightness, [percent]" ""
-+"Allows writing cell values from additional grids to the output" "Ber�cksichtige Zellwerte zus�tzlicher Rasterdateien bei der Ausgabe"
- "Alpha" ""
- "Alpha Max (Degree)" "Alpha Max (Grad)"
- "Altura de llama" ""
-@@ -4679,7 +4679,7 @@ TEXT TRANSLATION
- "Split Shapes Layer Randomly" "Vektorebene zuf�llig aufteilen"
- "Split Table/Shapes by Attribute" "Teile Tabelle/Vektoren durch Attribut"
- "Split with Line" ""
--"Splitted" ""
-+"Split" ""
- "Spring" ""
- "Spur" ""
- "Square" "Rechteck"
-@@ -5038,7 +5038,7 @@ TEXT TRANSLATION
- "The smoothing preservation factor [-]." ""
- "The start value to use for the identifier." ""
- "The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." ""
--"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "Der Relief�berh�hungsfaktor erlaubt das Anheben der Schattenkontraste in flachen Fl�chen."
-+"The terrain exaggeration factor allows increasing the shading contrasts in flat areas." "Der Relief�berh�hungsfaktor erlaubt das Anheben der Schattenkontraste in flachen Fl�chen."
- "The transmittance of the atmosphere, usually between 60 and 80 percent." "Der Durchl�ssigkeitswert der Atmosph�re, gew�hnlich zwischen 60 und 80 Prozent."
- "The transparency of the shade [%]" ""
- "The unobstructed hemisphere given as percentage." "Die unversperrte Hemisph�re beschrieben in Prozent."
-@@ -6483,7 +6483,7 @@ TEXT TRANSLATION
- "n" ""
- "n-fold cross validation: n must > 1" ""
- "name" "Name"
--"naming for splitted lines" "Namensgebung f�r getrennte Linien"
-+"naming for split lines" "Namensgebung f�r getrennte Linien"
- "nearest neighbour" ""
- "needs at least two attributes in selection" ""
- "nein" ""
---- a/src/saga_core/saga_gui/res/saga.lng.txt
-+++ b/src/saga_core/saga_gui/res/saga.lng.txt
-@@ -406,8 +406,8 @@ TEXT TRANSLATION
- "Allow longitudes outside -180 to 180 Range" ""
- "Allow multiple observer positions." ""
- "Allows one to scale shade brightness [%]" ""
--"Allows to scale shade brightness, [percent]" ""
--"Allows to write cell values from additional grids to the output" ""
-+"Allows scaling shade brightness, [percent]" ""
-+"Allows writing cell values from additional grids to the output" ""
- "Alpha" ""
- "Alpha Max (Degree)" ""
- "Altura de llama" ""
-@@ -4679,7 +4679,7 @@ TEXT TRANSLATION
- "Split Shapes Layer Randomly" ""
- "Split Table/Shapes by Attribute" ""
- "Split with Line" ""
--"Splitted" ""
-+"Split" ""
- "Spring" ""
- "Spur" ""
- "Square" ""
-@@ -5038,7 +5038,7 @@ TEXT TRANSLATION
- "The smoothing preservation factor [-]." ""
- "The start value to use for the identifier." ""
- "The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." ""
--"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." ""
-+"The terrain exaggeration factor allows increasing the shading contrasts in flat areas." ""
- "The transmittance of the atmosphere, usually between 60 and 80 percent." ""
- "The transparency of the shade [%]" ""
- "The unobstructed hemisphere given as percentage." ""
-@@ -6483,7 +6483,7 @@ TEXT TRANSLATION
- "n" ""
- "n-fold cross validation: n must > 1" ""
- "name" ""
--"naming for splitted lines" ""
-+"naming for split lines" ""
- "nearest neighbour" ""
- "needs at least two attributes in selection" ""
- "nein" ""
---- a/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp
-+++ b/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp
-@@ -109,7 +109,7 @@ CLeastCostPathProfile_Points::CLeastCost
-
- Parameters.Add_Grid_List(
- NULL , "VALUES" , _TL("Values"),
-- _TL("Allows to write cell values from additional grids to the output"),
-+ _TL("Allows writing cell values from additional grids to the output"),
- PARAMETER_INPUT_OPTIONAL
- );
-
---- a/src/modules/grid/grid_gridding/nn/nn.h
-+++ b/src/modules/grid/grid_gridding/nn/nn.h
-@@ -232,7 +232,7 @@ void nnpi_setwmin(nnpi* nn, double wmin)
- /** `nnhpi' -- "Natural Neighbours Hashing Point Interpolator" -- is a
- ** structure for conducting consequitive Natural Neighbours interpolations
- ** from the same set of observation points, designed to take advantage of
-- ** repeated interpolations in the same point. It allows to modify Z
-+ ** repeated interpolations in the same point. It allows modifying Z
- ** coordinate of observed data between interpolations (because this does not
- ** affect the interpolant weights).
- */
-@@ -283,7 +283,7 @@ void nnhpi_setwmin(nnhpi* nn, double wmi
-
- /** `nnai' -- "Natural Neighbours Array Interpolator" is a structure for
- ** conducting consequitive Natural Neighbours interpolations from the same
-- ** set of observation points in the same set of points. It allows to modify Z
-+ ** set of observation points in the same set of points. It allows modifying Z
- ** coordinate of data between interpolations (because this does not
- ** affect the interpolant weights).
- *
---- a/src/modules/grid/grid_gridding/nn/nncommon.c
-+++ b/src/modules/grid/grid_gridding/nn/nncommon.c
-@@ -13,7 +13,7 @@
- *
- * Revisions: 15/11/2002 PS: Changed name from "utils.c"
- * 28/02/2003 PS: Modified points_read() to do the job without
-- * rewinding the file. This allows to read from stdin when
-+ * rewinding the file. This allows reading from stdin when
- * necessary.
- * 09/04/2003 PS: Modified points_read() to read from a
- * file specified by name, not by handle.
---- a/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp
-+++ b/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp
-@@ -45,7 +45,7 @@ CGrid_Value_Replace_Interactive::CGrid_V
- Set_Author ("Victor Olaya (c) 2004");
-
- Set_Description (_TW(
-- "The module allows to interactively change cell values of the input grid. "
-+ "The module allows interactively changing cell values of the input grid. "
- "Once the module is executed and running, you can use the Action tool to select "
- "grid cells. While working on a grid, you can change (and apply) the 'New Value' "
- "and the 'Method' parameters without stopping and re-starting the module.\n"
---- a/src/modules/io/io_esri_e00/e00compr/e00read.c
-+++ b/src/modules/io/io_esri_e00/e00compr/e00read.c
-@@ -247,7 +247,7 @@ void E00ReadClose(E00ReadPtr psInfo)
- /**********************************************************************
- * E00ReadRewind()
- *
-- * Rewind the E00ReadPtr. Allows to start another read pass on the
-+ * Rewind the E00ReadPtr. Allows starting another read pass on the
- * input file.
- **********************************************************************/
- void E00ReadRewind(E00ReadPtr psInfo)
---- a/src/modules/io/io_grid_image/grid_to_kml.cpp
-+++ b/src/modules/io/io_grid_image/grid_to_kml.cpp
-@@ -208,7 +208,7 @@ CGrid_to_KML::CGrid_to_KML(void)
- {
- Parameters.Add_Range(
- NULL , "SHADE_BRIGHT", _TL("Shade Brightness"),
-- _TL("Allows to scale shade brightness, [percent]"),
-+ _TL("Allows scaling shade brightness, [percent]"),
- 0.0, 100.0, 0.0, true, 100.0, true
- );
- }
---- a/src/modules/io/io_shapes/pointcloud_to_text_file.cpp
-+++ b/src/modules/io/io_shapes/pointcloud_to_text_file.cpp
-@@ -83,7 +83,7 @@ CPointcloud_To_Text_File::CPointcloud_To
-
- Set_Description (_TW(
- "Exports a point cloud to a text file. Once the module is executed, "
-- "a pop-up dialog allows to specify the fields to be exported and their "
-+ "a pop-up dialog allows specifying the fields to be exported and their "
- "decimal precision.\n\n"
- "Module usage is different between SAGA GUI and SAGA CMD: With "
- "SAGA GUI you will get prompted to choose the fields to export "
---- a/src/modules/io/io_shapes_las/las_export.cpp
-+++ b/src/modules/io/io_shapes_las/las_export.cpp
-@@ -95,7 +95,7 @@ CLAS_Export::CLAS_Export(void)
-
- CSG_String Description(_TW(
- "This module exports a SAGA Point Cloud as ASPRS LAS file (version 1.2) "
-- "using the \"libLAS\" library. It allows to write Point Data Record Formats 1 to 4. "
-+ "using the \"libLAS\" library. It allows writing Point Data Record Formats 1 to 4. "
- "Please have a look at the <a href=\"http://www.asprs.org/society/committees/standards/lidar_exchange_format.html\""
- ">ASPRS LAS 1.2 Format Specification</a> for "
- "more information on the attributes supported with each format.\n"
---- a/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp
-+++ b/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp
-@@ -584,7 +584,7 @@ CPointCloud_Get_Subset_SPCVF::CPointClou
- Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
-
- Set_Description (_TW(
-- "The module allows to retrieve a point cloud from a virtual "
-+ "The module allows retrieving a point cloud from a virtual "
- "point cloud dataset by applying the provided area-of-interest "
- "(AOI). The extent of the AOI can be provided either as polygon "
- "shapefile, grid or by coordinates. Optionally, an overlap can "
-@@ -892,7 +892,7 @@ CPointCloud_Get_Subset_SPCVF_Interactive
- Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
-
- Set_Description (_TW(
-- "The module allows to retrieve a point cloud from a virtual "
-+ "The module allows retrieving a point cloud from a virtual "
- "point cloud dataset by dragging a box (AOI) in a Map View.\n"
- "Optionally, the query can be constrained by providing an "
- "attribute field and a value range that must be met.\n"
---- a/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp
-+++ b/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp
-@@ -79,7 +79,7 @@ CPointCloud_Create_Tileshape_From_SPCVF:
- Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014"));
-
- Set_Description (_TW(
-- "The module allows to create a polygon shapefile with the "
-+ "The module allows creating a polygon shapefile with the "
- "bounding boxes of a virtual point cloud dataset. Additionally, "
- "the header information of the chosen virtual point cloud "
- "dataset is reported (since SPCVFDataset version 1.1).\n"
---- a/src/modules/terrain_analysis/ta_lighting/HillShade.cpp
-+++ b/src/modules/terrain_analysis/ta_lighting/HillShade.cpp
-@@ -129,7 +129,7 @@ CHillShade::CHillShade(void)
-
- Parameters.Add_Value(
- NULL , "EXAGGERATION" , _TL("Exaggeration"),
-- _TL("The terrain exaggeration factor allows to increase the shading contrasts in flat areas."),
-+ _TL("The terrain exaggeration factor allows increasing the shading contrasts in flat areas."),
- PARAMETER_TYPE_Double , 4
- );
-
---- a/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp
-+++ b/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp
-@@ -118,7 +118,7 @@ CPit_Eliminator::CPit_Eliminator(void)
- Parameters.Add_Value(
- NULL , "THRSHEIGHT" , _TL("Threshold Height"),
- _TW("The parameter describes the maximum depth of a sink to be considered for removal [map units]. "
-- "This allows to exclude deeper sinks from filling."),
-+ "This allows excluding deeper sinks from filling."),
- PARAMETER_TYPE_Double , 100
- );
- }
---- a/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
-+++ b/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
-@@ -10,7 +10,7 @@
- # purpose:
- # generate a simple text-based description of the saga_cmd parameter
- # interface of a SAGA binary installation.
--# this allows to detect changes in the parameter interface of different
-+# this allows detecting changes in the parameter interface of different
- # SAGA versions.
- #
- # usage:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git
More information about the Pkg-grass-devel
mailing list