[gdal] 05/12: Merge tag 'upstream/2.1.0_rc1+dfsg' into experimental-2.1

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Apr 18 19:54:00 UTC 2016


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

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

commit 5e5055768b87f7eb11c445a196b753d9e49849fd
Merge: fa75401 f8369c6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 18 19:32:47 2016 +0200

    Merge tag 'upstream/2.1.0_rc1+dfsg' into experimental-2.1
    
    Upstream version 2.1.0~rc1+dfsg

 NEWS                                               |    53 +-
 VERSION                                            |     2 +-
 alg/gdalwarpoperation.cpp                          |    24 +-
 apps/commonutils.cpp                               |    70 +-
 apps/gdal_translate_lib.cpp                        |    53 +-
 configure                                          |     6 -
 configure.in                                       |     4 +-
 doxygen_sqlite3.db                                 |   Bin 289792 -> 0 bytes
 frmts/adrg/adrgdataset.cpp                         |     8 +-
 frmts/adrg/srpdataset.cpp                          |     8 +-
 frmts/aigrid/aigdataset.cpp                        |    39 +-
 frmts/aigrid/aigrid.h                              |    60 +-
 frmts/airsar/airsardataset.cpp                     |    14 +-
 frmts/blx/blx.h                                    |     2 +-
 frmts/blx/blxdataset.cpp                           |    85 +-
 frmts/bsb/bsbdataset.cpp                           |    12 +-
 frmts/grass/grass57dataset.cpp                     |    14 +-
 frmts/mbtiles/mbtilesdataset.cpp                   |   186 +-
 frmts/mrf/GNUmakefile                              |     4 +-
 frmts/mrf/JPEG_band.cpp                            |   178 +-
 frmts/mrf/JPNG_band.cpp                            |   219 +
 frmts/mrf/PNG_band.cpp                             |   207 +-
 frmts/mrf/libLERC/GNUmakefile                      |     2 +-
 frmts/mrf/makefile.vc                              |     2 +-
 frmts/mrf/marfa.h                                  |   183 +-
 frmts/mrf/marfa_dataset.cpp                        |    68 +-
 frmts/mrf/mrf_band.cpp                             |   107 +-
 frmts/mrf/mrf_util.cpp                             |   276 +-
 frmts/mrsid/nmake.opt                              |     2 +
 frmts/msg/msgdataset.cpp                           |     6 +-
 frmts/rasterlite/rasterlitedataset.cpp             |     8 +-
 frmts/raw/GNUmakefile                              |     4 -
 frmts/raw/ace2dataset.cpp                          |    19 +-
 frmts/raw/btdataset.cpp                            |    62 +-
 frmts/raw/cpgdataset.cpp                           |    21 +-
 frmts/raw/ctable2dataset.cpp                       |    30 +-
 frmts/raw/dipxdataset.cpp                          |    57 +-
 frmts/raw/doq1dataset.cpp                          |   177 +-
 frmts/raw/doq2dataset.cpp                          |   196 +-
 frmts/raw/ehdrdataset.cpp                          |     6 +-
 frmts/raw/eirdataset.cpp                           |   100 +-
 frmts/raw/envidataset.cpp                          |   114 +-
 frmts/raw/fastdataset.cpp                          |   370 +-
 frmts/raw/frmt_fast.html                           |    12 +-
 frmts/raw/fujibasdataset.cpp                       |    44 +-
 frmts/raw/genbindataset.cpp                        |   106 +-
 frmts/raw/gscdataset.cpp                           |    43 +-
 frmts/raw/gtxdataset.cpp                           |    86 +-
 frmts/raw/hkvdataset.cpp                           |   501 +-
 frmts/raw/idadataset.cpp                           |    16 +-
 frmts/raw/iscedataset.cpp                          |    12 +-
 frmts/raw/krodataset.cpp                           |     8 +-
 frmts/raw/landataset.cpp                           |    18 +-
 frmts/raw/lcpdataset.cpp                           |  3516 +--
 frmts/raw/loslasdataset.cpp                        |    14 +-
 frmts/raw/mffdataset.cpp                           |    22 +-
 frmts/raw/ndfdataset.cpp                           |    14 +-
 frmts/raw/ntv2dataset.cpp                          |    14 +-
 frmts/raw/pauxdataset.cpp                          |   100 +-
 frmts/raw/pnmdataset.cpp                           |     6 +-
 frmts/raw/roipacdataset.cpp                        |     6 +-
 frmts/raw/snodasdataset.cpp                        |    15 +-
 frmts/rmf/frmt_rmf.html                            |     2 +
 frmts/rmf/rmfdataset.cpp                           |   148 +-
 frmts/rmf/rmfdataset.h                             |    13 +-
 frmts/vrt/vrtrasterband.cpp                        |     6 +-
 gcore/gdal.h                                       |     4 +-
 gcore/gdal_mdreader.cpp                            |     7 +-
 gcore/gdal_misc.cpp                                |     7 +-
 gcore/gdal_version.h                               |     4 +-
 gcore/gdaldefaultoverviews.cpp                     |    14 +-
 man/man1/_home_rouault_dist_wrk_gdal_apps_.1       |     2 +-
 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/ogrtindex.1                               |     2 +-
 man/man1/pct2rgb.1                                 |     2 +-
 man/man1/rgb2pct.1                                 |     2 +-
 ogr/ogrsf_frmts/dxf/intronurbs.cpp                 |   200 +-
 ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp                |   298 +-
 ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp      |     2 +-
 ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp       |    12 +-
 ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp      |     2 +-
 ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp                |    10 +
 ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp  |   300 +-
 ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h           |    13 +-
 ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp   |    84 +-
 .../mssqlspatial/ogrmssqlspatialtablelayer.cpp     |    15 +-
 ogr/ogrsf_frmts/mysql/makefile.vc                  |     5 +
 ogr/ogrsf_frmts/ogr_formats.html                   |     2 +-
 ogr/ogrsf_frmts/plscenes/drv_plscenes.html         |   184 +-
 ogr/ogrsf_frmts/plscenes/ogr_plscenes.h            |    26 +-
 ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp    |    20 +-
 ogr/ogrsf_frmts/plscenes/ogrplscenesdriver.cpp     |     5 +-
 ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp  |   193 +-
 ogr/ogrsf_frmts/plscenes/ogrplscenesv1layer.cpp    |   426 +-
 ogr/ogrsf_frmts/s57/drv_s57.html                   |     4 +-
 ogr/ogrsf_frmts/shape/drv_shapefile.html           |     4 +
 ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp       |    10 +-
 ogr/ogrsf_frmts/shape/shapefil.h                   |     9 +-
 ogr/ogrsf_frmts/shape/shpopen.c                    |   262 +-
 ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp            |    27 +-
 ogr/ogrutils.cpp                                   |    24 +-
 port/cpl_port.h                                    |    33 +-
 port/cpl_string.cpp                                |     9 +-
 port/cpl_vsil.cpp                                  |     9 +-
 port/cpl_vsil_curl.cpp                             |   307 +-
 swig/SWIGmake.base                                 |     3 +-
 swig/csharp/ogr/AxisOrientation.cs                 |    21 +
 swig/csharp/ogr/OsrPINVOKE.cs                      |     9 +
 swig/csharp/ogr/SpatialReference.cs                |    18 +
 swig/csharp/ogr/ogr_wrap.cpp                       |    19 +-
 swig/csharp/ogr/osr_wrap.cpp                       |   121 +
 swig/csharp/osr/AxisOrientation.cs                 |    21 +
 swig/csharp/osr/OsrPINVOKE.cs                      |     9 +
 swig/csharp/osr/SpatialReference.cs                |    18 +
 swig/csharp/osr/osr_wrap.cpp                       |   121 +
 swig/include/java/typemaps_java.i                  |     4 +-
 swig/include/ogr.i                                 |    31 +-
 swig/include/osr.i                                 |    52 +-
 swig/include/perl/ogr_perl.i                       |    11 +-
 swig/include/perl/typemaps_perl.i                  |    42 +-
 swig/java/GNUmakefile                              |    14 +-
 swig/java/apps/OSRTest.java                        |    42 +
 swig/java/apps/ogrinfo.java                        |     6 +-
 swig/java/build.xml                                |     2 +-
 swig/java/javadoc.java                             |    52 +-
 swig/java/makefile.vc                              |    26 +-
 swig/perl/Makefile.PL                              |     9 +-
 swig/perl/gdal_wrap.cpp                            | 29163 ++++++++++++++++++
 swig/perl/gdalconst_wrap.c                         |  2608 ++
 swig/perl/gnm_wrap.cpp                             |  4756 +++
 swig/perl/lib/Geo/GDAL.pm                          |  2996 ++
 swig/perl/lib/Geo/GDAL/Const.pm                    |   195 +
 swig/perl/lib/Geo/GNM.pm                           |   184 +
 .../perl/ogr_perl.i => perl/lib/Geo/OGR.pm}        |  1205 +-
 swig/perl/lib/Geo/OSR.pm                           |   734 +
 swig/perl/ogr_wrap.cpp                             | 30294 +++++++++++++++++++
 swig/perl/osr_wrap.cpp                             | 14871 +++++++++
 swig/perl/t/feature.t                              |    36 +-
 swig/python/extensions/gdal_array_wrap.cpp         |    12 +-
 swig/python/extensions/gdal_wrap.cpp               |     2 +-
 swig/python/extensions/ogr_wrap.cpp                |    21 +-
 swig/python/extensions/osr_wrap.cpp                |   190 +-
 swig/python/osgeo/gdal.py                          |   148 +-
 swig/python/osgeo/gdal_array.py                    |     8 +-
 swig/python/osgeo/gnm.py                           |     6 +-
 swig/python/osgeo/ogr.py                           |   410 +-
 swig/python/osgeo/osr.py                           |    35 +-
 182 files changed, 94046 insertions(+), 4870 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