[gdal] 03/07: Merge tag 'upstream/2.2.1_rc1+dfsg' into experimental-2.2

Bas Couwenberg sebastic at debian.org
Fri Jun 23 16:12:52 UTC 2017


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

sebastic pushed a commit to branch experimental-2.2
in repository gdal.

commit 356f807aea494f34b5710df224c8539c284884f1
Merge: 655d806 1dd219f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 23 14:48:44 2017 +0200

    Merge tag 'upstream/2.2.1_rc1+dfsg' into experimental-2.2
    
    Upstream version 2.2.1~rc1+dfsg

 GDALmake.opt.in                                    |   4 +-
 NEWS                                               | 177 +++++
 VERSION                                            |   2 +-
 alg/gdal_rpc.cpp                                   |  18 +-
 alg/llrasterize.cpp                                |   8 +-
 apps/gdal_rasterize_lib.cpp                        |  17 +-
 apps/ogr2ogr_lib.cpp                               |  43 +-
 ci/travis/gcc48_stdcpp11/before_install.sh         |   5 +-
 ci/travis/gcc48_stdcpp11/install.sh                |   3 +-
 .../gcc52_stdcpp14_sanitize/before_install.sh      |   5 +-
 ci/travis/gcc52_stdcpp14_sanitize/install.sh       |   3 +-
 ci/travis/precise_clang/before_install.sh          |   5 +-
 ci/travis/precise_clang/install.sh                 |   3 +-
 ci/travis/python3/before_install.sh                |   5 +-
 ci/travis/python3/install.sh                       |   3 +-
 configure                                          |  70 +-
 configure.ac                                       |  18 +-
 frmts/adrg/srpdataset.cpp                          |   8 +-
 frmts/aigrid/gridlib.c                             |  30 +-
 frmts/ceos/ceosopen.c                              |  14 +-
 frmts/cosar/cosar_dataset.cpp                      |  13 +-
 frmts/e00grid/GNUmakefile                          |   2 +
 frmts/e00grid/e00read.c                            |  34 +-
 frmts/envisat/envisatdataset.cpp                   |  11 +-
 frmts/georaster/georaster_dataset.cpp              |  32 +-
 frmts/georaster/georaster_priv.h                   |   4 +-
 frmts/georaster/georaster_wrapper.cpp              |  15 +-
 frmts/gtiff/geotiff.cpp                            |  15 +-
 frmts/gtiff/gt_citation.cpp                        |  40 +-
 frmts/gtiff/libtiff/tif_dirread.c                  |   5 +
 frmts/gtiff/tif_float.c                            |   6 +-
 frmts/gxf/gxfopen.c                                |  28 +-
 frmts/iris/irisdataset.cpp                         |   4 +-
 frmts/iso8211/ddfsubfielddefn.cpp                  |   8 +-
 frmts/netcdf/netcdfdataset.cpp                     |  71 +-
 frmts/northwood/grcdataset.cpp                     |   8 +-
 frmts/northwood/northwood.cpp                      |   7 +-
 frmts/pds/nasakeywordhandler.cpp                   |   4 +-
 frmts/pds/vicarkeywordhandler.cpp                  |  47 +-
 frmts/raw/fastdataset.cpp                          |  67 +-
 frmts/vrt/pixelfunctions.cpp                       |   8 +-
 frmts/vrt/vrtdataset.cpp                           |  19 +-
 frmts/webp/webpdataset.cpp                         |  11 +-
 frmts/xyz/xyzdataset.cpp                           |   3 +-
 gcore/gdal_version.h                               |   8 +-
 gcore/gdaldataset.cpp                              |   4 +-
 gcore/gdaljp2structure.cpp                         |  25 +-
 gcore/gdalrasterband.cpp                           |   4 +-
 m4/acinclude.m4                                    |  26 +-
 man/man1/gdal-config.1                             |   2 +-
 man/man1/gdal2tiles.1                              |   2 +-
 man/man1/gdal_calc.1                               |   2 +-
 man/man1/gdal_contour.1                            |   2 +-
 man/man1/gdal_edit.1                               |   2 +-
 man/man1/gdal_fillnodata.1                         |   2 +-
 man/man1/gdal_grid.1                               |   2 +-
 man/man1/gdal_merge.1                              |   2 +-
 man/man1/gdal_pansharpen.1                         |   2 +-
 man/man1/gdal_polygonize.1                         |   2 +-
 man/man1/gdal_proximity.1                          |   2 +-
 man/man1/gdal_rasterize.1                          |   2 +-
 man/man1/gdal_retile.1                             |   2 +-
 man/man1/gdal_sieve.1                              |   2 +-
 man/man1/gdal_translate.1                          |   2 +-
 man/man1/gdal_utilities.1                          |   2 +-
 man/man1/gdaladdo.1                                |   2 +-
 man/man1/gdalbuildvrt.1                            |   2 +-
 man/man1/gdalcompare.1                             |   2 +-
 man/man1/gdaldem.1                                 |   2 +-
 man/man1/gdalinfo.1                                |   2 +-
 man/man1/gdallocationinfo.1                        |   2 +-
 man/man1/gdalmanage.1                              |   2 +-
 man/man1/gdalmove.1                                |   2 +-
 man/man1/gdalsrsinfo.1                             |   2 +-
 man/man1/gdaltindex.1                              |   2 +-
 man/man1/gdaltransform.1                           |   2 +-
 man/man1/gdalwarp.1                                |   2 +-
 man/man1/gnm_utilities.1                           |   2 +-
 man/man1/gnmanalyse.1                              |   2 +-
 man/man1/gnmmanage.1                               |   2 +-
 man/man1/nearblack.1                               |   2 +-
 man/man1/ogr2ogr.1                                 |   2 +-
 man/man1/ogr_utilities.1                           |   2 +-
 man/man1/ogrinfo.1                                 |   2 +-
 man/man1/ogrlineref.1                              |   2 +-
 man/man1/ogrmerge.1                                |   2 +-
 man/man1/ogrtindex.1                               |   2 +-
 man/man1/pct2rgb.1                                 |   2 +-
 man/man1/rgb2pct.1                                 |   2 +-
 ogr/ogr_srs_esri.cpp                               |  12 +-
 ogr/ogrcurvecollection.cpp                         |  28 +-
 ogr/ogrgeometry.cpp                                |   8 +-
 ogr/ogrgeometryfactory.cpp                         |   3 +-
 ogr/ogrmultisurface.cpp                            |   7 +-
 ogr/ogrpgeogeometry.cpp                            |  13 +-
 ogr/ogrpolygon.cpp                                 |   3 +-
 ogr/ogrsf_frmts/dgn/dgnread.cpp                    |  11 +-
 ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp       |   6 +-
 ogr/ogrsf_frmts/dxf/ogrdxf_blockmap.cpp            |  12 +-
 ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp                |  23 +-
 ogr/ogrsf_frmts/geojson/libjson/json_object.c      |   4 +-
 ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp      |  10 +-
 ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp       |  24 +-
 ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp        |  19 +-
 ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp       |  34 +-
 ogr/ogrsf_frmts/georss/ogrgeorsslayer.cpp          |   6 +-
 ogr/ogrsf_frmts/gml/gmlreader.cpp                  |   7 +-
 ogr/ogrsf_frmts/gml/gmlreader.h                    |   4 +-
 ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp   |  69 +-
 ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp   |  84 +--
 ogr/ogrsf_frmts/gpkg/ogrgeopackageutility.cpp      |   6 +-
 ogr/ogrsf_frmts/gtm/gtm.cpp                        |   8 +-
 ogr/ogrsf_frmts/ili/ili1reader.cpp                 |  63 +-
 ogr/ogrsf_frmts/ili/ili2reader.cpp                 |  92 ++-
 ogr/ogrsf_frmts/ili/ogrili1datasource.cpp          |  11 +-
 ogr/ogrsf_frmts/ili/ogrili2datasource.cpp          |  11 +-
 ogr/ogrsf_frmts/jml/ogrjmllayer.cpp                |   6 +-
 ogr/ogrsf_frmts/kml/kml.cpp                        |  11 +-
 ogr/ogrsf_frmts/kml/kmlnode.cpp                    |  14 +-
 ogr/ogrsf_frmts/kml/kmlnode.h                      |   4 +-
 ogr/ogrsf_frmts/mitab/mitab_coordsys.cpp           |   4 +-
 ogr/ogrsf_frmts/mitab/mitab_feature.cpp            |  10 +-
 ogr/ogrsf_frmts/mitab/mitab_feature_mif.cpp        |  10 +-
 ogr/ogrsf_frmts/mitab/mitab_mapcoordblock.cpp      |   2 +-
 ogr/ogrsf_frmts/mitab/mitab_miffile.cpp            |  15 +-
 ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp         |   4 +-
 ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp            |   4 +-
 ogr/ogrsf_frmts/mongodb/mongocxx_headers.h         |   2 +-
 ogr/ogrsf_frmts/mysql/ogr_mysql.h                  |   6 +-
 ogr/ogrsf_frmts/nas/nasreader.cpp                  |   7 +-
 ogr/ogrsf_frmts/ntf/ntf.h                          |  14 +-
 ogr/ogrsf_frmts/ntf/ntf_codelist.cpp               |  15 +-
 ogr/ogrsf_frmts/ntf/ntf_estlayers.cpp              |  11 +-
 ogr/ogrsf_frmts/ntf/ntf_generic.cpp                |  52 +-
 ogr/ogrsf_frmts/ntf/ntf_raster.cpp                 |  60 +-
 ogr/ogrsf_frmts/ntf/ntffilereader.cpp              | 210 ++++--
 ogr/ogrsf_frmts/ntf/ogrntfdatasource.cpp           |  11 +-
 ogr/ogrsf_frmts/openair/ogropenairdriver.cpp       |   3 +-
 ogr/ogrsf_frmts/pds/ogrpdsdatasource.cpp           |  16 +-
 ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp             |   4 +-
 ogr/ogrsf_frmts/plscenes/GNUmakefile               |   2 +-
 ogr/ogrsf_frmts/plscenes/drv_plscenes.html         |   8 +-
 ogr/ogrsf_frmts/plscenes/drv_plscenes_v0.html      | 202 ------
 ogr/ogrsf_frmts/plscenes/makefile.vc               |   2 +-
 ogr/ogrsf_frmts/plscenes/ogr_plscenes.h            |  98 +--
 ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp    | 578 ----------------
 ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp     |  12 +-
 ogr/ogrsf_frmts/plscenes/ogrplsceneslayer.cpp      | 766 ---------------------
 ogr/ogrsf_frmts/rec/ll_recio.cpp                   |   4 +-
 ogr/ogrsf_frmts/rec/ogrrecdatasource.cpp           |   7 +-
 ogr/ogrsf_frmts/segukooa/ogrsegukooalayer.cpp      |   6 +-
 ogr/ogrsf_frmts/selafin/io_selafin.cpp             |   5 +-
 ogr/ogrsf_frmts/selafin/ogrselafindatasource.cpp   |   5 +-
 ogr/ogrsf_frmts/shape/shape2ogr.cpp                |   5 +-
 ogr/ogrsf_frmts/tiger/ogr_tiger.h                  |   4 +-
 ogr/ogrsf_frmts/tiger/ogrtigerdatasource.cpp       |  11 +-
 ogr/ogrsf_frmts/tiger/tigeraltname.cpp             |   4 +-
 ogr/ogrsf_frmts/tiger/tigercompletechain.cpp       |  11 +-
 ogr/ogrsf_frmts/tiger/tigerfilebase.cpp            |   4 +-
 ogr/ogrsf_frmts/tiger/tigerpoint.cpp               |   4 +-
 ogr/ogrsf_frmts/tiger/tigerpolygon.cpp             |  15 +-
 ogr/ogrsf_frmts/vfk/vfkdatablock.cpp               |   4 +-
 ogr/ogrsf_frmts/vfk/vfkreader.cpp                  |   3 +-
 port/cpl_config.h.in                               |   5 +-
 port/cpl_error.cpp                                 |  10 +-
 port/cpl_minixml.cpp                               | 115 ++--
 port/cpl_port.h                                    |   7 +-
 port/cpl_string.cpp                                |   7 +-
 port/cpl_time.cpp                                  |  17 +-
 port/cpl_vsi.h                                     |   3 +-
 port/cpl_vsil.cpp                                  |   5 +-
 port/cpl_vsil_abstract_archive.cpp                 |   4 +-
 port/cpl_vsil_curl.cpp                             | 141 +++-
 port/cpl_vsil_curl_streaming.cpp                   |   8 +-
 port/cpl_vsil_gzip.cpp                             |   8 +-
 port/cpl_vsil_sparsefile.cpp                       |   5 +-
 port/cpl_vsil_subfile.cpp                          |  13 +-
 port/cpl_vsil_unix_stdio_64.cpp                    |   3 +-
 swig/csharp/gdal/Gdal.cs                           |   5 +
 swig/csharp/gdal/GdalPINVOKE.cs                    |   3 +
 swig/csharp/gdal/gdal_wrap.cpp                     |  26 +
 swig/include/cpl.i                                 |   4 +-
 swig/include/perl/band.i                           |  31 +-
 swig/include/perl/gdal_perl.i                      |   4 +-
 swig/include/perl/ogr_perl.i                       |   2 +-
 swig/include/python/gdal_python.i                  |  10 +-
 swig/include/python/typemaps_python.i              |  13 +-
 swig/perl/Makefile.PL                              |  25 +
 swig/perl/gdal_wrap.cpp                            |  74 +-
 swig/perl/lib/Geo/GDAL.pm                          |   5 +-
 swig/perl/lib/Geo/OGR.pm                           |   2 +-
 swig/python/extensions/gdal_array_wrap.cpp         |  22 +
 swig/python/extensions/gdal_wrap.cpp               | 405 +++++++++++
 swig/python/extensions/ogr_wrap.cpp                |  77 +++
 swig/python/osgeo/gdal.py                          |  12 +-
 swig/python/samples/validate_gpkg.py               |   8 +-
 swig/python/scripts/ogrmerge.py                    |  18 +-
 swig/python/setup.py                               |   2 +-
 198 files changed, 2499 insertions(+), 2483 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git



More information about the Pkg-grass-devel mailing list