[gdal] 01/03: Merge branch 'experimental-2.0'

2016-03-01 Thread Sebastiaan Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gdal.

commit 458418907015e883f072b91c426377fc598872e1
Merge: eb7c878 0271833
Author: Bas Couwenberg 
Date:   Tue Mar 1 20:53:50 2016 +0100

Merge branch 'experimental-2.0'

Conflicts:
GDALmake.opt.in
NEWS
VERSION
alg/gdalgrid_priv.h
alg/gdaltransformer.cpp
alg/llrasterize.cpp
apps/gdalbuildvrt.cpp
apps/gdaldem.cpp
apps/gdalserver.c
apps/gdalwarp.cpp
apps/ogr2ogr.cpp
configure.in
data/ruian_vf_ob_v1.gfs
data/ruian_vf_v1.gfs
debian/changelog
debian/control
debian/copyright
debian/gbp.conf
debian/gdal-symbols.pl
debian/libgdal1h.install
debian/libgdal1i.install
debian/libgdal1i.symbols.alpha
debian/libgdal1i.symbols.amd64
debian/libgdal1i.symbols.arm64
debian/libgdal1i.symbols.armel
debian/libgdal1i.symbols.armhf
debian/libgdal1i.symbols.common
debian/libgdal1i.symbols.hppa
debian/libgdal1i.symbols.hurd-i386
debian/libgdal1i.symbols.i386
debian/libgdal1i.symbols.kfreebsd-amd64
debian/libgdal1i.symbols.kfreebsd-i386
debian/libgdal1i.symbols.mips
debian/libgdal1i.symbols.mipsel
debian/libgdal1i.symbols.powerpc
debian/libgdal1i.symbols.ppc64
debian/libgdal1i.symbols.ppc64el
debian/libgdal1i.symbols.s390x
debian/libgdal1i.symbols.x32
debian/libgdal20.install
debian/patches/accomodate-typo
debian/patches/algoritm-typo
debian/patches/allows-typo
debian/patches/bandwith-typo
debian/patches/consistant-typo
debian/patches/developement-typo
debian/patches/doc-brief
debian/patches/existence-typo.patch
debian/patches/explicitely-typo
debian/patches/hardening
debian/patches/inconsistant-typo
debian/patches/initalize-typo
debian/patches/instantiate-typo.patch
debian/patches/occurred-typo.patch
debian/patches/outputting-typo.patch
debian/patches/paramters-typo
debian/patches/position-typo.patch
debian/patches/recommanded-typo
debian/patches/responsibility-typo.patch
debian/patches/ressource-typo
debian/patches/retrieve-typo.patch
debian/patches/series
debian/patches/spatialite
debian/patches/sqlite-3.10.0
debian/patches/supported-typo.patch
debian/patches/supress-typo
debian/patches/transfered-typo
debian/patches/transfering-typo
debian/patches/transform-typo.patch
debian/patches/usefull-typo
debian/rules
frmts/envisat/EnvisatFile.c
frmts/ers/ersdataset.cpp
frmts/frmt_various.html
frmts/grass/pkg/configure.in
frmts/gtiff/geotiff.cpp
frmts/gtiff/gt_wkt_srs.cpp
frmts/hdf4/hdf4dataset.cpp
frmts/hf2/hf2dataset.cpp
frmts/netcdf/netcdfdataset.cpp
frmts/nitf/ecrgtocdataset.cpp
frmts/nitf/rpftocfile.cpp
frmts/northwood/grcdataset.cpp
frmts/northwood/grddataset.cpp
frmts/northwood/northwood.cpp
frmts/pdf/pdfdataset.cpp
frmts/pdf/pdfio.cpp
frmts/pdf/pdfio.h
frmts/raw/btdataset.cpp
frmts/til/tildataset.cpp
frmts/vrt/vrtdataset.cpp
frmts/vrt/vrtsources.cpp
gcore/gdal_version.h
gcore/gdaljp2metadata.cpp
gcore/gdalrasterband.cpp
man/man1/gdal-config.1
man/man1/gdal2tiles.1
man/man1/gdal_calc.1
man/man1/gdal_contour.1
man/man1/gdal_edit.1
man/man1/gdal_fillnodata.1
man/man1/gdal_grid.1
man/man1/gdal_merge.1
man/man1/gdal_polygonize.1
man/man1/gdal_proximity.1
man/man1/gdal_rasterize.1
man/man1/gdal_retile.1
man/man1/gdal_sieve.1
man/man1/gdal_translate.1
man/man1/gdal_utilities.1
man/man1/gdaladdo.1
man/man1/gdalbuildvrt.1
man/man1/gdalcompare.1
man/man1/gdaldem.1
man/man1/gdalinfo.1
man/man1/gdallocationinfo.1
man/man1/gdalmanage.1
man/man1/gdalmove.1
man/man1/gdalsrsinfo.1
man/man1/gdaltindex.1
man/man1/gdaltransform.1
man/man1/gdalwarp.1
man/man1/nearblack.1
man/man1/ogr2ogr.1
man/man1/ogr_utilities.1
man/man1/ogrinfo.1
man/man1/ogrlineref.1
man/man1/ogrtindex.1
man/man1/pct2rgb.1
man/man1/rgb2pct.1
ogr/ogr_srs_api.h
ogr/ogr_srs_esri.cpp
ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp
ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp

