[gdal] 08/29: Merge tag 'upstream/2.0.0_beta2+dfsg' into experimental-2.0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jun 14 20:19:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.0
in repository gdal.
commit 0e21944f1851b024bf25cca786dc60fddc8a9ecb
Merge: d841a3a 496aca2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jun 13 21:24:39 2015 +0200
Merge tag 'upstream/2.0.0_beta2+dfsg' into experimental-2.0
Upstream version 2.0.0~beta2+dfsg
GNUmakefile | 1 +
NEWS | 49 +-
VERSION | 2 +-
alg/gdal_crs.c | 13 +-
alg/gdal_rpc.cpp | 277 +++++-
alg/gdal_tps.cpp | 7 +-
alg/gdalgeoloc.cpp | 7 +-
alg/gdaltransformer.cpp | 37 +-
alg/gdalwarper.cpp | 7 +-
apps/GNUmakefile | 2 +-
apps/gdal_utilities.dox | 7 +-
apps/gdalinfo.c | 994 +++++++++++++++++----
apps/gdalwarp.cpp | 282 ++++--
apps/makefile.vc | 2 +-
apps/ogr2ogr.cpp | 45 +-
apps/ogr_utilities.dox | 7 +-
configure | 42 +-
configure.in | 3 +-
frmts/blx/blx.c | 2 +
frmts/gif/gifabstractdataset.cpp | 36 +-
frmts/gif/gifabstractdataset.h | 6 +-
frmts/gtiff/geotiff.cpp | 26 +-
frmts/hdf4/hdf4dataset.cpp | 10 +-
frmts/hdf4/hdf4imagedataset.cpp | 47 +-
frmts/hfa/hfadataset.cpp | 15 +-
frmts/jpeg2000/jpeg2000dataset.cpp | 6 +-
frmts/netcdf/netcdfdataset.cpp | 11 +-
frmts/pcraster/pcrasterdataset.cpp | 10 +-
frmts/pcraster/pcrasterdataset.h | 6 +-
frmts/pcraster/pcrasterrasterband.cpp | 68 +-
frmts/pcraster/pcrasterrasterband.h | 10 +-
frmts/til/tildataset.cpp | 10 +-
frmts/vrt/vrtdataset.cpp | 24 +-
frmts/vrt/vrtsourcedrasterband.cpp | 8 +-
frmts/vrt/vrtsources.cpp | 87 +-
frmts/wms/frmt_wms.html | 17 +-
gcore/GNUmakefile | 2 +-
gcore/gdal.h | 5 +-
gcore/gdal_mdreader.cpp | 88 +-
gcore/gdal_mdreader.h | 29 +-
gcore/gdal_rat.cpp | 117 ++-
gcore/gdal_rat.h | 3 +-
gcore/gdal_version.h | 4 +-
gcore/gdaldataset.cpp | 24 +-
gcore/gdaldriver.cpp | 9 +-
gcore/gdaljp2metadata.cpp | 105 ++-
gcore/gdaljp2metadata.h | 5 +-
gcore/makefile.vc | 2 +-
gcore/mdreader/GNUmakefile | 4 +-
gcore/mdreader/makefile.vc | 8 +-
gcore/mdreader/reader_alos.cpp | 405 +++++++++
gcore/mdreader/{reader_geo_eye.h => reader_alos.h} | 44 +-
gcore/mdreader/reader_digital_globe.h | 20 +-
gcore/mdreader/reader_eros.cpp | 286 ++++++
gcore/mdreader/{reader_geo_eye.h => reader_eros.h} | 35 +-
gcore/mdreader/reader_geo_eye.cpp | 9 +-
gcore/mdreader/reader_geo_eye.h | 14 +-
gcore/mdreader/reader_kompsat.cpp | 277 ++++++
.../{reader_pleiades.h => reader_kompsat.h} | 35 +-
gcore/mdreader/reader_landsat.cpp | 12 +-
gcore/mdreader/reader_landsat.h | 16 +-
gcore/mdreader/reader_orb_view.h | 14 +-
gcore/mdreader/reader_pleiades.cpp | 9 +-
gcore/mdreader/reader_pleiades.h | 12 +-
gcore/mdreader/reader_rapid_eye.cpp | 155 ++++
.../{reader_pleiades.h => reader_rapid_eye.h} | 35 +-
gcore/mdreader/reader_rdk1.h | 10 +-
gcore/mdreader/reader_spot.cpp | 315 +++++++
.../mdreader/{reader_pleiades.h => reader_spot.h} | 40 +-
gcore/rasterio.cpp | 8 +-
man/man1/gdal-config.1 | 4 +-
man/man1/gdal2tiles.1 | 4 +-
man/man1/gdal_calc.1 | 4 +-
man/man1/gdal_contour.1 | 4 +-
man/man1/gdal_edit.1 | 4 +-
man/man1/gdal_fillnodata.1 | 4 +-
man/man1/gdal_grid.1 | 4 +-
man/man1/gdal_merge.1 | 4 +-
man/man1/gdal_polygonize.1 | 4 +-
man/man1/gdal_proximity.1 | 4 +-
man/man1/gdal_rasterize.1 | 4 +-
man/man1/gdal_retile.1 | 4 +-
man/man1/gdal_sieve.1 | 4 +-
man/man1/gdal_translate.1 | 4 +-
man/man1/gdal_utilities.1 | 4 +-
man/man1/gdaladdo.1 | 4 +-
man/man1/gdalbuildvrt.1 | 4 +-
man/man1/gdalcompare.1 | 4 +-
man/man1/gdaldem.1 | 4 +-
man/man1/gdalinfo.1 | 8 +-
man/man1/gdallocationinfo.1 | 4 +-
man/man1/gdalmanage.1 | 4 +-
man/man1/gdalmove.1 | 4 +-
man/man1/gdalsrsinfo.1 | 4 +-
man/man1/gdaltindex.1 | 4 +-
man/man1/gdaltransform.1 | 4 +-
man/man1/gdalwarp.1 | 4 +-
man/man1/nearblack.1 | 4 +-
man/man1/ogr2ogr.1 | 8 +-
man/man1/ogr_utilities.1 | 4 +-
man/man1/ogrinfo.1 | 4 +-
man/man1/ogrlineref.1 | 4 +-
man/man1/ogrtindex.1 | 4 +-
man/man1/pct2rgb.1 | 4 +-
man/man1/rgb2pct.1 | 4 +-
ogr/ogrsf_frmts/csv/drv_csv.html | 9 +-
ogr/ogrsf_frmts/csv/ogr_csv.h | 7 +-
ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 28 +-
ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp | 15 +-
ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 59 +-
ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp | 10 +-
ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp | 156 ++--
ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp | 18 +-
ogr/ogrsf_frmts/filegdb/drv_filegdb.html | 4 +-
ogr/ogrsf_frmts/filegdb/ogr_fgdb.h | 7 +-
ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp | 143 ++-
ogr/ogrsf_frmts/generic/ogremulatedtransaction.h | 20 -
ogr/ogrsf_frmts/geojson/libjson/json_object.h | 21 +-
ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp | 13 +-
ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h | 12 +-
ogr/ogrsf_frmts/gml/drv_gml.html | 28 +-
ogr/ogrsf_frmts/gml/gmlhandler.cpp | 39 +-
ogr/ogrsf_frmts/gml/gmlreader.cpp | 6 +-
ogr/ogrsf_frmts/gml/gmlreaderp.h | 8 +-
ogr/ogrsf_frmts/gml/gmlregistry.cpp | 16 +-
ogr/ogrsf_frmts/gml/gmlregistry.h | 5 +-
ogr/ogrsf_frmts/gml/ogr_gml.h | 4 +-
ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp | 48 +-
ogr/ogrsf_frmts/gml/ogrgmldriver.cpp | 31 +-
ogr/ogrsf_frmts/gpkg/drv_geopackage.html | 14 +-
ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 5 +
ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp | 6 +
ogr/ogrsf_frmts/gpsbabel/drv_gpsbabel.html | 1 +
ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h | 5 +-
ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldatasource.cpp | 32 +-
ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp | 131 ++-
ogr/ogrsf_frmts/ili/drv_ili.html | 33 +-
ogr/ogrsf_frmts/ili/ogrili1layer.cpp | 6 +-
ogr/ogrsf_frmts/mssqlspatial/drv_mssqlspatial.html | 10 +-
ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h | 13 +-
.../mssqlspatial/ogrmssqlspatialdatasource.cpp | 135 +--
.../mssqlspatial/ogrmssqlspatiallayer.cpp | 5 +-
.../mssqlspatial/ogrmssqlspatialtablelayer.cpp | 195 ++--
ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp | 11 +-
ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp | 62 +-
ogr/ogrsf_frmts/openfilegdb/filegdbtable.h | 5 +-
.../openfilegdb/ogropenfilegdblayer.cpp | 18 +-
ogr/ogrsf_frmts/osm/drv_osm.html | 16 +
ogr/ogrsf_frmts/osm/ogr_osm.h | 6 +-
ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp | 28 +-
ogr/ogrsf_frmts/osm/ogrosmdriver.cpp | 15 +-
ogr/ogrsf_frmts/plscenes/drv_plscenes.html | 6 +-
ogr/ogrsf_frmts/plscenes/ogr_plscenes.h | 8 +-
ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp | 45 +-
ogr/ogrsf_frmts/plscenes/ogrplsceneslayer.cpp | 59 +-
ogr/ogrsf_frmts/shape/shape2ogr.cpp | 6 +-
ogr/ogrsf_frmts/wfs/drv_wfs.html | 12 +
ogr/ogrsf_frmts/wfs/ogr_wfs.h | 11 +-
ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp | 19 +-
ogr/ogrsf_frmts/wfs/ogrwfsdriver.cpp | 9 +-
ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp | 65 +-
ogr/ogrsf_frmts/xplane/ogr_xplane_apt_reader.cpp | 121 ++-
ogr/ogrsf_frmts/xplane/ogr_xplane_apt_reader.h | 33 +-
port/cpl_csv.cpp | 18 +-
swig/csharp/gdal/Gdal.cs | 5 +-
swig/csharp/gdal/GdalPINVOKE.cs | 2 +-
swig/csharp/gdal/gdal_wrap.cpp | 34 +-
swig/include/Band.i | 48 +-
swig/include/cpl.i | 20 +-
swig/include/csharp/typemaps_csharp.i | 4 +-
swig/include/gdal.i | 4 +-
swig/include/java/typemaps_java.i | 4 +-
swig/include/perl/gdal_perl.i | 83 +-
swig/include/perl/typemaps_perl.i | 125 ++-
swig/include/python/typemaps_python.i | 4 +-
swig/perl/cr.dox | 2 +-
swig/perl/cv.dox | 2 +-
swig/perl/gdal_wrap.cpp | 212 +++--
swig/perl/index.dox | 4 +-
swig/perl/lib/Geo/GDAL.dox | 2 +-
swig/perl/lib/Geo/GDAL.pm | 83 +-
swig/perl/lib/Geo/OGR.dox | 20 +-
swig/perl/lib/Geo/OSR.dox | 2 +-
swig/perl/transform.dox | 4 +-
swig/python/extensions/gdal_wrap.cpp | 33 +-
swig/python/osgeo/gdal.py | 10 +-
swig/python/samples/README | 2 +
swig/python/samples/gcps2ogr.py | 83 ++
swig/python/scripts/gdal_merge.py | 28 +-
189 files changed, 5631 insertions(+), 1547 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