[saga] 02/09: Merge tag 'upstream/2.2.3+dfsg'

Johan Van de Wauw johanvdw-guest at moszumanska.debian.org
Thu Dec 17 22:55:39 UTC 2015


This is an automated email from the git hooks/post-receive script.

johanvdw-guest pushed a commit to branch master
in repository saga.

commit 5b34a54a31840762fe14b18931ac7920865a3864
Merge: 2f2fae7 af272ed
Author: Johan Van de Wauw <johan at vandewauw.be>
Date:   Thu Dec 17 19:19:44 2015 +0100

    Merge tag 'upstream/2.2.3+dfsg'
    
    Upstream version 2.2.3+dfsg

 README                                             |     2 +-
 configure                                          |    23 +-
 configure.ac                                       |     5 +-
 src/modules/db/db_pgsql/db_pgsql.cpp               |    55 +-
 src/modules/db/db_pgsql/pgis_raster.cpp            |    11 +-
 .../garden_3d_viewer/3d_viewer_pointcloud.cpp      |    73 +-
 .../grid/grid_analysis/diversity_analysis.cpp      |    25 +-
 .../grid/grid_analysis/diversity_analysis.h        |     2 +-
 src/modules/grid/grid_gridding/nn/triangle.c       | 16012 -------------------
 src/modules/grid/grid_gridding/nn/triangle.h       |   296 -
 src/modules/grid/grid_tools/Grid_Cut.cpp           |   137 +-
 src/modules/grid/grid_tools/Grid_Cut.h             |     5 +-
 src/modules/grid/grid_tools/Grid_Merge.cpp         |   109 +-
 src/modules/imagery/imagery_opencv/opencv.cpp      |     4 +-
 src/modules/imagery/imagery_svm/svm.cpp            |  3089 ----
 src/modules/imagery/imagery_svm/svm.h              |   101 -
 src/modules/imagery/imagery_tools/landsat_toar.cpp |    76 +-
 src/modules/io/io_gdal/MLB_Interface.cpp           |     6 +-
 src/modules/io/io_gdal/Makefile.am                 |     2 +
 src/modules/io/io_gdal/Makefile.in                 |    11 +-
 src/modules/io/io_gdal/gdal_catalogue.cpp          |   587 +
 .../Grid_Cut.h => io/io_gdal/gdal_catalogue.h}     |    72 +-
 src/modules/io/io_gdal/gdal_driver.cpp             |    34 +
 src/modules/io/io_gdal/gdal_driver.h               |     3 +
 src/modules/io/io_gdal/gdal_export.cpp             |     4 +-
 src/modules/io/io_gdal/gdal_export.h               |     4 +-
 src/modules/io/io_gdal/gdal_export_geotiff.cpp     |     4 +-
 src/modules/io/io_gdal/gdal_export_geotiff.h       |     6 +-
 src/modules/io/io_gdal/gdal_import.cpp             |     2 +-
 src/modules/io/io_gdal/gdal_import.h               |     2 +
 src/modules/io/io_gdal/gdal_import_netcdf.cpp      |     2 +-
 src/modules/io/io_gdal/gdal_import_netcdf.h        |     2 +
 src/modules/io/io_gdal/ogr_export.cpp              |     6 +-
 src/modules/io/io_gdal/ogr_export.h                |     4 +-
 src/modules/io/io_gdal/ogr_export_kml.cpp          |    10 +-
 src/modules/io/io_gdal/ogr_export_kml.h            |     4 +-
 src/modules/io/io_gdal/ogr_import.cpp              |     6 +-
 src/modules/io/io_gdal/ogr_import.h                |     4 +-
 .../io/io_grid_grib2/g2clib-1.0.4/cmplxpack.c      |    78 -
 .../io/io_grid_grib2/g2clib-1.0.4/compack.c        |   419 -
 .../io/io_grid_grib2/g2clib-1.0.4/comunpack.c      |   333 -
 .../io/io_grid_grib2/g2clib-1.0.4/dec_jpeg2000.c   |   147 -
 .../io/io_grid_grib2/g2clib-1.0.4/dec_png.c        |   144 -
 .../io/io_grid_grib2/g2clib-1.0.4/drstemplates.c   |   157 -
 .../io/io_grid_grib2/g2clib-1.0.4/drstemplates.h   |    72 -
 .../io/io_grid_grib2/g2clib-1.0.4/enc_jpeg2000.c   |   190 -
 .../io/io_grid_grib2/g2clib-1.0.4/enc_png.c        |   138 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_addfield.c    |   513 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_addgrid.c     |   246 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_addlocal.c    |   150 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_create.c      |   130 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_free.c        |    47 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_getfld.c      |   553 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_gribend.c     |   125 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_info.c        |   193 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_miss.c        |    72 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack1.c     |   102 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack2.c     |    82 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack3.c     |   216 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack4.c     |   187 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack5.c     |   154 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack6.c     |   100 -
 .../io/io_grid_grib2/g2clib-1.0.4/g2_unpack7.c     |   154 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/gbits.c  |   127 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/getdim.c |   130 -
 .../io/io_grid_grib2/g2clib-1.0.4/getpoly.c        |    83 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/grib2.h  |   254 -
 .../io/io_grid_grib2/g2clib-1.0.4/gridtemplates.c  |   176 -
 .../io/io_grid_grib2/g2clib-1.0.4/gridtemplates.h  |    99 -
 .../io/io_grid_grib2/g2clib-1.0.4/int_power.c      |    33 -
 .../io/io_grid_grib2/g2clib-1.0.4/jpcpack.c        |   178 -
 .../io/io_grid_grib2/g2clib-1.0.4/jpcunpack.c      |    75 -
 .../io/io_grid_grib2/g2clib-1.0.4/misspack.c       |   535 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/mkieee.c |   126 -
 .../io/io_grid_grib2/g2clib-1.0.4/pack_gp.c        |  1450 --
 .../io/io_grid_grib2/g2clib-1.0.4/pdstemplates.c   |   271 -
 .../io/io_grid_grib2/g2clib-1.0.4/pdstemplates.h   |   121 -
 .../io/io_grid_grib2/g2clib-1.0.4/pngpack.c        |   165 -
 .../io/io_grid_grib2/g2clib-1.0.4/pngunpack.c      |    79 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/rdieee.c |    81 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/reduce.c |   413 -
 src/modules/io/io_grid_grib2/g2clib-1.0.4/seekgb.c |    83 -
 .../io/io_grid_grib2/g2clib-1.0.4/simpack.c        |   184 -
 .../io/io_grid_grib2/g2clib-1.0.4/simunpack.c      |    79 -
 .../io/io_grid_grib2/g2clib-1.0.4/specpack.c       |   131 -
 .../io/io_grid_grib2/g2clib-1.0.4/specunpack.c     |   118 -
 src/modules/io/io_table/io_table_txt.cpp           |    42 +-
 src/modules/io/io_table/io_table_txt.h             |    29 +-
 .../Polygon_StatisticsFromPoints.cpp               |    36 +-
 .../shapes/shapes_tools/GraticuleBuilder.cpp       |   217 +-
 src/modules/shapes/shapes_tools/GraticuleBuilder.h |    38 +-
 src/modules/simulation/Makefile.am                 |     2 +-
 src/modules/simulation/Makefile.in                 |     2 +-
 .../simulation/sim_fire_spreading/Forecasting.cpp  |   666 -
 .../simulation/sim_fire_spreading/Forecasting.h    |    84 -
 .../sim_fire_spreading/MLB_Interface.cpp           |   130 -
 .../simulation/sim_fire_spreading/MLB_Interface.h  |    72 -
 .../simulation/sim_fire_spreading/Makefile.am      |    26 -
 .../simulation/sim_fire_spreading/Simulate.cpp     |   363 -
 .../simulation/sim_fire_spreading/Simulate.h       |    81 -
 .../simulation/sim_fire_spreading/fireLib.c        |  1817 ---
 .../simulation/sim_fire_spreading/fireLib.h        |   551 -
 .../sim_qm_of_esp}/MLB_Interface.cpp               |    73 +-
 .../sim_qm_of_esp/MLB_Interface.h}                 |   177 +-
 src/modules/simulation/sim_qm_of_esp/Makefile.am   |    30 +
 .../Makefile.in                                    |   120 +-
 .../simulation/sim_qm_of_esp/fill_sinks.cpp}       |   383 +-
 .../sim_qm_of_esp/fill_sinks.h}                    |    54 +-
 .../simulation/sim_qm_of_esp/flow_routing.cpp}     |   249 +-
 .../sim_qm_of_esp/flow_routing.h}                  |    55 +-
 .../sim_qm_of_esp/hillslope_evolution_adi.cpp      |   541 +
 .../sim_qm_of_esp/hillslope_evolution_adi.h}       |    53 +-
 .../sim_qm_of_esp/hillslope_evolution_ftcs.cpp     |   348 +
 .../sim_qm_of_esp/hillslope_evolution_ftcs.h}      |    52 +-
 .../sim_qm_of_esp/successive_flow_routing.cpp      |   313 +
 .../sim_qm_of_esp/successive_flow_routing.h}       |    55 +-
 .../statistics_grid/GSGrid_Residuals.cpp           |    11 +-
 .../table_calculus/table_field_statistics.cpp      |    24 +-
 src/saga_core/saga_api/api_callback.cpp            |     4 +-
 src/saga_core/saga_api/api_core.h                  |     4 +-
 src/saga_core/saga_api/api_file.cpp                |    58 +-
 src/saga_core/saga_api/data_manager.cpp            |    10 +
 src/saga_core/saga_api/grid_io.cpp                 |     6 +-
 src/saga_core/saga_api/grid_operation.cpp          |    17 +-
 src/saga_core/saga_api/grid_system.cpp             |    24 +-
 src/saga_core/saga_api/module.cpp                  |     4 +-
 src/saga_core/saga_api/module_library.h            |    10 +-
 src/saga_core/saga_api/parameter_data.cpp          |    29 +-
 src/saga_core/saga_api/parameters.cpp              |    19 +-
 src/saga_core/saga_api/parameters.h                |     3 +-
 src/saga_core/saga_api/pointcloud.cpp              |   130 +-
 src/saga_core/saga_api/pointcloud.h                |     8 +-
 src/saga_core/saga_api/projections.cpp             |    51 +-
 src/saga_core/saga_api/saga_api.h                  |     4 +-
 src/saga_core/saga_api/shapes.cpp                  |     6 +-
 src/saga_core/saga_api/shapes_io.cpp               |     6 +-
 src/saga_core/saga_api/table.cpp                   |    34 +-
 src/saga_core/saga_api/table.h                     |    33 +-
 src/saga_core/saga_api/table_io.cpp                |   153 +-
 src/saga_core/saga_api/table_selection.cpp         |   127 +-
 src/saga_core/saga_cmd/module_library.cpp          |    25 +-
 src/saga_core/saga_cmd/module_library.h            |     5 +-
 src/saga_core/saga_cmd/saga_cmd.cpp                |    38 +-
 src/saga_core/saga_gui/Makefile.am                 |     6 +-
 src/saga_core/saga_gui/Makefile.in                 |    79 +-
 src/saga_core/saga_gui/active_attributes.cpp       |    74 +-
 src/saga_core/saga_gui/active_attributes.h         |    36 +-
 .../saga_gui/active_attributes_control.cpp         |   560 +
 ...ve_attributes.h => active_attributes_control.h} |    67 +-
 src/saga_core/saga_gui/data_source.cpp             |    80 +-
 src/saga_core/saga_gui/data_source_pgsql.cpp       |    32 +
 src/saga_core/saga_gui/data_source_pgsql.h         |    10 +-
 src/saga_core/saga_gui/dlg_about.cpp               |    91 +-
 src/saga_core/saga_gui/dlg_about.h                 |     6 +-
 src/saga_core/saga_gui/dlg_table.cpp               |    96 +-
 src/saga_core/saga_gui/dlg_table.h                 |     9 +-
 src/saga_core/saga_gui/dlg_table_control.cpp       |   772 +
 .../{view_table_control.h => dlg_table_control.h}  |    69 +-
 src/saga_core/saga_gui/project.cpp                 |   196 +-
 src/saga_core/saga_gui/project.h                   |     9 +-
 src/saga_core/saga_gui/res/saga.ger.txt            |   594 +-
 src/saga_core/saga_gui/res/saga.lng.txt            |   562 +-
 src/saga_core/saga_gui/res/saga_icon_128.png       |   Bin 0 -> 5557 bytes
 src/saga_core/saga_gui/res/saga_icon_64.png        |   Bin 0 -> 5519 bytes
 src/saga_core/saga_gui/res_commands.cpp            |    61 +-
 src/saga_core/saga_gui/res_commands.h              |    21 +-
 src/saga_core/saga_gui/res_controls.cpp            |    51 +-
 src/saga_core/saga_gui/res_controls.h              |     5 +-
 src/saga_core/saga_gui/saga.cpp                    |    14 +-
 src/saga_core/saga_gui/saga_frame.cpp              |    94 +-
 src/saga_core/saga_gui/view_map.cpp                |    11 +-
 src/saga_core/saga_gui/view_map.h                  |     3 +-
 src/saga_core/saga_gui/view_map_3d.cpp             |    15 +-
 src/saga_core/saga_gui/view_map_3d_panel.cpp       |     7 +-
 src/saga_core/saga_gui/view_map_control.cpp        |   107 +-
 src/saga_core/saga_gui/view_table.cpp              |   149 +-
 src/saga_core/saga_gui/view_table.h                |    27 +-
 src/saga_core/saga_gui/view_table_control.cpp      |  1120 +-
 src/saga_core/saga_gui/view_table_control.h        |   134 +-
 src/saga_core/saga_gui/wksp.cpp                    |    19 +-
 src/saga_core/saga_gui/wksp_base_item.h            |     3 +-
 src/saga_core/saga_gui/wksp_data_item.cpp          |     6 +-
 src/saga_core/saga_gui/wksp_data_item.h            |     2 +
 src/saga_core/saga_gui/wksp_data_manager.cpp       |    24 +-
 src/saga_core/saga_gui/wksp_data_menu_file.cpp     |    12 +-
 src/saga_core/saga_gui/wksp_data_menu_files.cpp    |     6 +-
 src/saga_core/saga_gui/wksp_grid.cpp               |    29 +-
 src/saga_core/saga_gui/wksp_grid.h                 |     5 +-
 src/saga_core/saga_gui/wksp_layer.cpp              |     4 +-
 src/saga_core/saga_gui/wksp_map.cpp                |    77 +-
 src/saga_core/saga_gui/wksp_map.h                  |     3 +-
 src/saga_core/saga_gui/wksp_module.cpp             |     4 +-
 src/saga_core/saga_gui/wksp_module_manager.cpp     |     4 +-
 src/saga_core/saga_gui/wksp_module_menu.cpp        |    24 +-
 src/saga_core/saga_gui/wksp_pointcloud.cpp         |   159 +-
 src/saga_core/saga_gui/wksp_pointcloud.h           |    25 +-
 src/saga_core/saga_gui/wksp_shapes.cpp             |   123 +-
 src/saga_core/saga_gui/wksp_shapes_point.cpp       |    98 +-
 src/saga_core/saga_gui/wksp_shapes_polygon.cpp     |    21 +-
 src/scripting/helper/make_arcsaga_toolboxes.bat    |    43 +
 src/scripting/helper/make_saga_release.bat         |   171 +
 src/scripting/helper/make_saga_snapshot.bat        |    42 +
 src/scripting/helper/make_tools_interface.bat      |    12 +
 src/scripting/helper/make_translation_files.bat    |    29 +
 .../python/examples/02_grid_morphometry.py         |     8 +-
 src/scripting/python/examples/04_grid_contour.py   |     7 +-
 .../helpers/saga_cmd_param_interface/tools.py      |    29 +-
 src/scripting/python/saga_python_api.txt           |     8 +
 208 files changed, 7601 insertions(+), 36558 deletions(-)

-- 
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