[gdal] 01/03: Merge branch 'experimental'

2015-10-21 Thread Sebastiaan Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gdal.

commit 647acc9b007fe37393f9596bdef6842240a82f97
Merge: 8243204 5864d73
Author: Bas Couwenberg 
Date:   Thu Oct 22 00:43:13 2015 +0200

Merge branch 'experimental'

 GDALmake.opt.in|2 +-
 NEWS   |  117 +
 VERSION|2 +-
 alg/gdalgrid_priv.h|   11 +-
 alg/gdaltransformer.cpp|   10 +-
 alg/llrasterize.cpp|4 +-
 apps/gdalbuildvrt.cpp  |   25 +-
 apps/gdaldem.cpp   |4 +-
 apps/gdalserver.c  |9 +-
 apps/gdalwarp.cpp  |9 +-
 apps/ogr2ogr.cpp   |7 +-
 configure  |   64 +-
 configure.in   |   61 +-
 data/ruian_vf_ob_v1.gfs|   12 +
 data/ruian_vf_v1.gfs   |   12 +
 debian/changelog   |   22 +
 debian/control |4 +-
 debian/gbp.conf|2 +-
 debian/libgdal1i.symbols.alpha |2 +-
 debian/libgdal1i.symbols.amd64 |2 +-
 debian/libgdal1i.symbols.arm64 |2 +-
 debian/libgdal1i.symbols.armel |2 +-
 debian/libgdal1i.symbols.armhf |2 +-
 debian/libgdal1i.symbols.hppa  |  156 +-
 debian/libgdal1i.symbols.hurd-i386 |  154 +-
 debian/libgdal1i.symbols.i386  |2 +-
 debian/libgdal1i.symbols.kfreebsd-amd64|2 +-
 debian/libgdal1i.symbols.kfreebsd-i386 |2 +-
 debian/libgdal1i.symbols.mips  |2 +-
 debian/libgdal1i.symbols.mipsel|2 +-
 debian/libgdal1i.symbols.powerpc   |2 +-
 debian/libgdal1i.symbols.ppc64 |2 +-
 debian/libgdal1i.symbols.ppc64el   |2 +-
 debian/libgdal1i.symbols.s390x |2 +-
 debian/libgdal1i.symbols.x32   |  154 +-
 debian/patches/accomodate-typo |   14 +-
 debian/patches/consistant-typo |   16 +-
 debian/patches/developement-typo   |2 +-
 debian/patches/existant-typo   |  111 -
 debian/patches/explicitely-typo|   10 +-
 debian/patches/initalize-typo  |6 +-
 debian/patches/ressource-typo  |6 +-
 debian/patches/series  |1 -
 debian/patches/spatialite  |6 +-
 debian/patches/supress-typo|   72 +-
 debian/patches/usefull-typo|   36 +-
 frmts/blx/blx.c|6 +-
 frmts/envisat/EnvisatFile.c|   10 +-
 frmts/ers/ersdataset.cpp   |   33 +-
 frmts/frmt_various.html|9 +-
 frmts/georaster/georaster_dataset.cpp  |  269 +-
 frmts/grass/pkg/Makefile.in|   19 +-
 frmts/grass/pkg/configure  | 4688 +++-
 frmts/grass/pkg/configure.in   |   49 +-
 frmts/gtiff/geotiff.cpp|   28 +-
 frmts/gtiff/gt_wkt_srs.cpp |   22 +-
 frmts/hdf4/hdf4dataset.cpp |   10 +-
 frmts/hf2/hf2dataset.cpp   |   10 +-
 frmts/netcdf/netcdfdataset.cpp |   13 +-
 frmts/nitf/ecrgtocdataset.cpp  |  200 +-
 frmts/nitf/rpftocfile.cpp  |   20 +-
 frmts/northwood/grcdataset.cpp |   56 +-
 frmts/northwood/grddataset.cpp |   51 +-
 frmts/northwood/northwood.cpp  |8 +-
 frmts/pcidsk/sdk/channel/cpcidskchannel.cpp|8 +-
 frmts/pcidsk/sdk/channel/ctiledchannel.cpp |4 +-
 frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp |4 +-
 frmts/pdf/pdfdataset.cpp   |   12 +-
 frmts/pdf/pdfio.cpp|   82 +-
 frmts/pdf/pdfio.h  |6 +-
 frmts/raw/btdataset.cpp|4 +-
 frmts/til/tildataset.cpp   |   10 +-
 frmts/vrt/vrtdataset.cpp   |   24 +-
 frmts/vrt/vrtsources.cpp   |8 +-
 gcore/gdal_version.h   |6 +-
 

