[gdal] 04/08: Merge tag 'upstream/1.11.2+dfsg' into experimental
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Feb 19 00:17:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository gdal.
commit 6470adca982ac371dd9daaf689fb2527771c8749
Merge: 58bd42d 225f50a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Feb 17 22:44:28 2015 +0100
Merge tag 'upstream/1.11.2+dfsg' into experimental
Upstream version 1.11.2+dfsg
COMMITERS | 2 +-
GDALmake.opt.in | 3 +-
NEWS | 149 ++++++++
VERSION | 2 +-
alg/gdal_rpc.cpp | 385 +++++++++++----------
alg/gdalrasterize.cpp | 15 +-
alg/gdaltransformer.cpp | 67 ++--
alg/gdalwarper.cpp | 14 +-
alg/gdalwarper.h | 6 +-
alg/gdalwarpkernel.cpp | 7 +-
alg/gdalwarpkernel_opencl.c | 6 +-
alg/gdalwarpoperation.cpp | 14 +-
alg/llrasterize.cpp | 13 +-
apps/GNUmakefile | 2 +-
apps/gdal_contour.cpp | 19 +-
apps/gdal_translate.cpp | 6 +-
apps/gdalbuildvrt.cpp | 8 +-
apps/gdaldem.cpp | 74 ++--
apps/gdalenhance.cpp | 6 +-
apps/gdalserver.c | 6 +-
apps/gdaltindex.c | 6 +-
apps/gdalwarp.cpp | 38 +-
apps/makefile.vc | 64 ++--
apps/ogr2ogr.cpp | 43 ++-
apps/ogrlineref.cpp | 23 +-
configure | 101 +++++-
configure.in | 35 +-
data/gml_registry.xml | 7 +
data/ruian_vf_ob_v1.gfs | 331 +++++++++++++++++-
data/ruian_vf_st_uvoh_v1.gfs | 92 +++++
data/ruian_vf_st_v1.gfs | 28 +-
data/ruian_vf_v1.gfs | 42 +--
frmts/arg/argdataset.cpp | 20 +-
frmts/ceos2/ceosrecipe.c | 12 +-
frmts/e00grid/e00read.c | 21 +-
frmts/ecw/ecwcreatecopy.cpp | 27 +-
frmts/ecw/ecwdataset.cpp | 55 ++-
frmts/ecw/jp2userbox.cpp | 14 +-
frmts/fits/fitsdataset.cpp | 16 +-
frmts/gif/biggifdataset.cpp | 11 +-
frmts/gif/gifdataset.cpp | 19 +-
frmts/grass/grass57dataset.cpp | 5 +-
frmts/grib/degrib18/degrib/clock.c | 6 +-
frmts/grib/degrib18/degrib/degrib1.cpp | 12 +-
frmts/grib/degrib18/degrib/grib2api.c | 12 +-
frmts/grib/degrib18/degrib/inventory.cpp | 8 +-
frmts/grib/degrib18/degrib/tdlpack.cpp | 10 +-
frmts/grib/degrib18/g2clib-1.0.4/compack.c | 4 +-
frmts/grib/degrib18/g2clib-1.0.4/jpcunpack.c | 6 +-
frmts/grib/degrib18/g2clib-1.0.4/misspack.c | 8 +-
frmts/grib/degrib18/g2clib-1.0.4/mkieee.c | 4 +-
frmts/grib/degrib18/g2clib-1.0.4/reduce.c | 9 +-
frmts/grib/degrib18/g2clib-1.0.4/seekgb.c | 8 +-
frmts/grib/degrib18/g2clib-1.0.4/simunpack.c | 9 +-
frmts/grib/degrib18/g2clib-1.0.4/specpack.c | 6 +-
frmts/gsg/gs7bgdataset.cpp | 10 +-
frmts/gsg/gsbgdataset.cpp | 12 +-
frmts/gtiff/geotiff.cpp | 55 ++-
frmts/gtiff/gt_citation.cpp | 8 +-
frmts/gtiff/gt_jpeg_copy.cpp | 35 +-
frmts/gtiff/libgeotiff/geo_new.c | 7 +-
frmts/gtiff/libgeotiff/geo_print.c | 15 +-
frmts/gtiff/libtiff/tif_dir.c | 50 ++-
frmts/gtiff/libtiff/tif_dirinfo.c | 30 +-
frmts/gtiff/libtiff/tif_dirread.c | 37 +-
frmts/gtiff/libtiff/tif_getimage.c | 39 ++-
frmts/gtiff/libtiff/tif_lzw.c | 4 +-
frmts/gtiff/libtiff/tif_next.c | 25 +-
frmts/gtiff/libtiff/tif_ojpeg.c | 13 +-
frmts/gtiff/libtiff/tif_read.c | 15 +-
frmts/gtiff/libtiff/tif_vsi.c | 8 +-
frmts/gtiff/libtiff/tif_zip.c | 4 +-
frmts/gtiff/libtiff/tiff.h | 5 +-
frmts/gtiff/libtiff/tiffvers.h | 2 +-
frmts/hdf4/hdf4dataset.cpp | 10 +-
frmts/hdf4/makefile.vc | 5 +
frmts/hdf5/hdf5dataset.cpp | 9 +-
frmts/hdf5/hdf5imagedataset.cpp | 21 +-
frmts/hdf5/makefile.vc | 5 +
frmts/hfa/hfaband.cpp | 6 +-
frmts/hfa/hfaopen.cpp | 16 +-
frmts/hfa/hfatype.cpp | 15 +-
frmts/ilwis/ilwiscoordinatesystem.cpp | 59 ++--
frmts/ilwis/ilwisdataset.cpp | 18 +-
frmts/iris/irisdataset.cpp | 26 +-
frmts/jpeg/GNUmakefile | 2 +
frmts/jpeg/frmt_jpeg.html | 8 +
frmts/jpeg/jpgdataset.cpp | 100 +++++-
frmts/jpeg/libjpeg/jccoefct.c | 3 +-
frmts/jpeg/libjpeg/jccolor.c | 3 +-
frmts/jpeg/libjpeg/jcmarker.c | 7 +-
frmts/jpeg/libjpeg/jcsample.c | 3 +-
frmts/jpeg/libjpeg/jctrans.c | 3 +-
frmts/jpeg/libjpeg/jdatasrc.c | 3 +-
frmts/jpeg/libjpeg/jdcoefct.c | 4 +-
frmts/jpeg/libjpeg/jdcolor.c | 3 +-
frmts/jpeg/libjpeg/jdmerge.c | 8 +-
frmts/jpeg/libjpeg/jdpostct.c | 9 +-
frmts/jpeg/libjpeg/jdsample.c | 13 +-
frmts/jpeg/libjpeg/jmemansi.c | 22 +-
frmts/jpeg/libjpeg/jquant1.c | 10 +-
frmts/jpeg/libjpeg/jquant2.c | 6 +-
frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp | 15 +-
frmts/leveller/levellerdataset.cpp | 3 +-
frmts/mrsid/nmake.opt | 2 +
frmts/mrsid_lidar/gdal_MG4Lidar.cpp | 10 +-
frmts/msgn/msg_basic_types.cpp | 11 +-
frmts/netcdf/gmtdataset.cpp | 19 +-
frmts/netcdf/makefile.vc | 4 +
frmts/netcdf/netcdfdataset.cpp | 30 +-
frmts/nitf/nitffile.c | 24 +-
frmts/nitf/nitfimage.c | 71 ++--
frmts/northwood/northwood.cpp | 6 +-
frmts/openjpeg/GNUmakefile | 4 +
frmts/openjpeg/makefile.vc | 6 +-
frmts/openjpeg/openjpegdataset.cpp | 20 +-
frmts/pcidsk/sdk/channel/ctiledchannel.cpp | 10 +-
frmts/pcidsk/sdk/core/libjpeg_io.cpp | 22 +-
frmts/pcidsk/sdk/core/pcidskcreate.cpp | 9 +-
frmts/pcidsk/sdk/segment/cpcidsk_array.cpp | 8 +-
frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp | 41 +--
frmts/pcraster/libcsf/mopen.c | 23 +-
frmts/pdf/GNUmakefile | 2 +-
frmts/pdf/makefile.vc | 2 +-
frmts/pdf/pdfcreatecopy.cpp | 26 +-
frmts/pdf/pdfdataset.cpp | 28 +-
frmts/pds/isis3dataset.cpp | 2 +-
frmts/postgisraster/postgisrasterdataset.cpp | 16 +-
.../postgisraster/postgisrastertilerasterband.cpp | 12 +-
frmts/raw/cpgdataset.cpp | 23 +-
frmts/raw/genbindataset.cpp | 5 +-
frmts/raw/hkvdataset.cpp | 29 +-
frmts/rs2/rs2dataset.cpp | 24 +-
frmts/saga/sagadataset.cpp | 6 +-
frmts/usgsdem/usgsdemdataset.cpp | 65 ++--
frmts/vrt/vrtdataset.cpp | 21 +-
frmts/vrt/vrtsources.cpp | 14 +-
frmts/webp/webpdataset.cpp | 12 +-
frmts/xyz/xyzdataset.cpp | 10 +-
gcore/GNUmakefile | 3 +-
gcore/gdal_priv.h | 22 +-
gcore/gdal_version.h | 6 +-
gcore/gdalproxypool.cpp | 7 +-
gcore/gdalrasterband.cpp | 23 +-
gcore/gdalrescaledalphaband.cpp | 144 ++++++++
gcore/gdalvirtualmem.cpp | 12 +-
gcore/makefile.vc | 2 +-
gcore/overview.cpp | 19 +-
gcore/rasterio.cpp | 12 +-
m4/ax_oracle_oci.m4 | 9 +-
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 | 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 | 4 +-
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 +-
nmake.opt | 6 +-
ogr/gml2ogrgeometry.cpp | 26 +-
ogr/ogr_core.h | 8 +-
ogr/ogr_srs_pci.cpp | 11 +-
ogr/ogr_srs_proj4.cpp | 9 +-
ogr/ogr_srs_xml.cpp | 16 +-
ogr/ogrfeature.cpp | 26 +-
ogr/ogrpgeogeometry.cpp | 10 +-
ogr/ogrsf_frmts/avc/avc_bin.c | 16 +-
ogr/ogrsf_frmts/avc/avc_e00read.c | 9 +-
ogr/ogrsf_frmts/avc/avc_misc.c | 6 +-
ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 8 +-
ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 16 +-
ogr/ogrsf_frmts/dgn/dgnwrite.cpp | 23 +-
ogr/ogrsf_frmts/dxf/intronurbs.cpp | 5 +-
ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp | 26 +-
ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp | 10 +-
ogr/ogrsf_frmts/elastic/ogrelasticdatasource.cpp | 9 +-
ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp | 26 +-
ogr/ogrsf_frmts/generic/ogrlayer.cpp | 6 +-
ogr/ogrsf_frmts/geoconcept/geoconcept.c | 47 +--
ogr/ogrsf_frmts/geoconcept/ogrgeoconceptdriver.cpp | 4 +-
ogr/ogrsf_frmts/geojson/ogr_geojson.h | 5 +-
ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp | 31 +-
ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp | 11 +-
ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h | 4 +-
ogr/ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp | 10 +-
ogr/ogrsf_frmts/geomedia/ogrgeomediadriver.cpp | 8 +-
ogr/ogrsf_frmts/geomedia/ogrgeomedialayer.cpp | 7 +-
ogr/ogrsf_frmts/gft/ogrgftlayer.cpp | 7 +-
ogr/ogrsf_frmts/gml/gmlhandler.cpp | 21 +-
ogr/ogrsf_frmts/gml/hugefileresolver.cpp | 16 +-
ogr/ogrsf_frmts/gmt/ogrgmtlayer.cpp | 8 +-
ogr/ogrsf_frmts/grass/ogrgrassdatasource.cpp | 8 +-
ogr/ogrsf_frmts/ili/ili1reader.cpp | 6 +-
ogr/ogrsf_frmts/ili/ili2handler.cpp | 43 ++-
ogr/ogrsf_frmts/ili/ili2reader.cpp | 20 +-
ogr/ogrsf_frmts/ili/ogrili1datasource.cpp | 14 +-
ogr/ogrsf_frmts/ili/ogrili1layer.cpp | 10 +-
ogr/ogrsf_frmts/ili/ogrili2datasource.cpp | 15 +-
ogr/ogrsf_frmts/ili/ogrili2layer.cpp | 10 +-
ogr/ogrsf_frmts/libkml/ogr_libkml.h | 2 -
ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp | 35 +-
ogr/ogrsf_frmts/libkml/ogrlibkmldriver.cpp | 40 ++-
ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp | 4 +-
ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp | 10 +-
ogr/ogrsf_frmts/mitab/mitab_bounds.cpp | 2 +-
ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 49 +--
ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp | 5 +-
ogr/ogrsf_frmts/mitab/mitab_middatafile.cpp | 3 +-
ogr/ogrsf_frmts/mitab/mitab_miffile.cpp | 6 +-
ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp | 12 +-
ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp | 12 +-
ogr/ogrsf_frmts/mitab/mitab_tabseamless.cpp | 4 +-
.../mssqlspatial/ogrmssqlgeometryvalidator.cpp | 10 +-
.../mssqlspatial/ogrmssqlspatialdatasource.cpp | 179 ++++++----
.../mssqlspatial/ogrmssqlspatialdriver.cpp | 10 +-
.../mssqlspatial/ogrmssqlspatiallayer.cpp | 8 +-
.../mssqlspatial/ogrmssqlspatialselectlayer.cpp | 14 +-
.../mssqlspatial/ogrmssqlspatialtablelayer.cpp | 12 +-
ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp | 20 +-
ogr/ogrsf_frmts/mysql/ogrmysqlresultlayer.cpp | 8 +-
ogr/ogrsf_frmts/mysql/ogrmysqltablelayer.cpp | 26 +-
ogr/ogrsf_frmts/nas/drv_nas.html | 8 +-
ogr/ogrsf_frmts/nas/nashandler.cpp | 21 +-
ogr/ogrsf_frmts/nas/nasreader.cpp | 21 +-
ogr/ogrsf_frmts/nas/nasreaderp.h | 4 +-
ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp | 26 +-
ogr/ogrsf_frmts/nas/ogrnasdriver.cpp | 8 +-
ogr/ogrsf_frmts/oci/ogrocitablelayer.cpp | 15 +-
ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp | 15 +-
ogr/ogrsf_frmts/odbc/ogrodbclayer.cpp | 8 +-
ogr/ogrsf_frmts/ods/ods_formula_node.cpp | 5 +-
ogr/ogrsf_frmts/openair/ogropenairlayer.cpp | 23 +-
ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp | 4 +-
ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h | 10 +-
.../openfilegdb/ogropenfilegdbdatasource.cpp | 158 +++++----
.../openfilegdb/ogropenfilegdblayer.cpp | 6 +-
ogr/ogrsf_frmts/osm/gpb.h | 3 +-
ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp | 7 +-
ogr/ogrsf_frmts/osm/osm_parser.cpp | 5 +-
ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 7 +-
ogr/ogrsf_frmts/pg/ogrpglayer.cpp | 15 +-
ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp | 6 +-
ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp | 10 +-
ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp | 12 +-
ogr/ogrsf_frmts/pgeo/ogrpgeolayer.cpp | 7 +-
ogr/ogrsf_frmts/pgeo/ogrpgeotablelayer.cpp | 7 +-
ogr/ogrsf_frmts/s57/ogrs57layer.cpp | 8 +-
ogr/ogrsf_frmts/s57/s57reader.cpp | 19 +-
ogr/ogrsf_frmts/s57/s57writer.cpp | 32 +-
ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 16 +-
ogr/ogrsf_frmts/shape/shape2ogr.cpp | 11 +-
ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp | 5 +-
ogr/ogrsf_frmts/sqlite/ogrsqliteregexp.cpp | 4 +-
ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp | 23 +-
ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp | 6 +-
ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp | 43 +--
ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp | 49 +--
ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp | 4 +-
ogr/ogrsf_frmts/vfk/vfkdatablocksqlite.cpp | 18 +-
ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp | 37 +-
ogr/ogrsf_frmts/walk/ogrwalkdriver.cpp | 9 +-
ogr/ogrsf_frmts/walk/ogrwalktablelayer.cpp | 3 +-
ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp | 10 +-
ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp | 9 +-
ogr/ogrsf_frmts/xplane/ogr_xplane_apt_reader.cpp | 10 +-
ogr/ogrsf_frmts/xplane/ogr_xplane_nav_reader.cpp | 8 +-
port/cpl_csv.cpp | 34 +-
port/cpl_odbc.cpp | 15 +-
port/cpl_string.cpp | 75 ++--
port/cpl_vsil_curl.cpp | 16 +-
swig/include/gdal_array.i | 10 +-
swig/include/perl/gdal_perl.i | 4 +-
swig/include/python/ogr_python.i | 18 +-
swig/include/python/python_exceptions.i | 16 +-
swig/perl/lib/Geo/GDAL.pm | 4 +-
swig/python/extensions/gdal_array_wrap.cpp | 8 +-
swig/python/extensions/gdal_wrap.cpp | 16 +-
swig/python/extensions/ogr_wrap.cpp | 16 +-
swig/python/extensions/osr_wrap.cpp | 16 +-
swig/python/osgeo/ogr.py | 30 +-
swig/python/setup.py | 2 +-
308 files changed, 3615 insertions(+), 2169 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