[gdal] 27/29: Merge tag 'upstream/2.0.0_rc2+dfsg' into experimental-2.0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jun 14 20:19:47 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 17bb7c8b5cd7a2fd5897f5e0c58b638f7fc5d254
Merge: e18377b bf69e09
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jun 14 21:03:29 2015 +0200
Merge tag 'upstream/2.0.0_rc2+dfsg' into experimental-2.0
Upstream version 2.0.0~rc2+dfsg
MIGRATION_GUIDE.TXT | 6 +-
NEWS | 27 ++---
alg/gdalgrid_priv.h | 11 +-
alg/gdaltransformer.cpp | 6 +-
alg/gdalwarper.h | 4 +-
apps/commonutils.cpp | 6 +-
apps/gdal_grid.cpp | 10 +-
apps/gdal_utilities.dox | 5 +-
apps/ogr_utilities.dox | 3 +-
apps/ogrlineref.cpp | 2 +-
configure | 4 +-
configure.in | 12 +--
data/gdalvrt.xsd | 22 +++-
frmts/e00grid/e00read.c | 2 +-
frmts/ecw/ecwasyncreader.cpp | 4 +-
frmts/ecw/ecwdataset.cpp | 6 +-
frmts/gtiff/geotiff.cpp | 20 ++--
frmts/hdf4/hdf-eos/GDapi.c | 4 +-
frmts/hdf4/hdf-eos/SWapi.c | 4 +-
frmts/l1b/l1bdataset.cpp | 6 +-
frmts/mbtiles/frmt_mbtiles.html | 2 +-
frmts/openjpeg/frmt_jp2openjpeg.html | 8 +-
frmts/openjpeg/openjpegdataset.cpp | 10 +-
frmts/pdf/frmt_pdf.html | 2 +-
frmts/rasdaman/frmt_rasdaman.html | 2 +-
frmts/vrt/vrt_tutorial.dox | 14 ++-
frmts/vrt/vrtsources.cpp | 34 +++++--
frmts/zlib/zlib.h | 2 +-
gcore/gdal.h | 4 +-
gcore/gdal_misc.cpp | 14 ++-
gcore/gdaldataset.cpp | 14 +--
gcore/gdaldllmain.cpp | 2 +-
gcore/gdaldrivermanager.cpp | 6 +-
gcore/gdaljp2metadata.cpp | 6 +-
gcore/gdalproxypool.cpp | 75 ++++++++++++--
gcore/gdalrasterblock.cpp | 122 +++++++++++++----------
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 | 8 +-
man/man1/gdaladdo.1 | 4 +-
man/man1/gdalbuildvrt.1 | 4 +-
man/man1/gdalcompare.1 | 4 +-
man/man1/gdaldem.1 | 4 +-
man/man1/gdalinfo.1 | 4 +-
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 | 6 +-
man/man1/ogr_utilities.1 | 8 +-
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 +-
nmake.opt | 4 +-
ogr/ogrcurvecollection.cpp | 4 +-
ogr/ogrgeometrycollection.cpp | 6 +-
ogr/ogrgeometryfactory.cpp | 12 +--
ogr/ogrlinestring.cpp | 6 +-
ogr/ogrsf_frmts/arcobjects/aolayer.cpp | 6 +-
ogr/ogrsf_frmts/arcobjects/ogr_ao.h | 2 +-
ogr/ogrsf_frmts/cartodb/drv_cartodb.html | 2 +-
ogr/ogrsf_frmts/csv/drv_csv.html | 2 +-
ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp | 6 +-
ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp | 14 +--
ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp | 2 +-
ogr/ogrsf_frmts/filegdb/ogr_fgdb.h | 4 +-
ogr/ogrsf_frmts/generic/ogrunionlayer.h | 4 +-
ogr/ogrsf_frmts/geojson/drv_geojson.html | 2 +-
ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp | 6 +-
ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html | 4 +-
ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp | 2 +-
ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 4 +-
ogr/ogrsf_frmts/ili/imdreader.cpp | 40 +++++---
ogr/ogrsf_frmts/mitab/mitab_bounds.cpp | 2 +-
ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp | 4 +-
ogr/ogrsf_frmts/pg/ogrpglayer.cpp | 6 +-
ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp | 8 +-
ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp | 6 +-
ogr/ogrsf_frmts/selafin/drv_selafin.html | 2 +-
ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp | 2 +-
ogr/ogrsf_frmts/shape/shpopen.c | 2 +-
ogr/ogrsf_frmts/sqlite/drv_sqlite.html | 2 +-
ogr/ogrsf_frmts/sqlite/ogr_sqlite.h | 4 +-
ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp | 8 +-
ogr/ogrsf_frmts/vrt/drv_vrt.html | 2 +-
ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp | 8 +-
port/cpl_csv.cpp | 6 +-
port/cpl_error.cpp | 6 +-
port/cpl_multiproc.cpp | 22 ++--
port/cpl_virtualmem.cpp | 4 +-
port/cpl_virtualmem.h | 4 +-
swig/include/gdal_array.i | 14 +--
swig/java/GNUmakefile | 10 +-
swig/php/gdal_wrap.cpp | 2 +-
swig/php/gdalconst_wrap.c | 2 +-
swig/php/ogr_wrap.cpp | 2 +-
swig/php/osr_wrap.cpp | 2 +-
swig/python/extensions/gdal_array_wrap.cpp | 2 +-
swig/python/extensions/gdal_wrap.cpp | 2 +-
swig/python/extensions/gdalconst_wrap.c | 2 +-
swig/python/extensions/ogr_wrap.cpp | 2 +-
swig/python/extensions/osr_wrap.cpp | 2 +-
swig/python/osgeo/gdal_array.py | 12 +--
swig/python/samples/validate_jp2.py | 12 +--
122 files changed, 549 insertions(+), 378 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