[gdal] 01/03: Merge branch 'experimental'

2015-08-21 Thread Sebastiaan Couwenberg
This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gdal.

commit 54121db80e91827c81cf6f33bbe388b6f05f9389
Merge: 970c704 ca30779
Author: Bas Couwenberg sebas...@xs4all.nl
Date:   Fri Aug 21 14:54:02 2015 +0200

Merge branch 'experimental'

Conflicts:
debian/changelog
debian/control
debian/copyright
debian/gdal-symbols.pl
debian/libgdal1h.lintian-overrides
debian/libgdal1h.symbols.amd64
debian/libgdal1h.symbols.armel
debian/libgdal1h.symbols.armhf
debian/libgdal1h.symbols.i386
debian/libgdal1h.symbols.ia64
debian/libgdal1h.symbols.mips
debian/libgdal1h.symbols.mipsel
debian/libgdal1h.symbols.powerpc
debian/libgdal1h.symbols.s390x
debian/libgdal1h.symbols.sparc
debian/patches/accomodate-typo
debian/patches/algoritm-typo
debian/patches/allows-typo
debian/patches/bandwith-typo
debian/patches/consistant-typo
debian/patches/developement-typo
debian/patches/explicitely-typo
debian/patches/hurd-i386-pathmax
debian/patches/inconsistant-typo
debian/patches/initalize-typo
debian/patches/paramters-typo
debian/patches/perl-vendor
debian/patches/ressource-typo
debian/patches/series
debian/patches/supress-typo
debian/patches/transfered-typo
debian/patches/transfering-typo
debian/patches/unkown-typo
debian/patches/usefull-typo

 .gitignore |20 +
 COMMITERS  |20 +-
 GDALmake.opt.in|32 +-
 GNUmakefile|17 +-
 LICENSE.TXT|11 +
 MIGRATION_GUIDE.TXT|29 +
 NEWS   |  1125 +-
 VERSION| 2 +-
 Vagrantfile|99 +
 alg/GNUmakefile| 9 +-
 alg/contour.cpp| 5 +-
 alg/gdal_alg.h | 3 +-
 alg/gdal_alg_priv.h|11 +-
 alg/gdal_crs.c |   102 +-
 alg/gdal_rpc.cpp   |   412 +-
 alg/gdal_tps.cpp   |   134 +-
 alg/gdalchecksum.cpp   | 5 +-
 alg/gdalcutline.cpp|60 +-
 alg/gdaldither.cpp | 5 +-
 alg/gdalgeoloc.cpp |70 +-
 alg/gdalgrid.cpp   |   113 +-
 alg/gdalgrid.h | 3 +-
 alg/gdalgrid_priv.h|75 +
 alg/gdalgridavx.cpp|   225 +
 alg/gdalmediancut.cpp  | 5 +-
 alg/gdalproximity.cpp  | 5 +-
 alg/gdalrasterize.cpp  |   320 +-
 alg/gdalsievefilter.cpp| 7 +-
 alg/gdaltransformer.cpp|   375 +-
 alg/gdaltransformgeolocs.cpp   | 2 +-
 alg/gdalwarper.cpp |22 +-
 alg/gdalwarper.h   | 8 +-
 alg/gdalwarpkernel.cpp |   106 +-
 alg/gdalwarpkernel_opencl.c|42 +-
 alg/gdalwarpoperation.cpp  |15 +-
 alg/llrasterize.cpp|20 +-
 alg/polygonize.cpp | 5 +-
 alg/rasterfill.cpp | 9 +-
 alg/thinplatespline.cpp|   405 +-
 alg/thinplatespline.h  |22 +-
 apps/GNUmakefile   |10 +-
 apps/commonutils.cpp   | 6 +-
 apps/commonutils.h | 4 +-
 apps/dumpoverviews.cpp | 5 +-
 apps/gdal2ogr.c| 2 +-
 apps/gdal_contour.cpp  |20 +-
 apps/gdal_grid.cpp |  2182 ++--
 apps/gdal_rasterize.cpp| 7 +-
 apps/gdal_translate.cpp|   269 +-
 apps/gdal_utilities.dox|   132 +-
 apps/gdaladdo.cpp  | 7 +-
 apps/gdalbuildvrt.cpp  |44 +-
 apps/gdaldem.cpp   |   107 +-
 apps/gdalenhance.cpp   | 7 +-