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 57e9a62ebb3c6ba245f5ade07b41adc3cda49cc5 Author: Bas Couwenberg <[email protected]> Date: Mon Jan 25 21:33:29 2016 +0100 Imported Upstream version 2.0.2~rc3+dfsg --- NEWS | 2 ++ configure | 6 +++--- configure.in | 8 ++++---- gcore/gdal_version.h | 2 +- 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_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/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/ogrgeometrycollection.cpp | 14 ++++++++++++-- ogr/ogrsf_frmts/ili/ogrili1layer.cpp | 9 ++++++--- ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp | 7 ++++++- 43 files changed, 70 insertions(+), 50 deletions(-) diff --git a/NEWS b/NEWS index 62d90b9..5974025 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,7 @@ The 2.0.2 release is a bug fix release. == Build(Unix) == * Add pkg-config support for libkml fork, in addition to the old detection method. The libkml/libkml fork on GitHub supports pkg-config and no longer includes the third_party libraries. (#6077) * gdalserver.c: Add include of signal.h for SIGPIPE and signal() (#6193) + * fix detection of FreeXL on MinGW/MSYS (#6330) == Port == * CPLGetValueType(): improve heuristics to avoid detecting some WKB strings as real numbers (#6128) @@ -150,6 +151,7 @@ NTF driver: OpenFileGDB driver: * fix min/max on columns without indices (#6150) + * fix import of MultiLineString Z geometries with several parts (#6332) PG driver: * fix memleak in ExecuteSQL() (#6179) diff --git a/configure b/configure index 4ab3303..5dc3234 100755 --- a/configure +++ b/configure @@ -27888,7 +27888,7 @@ fi rm -f testrlist.* echo '#include <freexl.h>' > testfreexl.c echo 'int main(int argc, char** argv) { FreeXL_CellValue s; freexl_get_cell_value (0,0,0,&s); return 0; } ' >> testfreexl.c - if test -z "`${CC} testfreexl.c -c 2>&1`" ; then + if test -z "`${CC} ${CFLAGS} testfreexl.c -c 2>&1`" ; then HAVE_FREEXL=yes LIBS="$FREEXL_LIBS $LIBS" else @@ -28132,13 +28132,13 @@ fi fi - if test "FREEXL_LIBS" != "missing" -a -f "$with_freexl/include/freexl.h" ; then + if test "$FREEXL_LIBS" != "missing" -a -f "$with_freexl/include/freexl.h" ; then # Check that freexl is recent enough rm -f testrlist.* echo '#include <freexl.h>' > testfreexl.c echo 'int main(int argc, char** argv) { FreeXL_CellValue s; freexl_get_cell_value (0,0,0,&s); return 0; } ' >> testfreexl.c - if test -z "`${CC} -I$with_freexl/include testfreexl.c -c 2>&1`" ; then + if test -z "`${CC} ${CFLAGS} -I$with_freexl/include testfreexl.c -c 2>&1`" ; then HAVE_FREEXL=yes LIBS="$FREEXL_LIBS $LIBS" FREEXL_INCLUDE="-I$with_freexl/include" diff --git a/configure.in b/configure.in index a3eadb7..a73a302 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl *************************************************************************** -dnl $Id: configure.in 29336 2015-06-14 17:37:21Z rouault $ +dnl $Id: configure.in 33151 2016-01-24 21:26:46Z rouault $ dnl dnl Project: GDAL dnl Purpose: Configure source file. @@ -3430,7 +3430,7 @@ if test "$with_freexl" = "" -o "$with_freexl" = "yes" ; then rm -f testrlist.* echo '#include <freexl.h>' > testfreexl.c echo 'int main(int argc, char** argv) { FreeXL_CellValue s; freexl_get_cell_value (0,0,0,&s); return 0; } ' >> testfreexl.c - if test -z "`${CC} testfreexl.c -c 2>&1`" ; then + if test -z "`${CC} ${CFLAGS} testfreexl.c -c 2>&1`" ; then HAVE_FREEXL=yes LIBS="$FREEXL_LIBS $LIBS" else @@ -3468,13 +3468,13 @@ elif test "$with_freexl" != "no"; then AC_CHECK_LIB(freexl,freexl_open,FREEXL_LIBS="-L$with_freexl/lib -lfreexl -liconv -lcharset",FREEXL_LIBS=missing,-L$with_freexl/lib -liconv -lcharset) fi - if test "FREEXL_LIBS" != "missing" -a -f "$with_freexl/include/freexl.h" ; then + if test "$FREEXL_LIBS" != "missing" -a -f "$with_freexl/include/freexl.h" ; then # Check that freexl is recent enough rm -f testrlist.* echo '#include <freexl.h>' > testfreexl.c echo 'int main(int argc, char** argv) { FreeXL_CellValue s; freexl_get_cell_value (0,0,0,&s); return 0; } ' >> testfreexl.c - if test -z "`${CC} -I$with_freexl/include testfreexl.c -c 2>&1`" ; then + if test -z "`${CC} ${CFLAGS} -I$with_freexl/include testfreexl.c -c 2>&1`" ; then HAVE_FREEXL=yes LIBS="$FREEXL_LIBS $LIBS" FREEXL_INCLUDE="-I$with_freexl/include" diff --git a/gcore/gdal_version.h b/gcore/gdal_version.h index 69b09ed..ad8d34c 100644 --- a/gcore/gdal_version.h +++ b/gcore/gdal_version.h @@ -22,7 +22,7 @@ #endif #ifndef GDAL_RELEASE_DATE -# define GDAL_RELEASE_DATE 20160123 +# define GDAL_RELEASE_DATE 20160125 #endif #ifndef GDAL_RELEASE_NAME # define GDAL_RELEASE_NAME "2.0.2" diff --git a/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 b/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 index dd3f8c2..587cf72 100644 --- a/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 +++ b/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 @@ -1,4 +1,4 @@ -.TH "apps Directory Reference" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "apps Directory Reference" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal-config.1 b/man/man1/gdal-config.1 index b56a50d..87bc3d1 100644 --- a/man/man1/gdal-config.1 +++ b/man/man1/gdal-config.1 @@ -1,4 +1,4 @@ -.TH "gdal-config" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal-config" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal2tiles.1 b/man/man1/gdal2tiles.1 index d292cf1..06e590e 100644 --- a/man/man1/gdal2tiles.1 +++ b/man/man1/gdal2tiles.1 @@ -1,4 +1,4 @@ -.TH "gdal2tiles" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal2tiles" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_calc.1 b/man/man1/gdal_calc.1 index ed694aa..76609cc 100644 --- a/man/man1/gdal_calc.1 +++ b/man/man1/gdal_calc.1 @@ -1,4 +1,4 @@ -.TH "gdal_calc" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_calc" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_contour.1 b/man/man1/gdal_contour.1 index 599fd6a..1ad5b19 100644 --- a/man/man1/gdal_contour.1 +++ b/man/man1/gdal_contour.1 @@ -1,4 +1,4 @@ -.TH "gdal_contour" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_contour" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_edit.1 b/man/man1/gdal_edit.1 index 4d2ea8f..ebd4548 100644 --- a/man/man1/gdal_edit.1 +++ b/man/man1/gdal_edit.1 @@ -1,4 +1,4 @@ -.TH "gdal_edit" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_edit" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_fillnodata.1 b/man/man1/gdal_fillnodata.1 index 0f683a1..2a0d8f3 100644 --- a/man/man1/gdal_fillnodata.1 +++ b/man/man1/gdal_fillnodata.1 @@ -1,4 +1,4 @@ -.TH "gdal_fillnodata" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_fillnodata" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_grid.1 b/man/man1/gdal_grid.1 index 1a9f065..268bb00 100644 --- a/man/man1/gdal_grid.1 +++ b/man/man1/gdal_grid.1 @@ -1,4 +1,4 @@ -.TH "gdal_grid" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_grid" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_merge.1 b/man/man1/gdal_merge.1 index fe8bd67..20f5958 100644 --- a/man/man1/gdal_merge.1 +++ b/man/man1/gdal_merge.1 @@ -1,4 +1,4 @@ -.TH "gdal_merge" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_merge" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_polygonize.1 b/man/man1/gdal_polygonize.1 index 158140a..7666e94 100644 --- a/man/man1/gdal_polygonize.1 +++ b/man/man1/gdal_polygonize.1 @@ -1,4 +1,4 @@ -.TH "gdal_polygonize" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_polygonize" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_proximity.1 b/man/man1/gdal_proximity.1 index 954e21c..fe83e8f 100644 --- a/man/man1/gdal_proximity.1 +++ b/man/man1/gdal_proximity.1 @@ -1,4 +1,4 @@ -.TH "gdal_proximity" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_proximity" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_rasterize.1 b/man/man1/gdal_rasterize.1 index d85fde9..695ae17 100644 --- a/man/man1/gdal_rasterize.1 +++ b/man/man1/gdal_rasterize.1 @@ -1,4 +1,4 @@ -.TH "gdal_rasterize" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_rasterize" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_retile.1 b/man/man1/gdal_retile.1 index fd9d682..cad8680 100644 --- a/man/man1/gdal_retile.1 +++ b/man/man1/gdal_retile.1 @@ -1,4 +1,4 @@ -.TH "gdal_retile" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_retile" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_sieve.1 b/man/man1/gdal_sieve.1 index 624e935..502d45a 100644 --- a/man/man1/gdal_sieve.1 +++ b/man/man1/gdal_sieve.1 @@ -1,4 +1,4 @@ -.TH "gdal_sieve" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_sieve" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_translate.1 b/man/man1/gdal_translate.1 index 7099059..70c6e67 100644 --- a/man/man1/gdal_translate.1 +++ b/man/man1/gdal_translate.1 @@ -1,4 +1,4 @@ -.TH "gdal_translate" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_translate" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdal_utilities.1 b/man/man1/gdal_utilities.1 index 7ea16ff..3afeb73 100644 --- a/man/man1/gdal_utilities.1 +++ b/man/man1/gdal_utilities.1 @@ -1,4 +1,4 @@ -.TH "gdal_utilities" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdal_utilities" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaladdo.1 b/man/man1/gdaladdo.1 index be18fee..62cd78f 100644 --- a/man/man1/gdaladdo.1 +++ b/man/man1/gdaladdo.1 @@ -1,4 +1,4 @@ -.TH "gdaladdo" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdaladdo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalbuildvrt.1 b/man/man1/gdalbuildvrt.1 index bfb6f12..873c220 100644 --- a/man/man1/gdalbuildvrt.1 +++ b/man/man1/gdalbuildvrt.1 @@ -1,4 +1,4 @@ -.TH "gdalbuildvrt" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalbuildvrt" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalcompare.1 b/man/man1/gdalcompare.1 index 1c8ce6e..c038bab 100644 --- a/man/man1/gdalcompare.1 +++ b/man/man1/gdalcompare.1 @@ -1,4 +1,4 @@ -.TH "gdalcompare" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalcompare" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaldem.1 b/man/man1/gdaldem.1 index 32364ff..7edf345 100644 --- a/man/man1/gdaldem.1 +++ b/man/man1/gdaldem.1 @@ -1,4 +1,4 @@ -.TH "gdaldem" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdaldem" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalinfo.1 b/man/man1/gdalinfo.1 index f4275d3..eff606b 100644 --- a/man/man1/gdalinfo.1 +++ b/man/man1/gdalinfo.1 @@ -1,4 +1,4 @@ -.TH "gdalinfo" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdallocationinfo.1 b/man/man1/gdallocationinfo.1 index 6879e8a..d200e68 100644 --- a/man/man1/gdallocationinfo.1 +++ b/man/man1/gdallocationinfo.1 @@ -1,4 +1,4 @@ -.TH "gdallocationinfo" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdallocationinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalmanage.1 b/man/man1/gdalmanage.1 index e51e05a..6050dae 100644 --- a/man/man1/gdalmanage.1 +++ b/man/man1/gdalmanage.1 @@ -1,4 +1,4 @@ -.TH "gdalmanage" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalmanage" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalmove.1 b/man/man1/gdalmove.1 index f982f66..c72f20d 100644 --- a/man/man1/gdalmove.1 +++ b/man/man1/gdalmove.1 @@ -1,4 +1,4 @@ -.TH "gdalmove" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalmove" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalsrsinfo.1 b/man/man1/gdalsrsinfo.1 index c165950..fa8ca49 100644 --- a/man/man1/gdalsrsinfo.1 +++ b/man/man1/gdalsrsinfo.1 @@ -1,4 +1,4 @@ -.TH "gdalsrsinfo" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalsrsinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaltindex.1 b/man/man1/gdaltindex.1 index 074afe5..c1f97e9 100644 --- a/man/man1/gdaltindex.1 +++ b/man/man1/gdaltindex.1 @@ -1,4 +1,4 @@ -.TH "gdaltindex" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdaltindex" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdaltransform.1 b/man/man1/gdaltransform.1 index 6051763..cfb0dce 100644 --- a/man/man1/gdaltransform.1 +++ b/man/man1/gdaltransform.1 @@ -1,4 +1,4 @@ -.TH "gdaltransform" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdaltransform" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/gdalwarp.1 b/man/man1/gdalwarp.1 index e2b657b..f0bda2d 100644 --- a/man/man1/gdalwarp.1 +++ b/man/man1/gdalwarp.1 @@ -1,4 +1,4 @@ -.TH "gdalwarp" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "gdalwarp" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/nearblack.1 b/man/man1/nearblack.1 index 02e7a6c..267bb65 100644 --- a/man/man1/nearblack.1 +++ b/man/man1/nearblack.1 @@ -1,4 +1,4 @@ -.TH "nearblack" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "nearblack" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogr2ogr.1 b/man/man1/ogr2ogr.1 index 54fb4f2..5ee727a 100644 --- a/man/man1/ogr2ogr.1 +++ b/man/man1/ogr2ogr.1 @@ -1,4 +1,4 @@ -.TH "ogr2ogr" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "ogr2ogr" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogr_utilities.1 b/man/man1/ogr_utilities.1 index 1075527..18168b0 100644 --- a/man/man1/ogr_utilities.1 +++ b/man/man1/ogr_utilities.1 @@ -1,4 +1,4 @@ -.TH "ogr_utilities" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "ogr_utilities" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogrinfo.1 b/man/man1/ogrinfo.1 index 756d8d4..1a30c95 100644 --- a/man/man1/ogrinfo.1 +++ b/man/man1/ogrinfo.1 @@ -1,4 +1,4 @@ -.TH "ogrinfo" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "ogrinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogrlineref.1 b/man/man1/ogrlineref.1 index ce636cb..136098c 100644 --- a/man/man1/ogrlineref.1 +++ b/man/man1/ogrlineref.1 @@ -1,4 +1,4 @@ -.TH "ogrlineref" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "ogrlineref" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/ogrtindex.1 b/man/man1/ogrtindex.1 index 3f12fbb..09ba281 100644 --- a/man/man1/ogrtindex.1 +++ b/man/man1/ogrtindex.1 @@ -1,4 +1,4 @@ -.TH "ogrtindex" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "ogrtindex" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/pct2rgb.1 b/man/man1/pct2rgb.1 index a1bc9c9..8235ba9 100644 --- a/man/man1/pct2rgb.1 +++ b/man/man1/pct2rgb.1 @@ -1,4 +1,4 @@ -.TH "pct2rgb" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "pct2rgb" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/man/man1/rgb2pct.1 b/man/man1/rgb2pct.1 index 8581462..2ce9a33 100644 --- a/man/man1/rgb2pct.1 +++ b/man/man1/rgb2pct.1 @@ -1,4 +1,4 @@ -.TH "rgb2pct" 1 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*- +.TH "rgb2pct" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/ogr/ogrgeometrycollection.cpp b/ogr/ogrgeometrycollection.cpp index d629a53..0ef02ae 100644 --- a/ogr/ogrgeometrycollection.cpp +++ b/ogr/ogrgeometrycollection.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: ogrgeometrycollection.cpp 29330 2015-06-14 12:11:11Z rouault $ + * $Id: ogrgeometrycollection.cpp 33153 2016-01-25 12:45:47Z rouault $ * * Project: OpenGIS Simple Features Reference Implementation * Purpose: The OGRGeometryCollection class. @@ -32,7 +32,7 @@ #include "ogr_p.h" #include "ogr_api.h" -CPL_CVSID("$Id: ogrgeometrycollection.cpp 29330 2015-06-14 12:11:11Z rouault $"); +CPL_CVSID("$Id: ogrgeometrycollection.cpp 33153 2016-01-25 12:45:47Z rouault $"); /************************************************************************/ /* OGRGeometryCollection() */ @@ -562,6 +562,16 @@ OGRErr OGRGeometryCollection::exportToWkb( OGRwkbByteOrder eByteOrder, for( int iGeom = 0; iGeom < nGeomCount; iGeom++ ) { papoGeoms[iGeom]->exportToWkb( eByteOrder, pabyData + nOffset, eWkbVariant ); + // Should normally not happen if everyone else does its job + // but has happened sometimes (#6332) + if( papoGeoms[iGeom]->getCoordinateDimension() != getCoordinateDimension() ) + { + CPLError( CE_Warning, CPLE_AppDefined, + "Sub-geometry %d has coordinate dimension %d, but container has %d", + iGeom, + papoGeoms[iGeom]->getCoordinateDimension(), + getCoordinateDimension() ); + } nOffset += papoGeoms[iGeom]->WkbSize(); } diff --git a/ogr/ogrsf_frmts/ili/ogrili1layer.cpp b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp index 76a7ef7..bebe707 100644 --- a/ogr/ogrsf_frmts/ili/ogrili1layer.cpp +++ b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: ogrili1layer.cpp 33090 2016-01-22 15:05:44Z pka $ + * $Id: ogrili1layer.cpp 33156 2016-01-25 12:53:04Z rouault $ * * Project: Interlis 1 Translator * Purpose: Implements OGRILI1Layer class. @@ -33,7 +33,7 @@ #include "cpl_string.h" #include "ogr_geos.h" -CPL_CVSID("$Id: ogrili1layer.cpp 33090 2016-01-22 15:05:44Z pka $"); +CPL_CVSID("$Id: ogrili1layer.cpp 33156 2016-01-25 12:53:04Z rouault $"); /************************************************************************/ /* OGRILI1Layer() */ @@ -507,13 +507,16 @@ void OGRILI1Layer::JoinSurfaceLayer( OGRILI1Layer* poSurfaceLineLayer, int nSurf surface_lines = new OGRCompoundCurve(); surface_lines->addCurve(line); } + if( line == surface_lines ) { + delete surface_lines; + surface_lines = NULL; + } } if (ring) { OGRErr error = poly->addRingDirectly(ring); if (error != OGRERR_NONE) { CPLError(CE_Warning, CPLE_AppDefined, "Added geometry: %s", ring->exportToJson() ); } - surface_lines = 0; } } } else { diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp index bd9fb5f..ceb004c 100644 --- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp +++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: filegdbtable.cpp 29330 2015-06-14 12:11:11Z rouault $ + * $Id: filegdbtable.cpp 33153 2016-01-25 12:45:47Z rouault $ * * Project: OpenGIS Simple Features Reference Implementation * Purpose: Implements reading of FileGDB tables @@ -2427,7 +2427,11 @@ OGRGeometry* FileGDBOGRGeometryConverterImpl::GetAsGeometry(const OGRField* psFi OGRMultiLineString* poMLS = NULL; FileGDBOGRLineString* poLS = NULL; if( nParts > 1 ) + { poMLS = new OGRMultiLineString(); + if( bHasZ ) + poMLS->setCoordinateDimension(3); + } dx = dy = dz = 0; for(i=0;i<nParts;i++) @@ -2680,6 +2684,7 @@ OGRGeometry* FileGDBOGRGeometryConverterImpl::GetAsGeometry(const OGRField* psFi } OGRMultiPolygon* poMP = new OGRMultiPolygon(); + poMP->setCoordinateDimension(3); OGRPolygon* poLastPoly = NULL; int iAccPoints = 0; for(i=0;i<nParts;i++) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
