This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository gdal.
commit 0b11a644ab1b43b741b068100b15fd5c38788545 Author: Bas Couwenberg <[email protected]> Date: Mon Jan 25 19:04:54 2016 +0100 Imported Upstream version 1.11.4~rc2+dfsg --- .gitignore | 85 --------------------------- NEWS | 1 + apps/ogr2ogr.cpp | 9 ++- doxygen_sqlite3.db | Bin 150528 -> 150528 bytes 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/openfilegdb/filegdbtable.cpp | 7 ++- 43 files changed, 63 insertions(+), 127 deletions(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 5f7e984..0000000 --- a/.gitignore +++ /dev/null @@ -1,85 +0,0 @@ -GDALmake.opt -autom4te.cache -detectavx.dSYM -detectsse.dSYM -gdal.pc -config.log -config.status -libtool -cpl_config.h -*.o -*.res -*.obj -*.lib -*.exe -*.exe.manifest -*.dll -*.pdb -*.idb -*.ilk -*.dll.manifest -*.exp -*.lo -*.la -.libs -*.pyc -frmts/jpeg/libjpeg12/*.c -frmts/jpeg/libjpeg12/*.h -libgdal.a -libgdal.so -libgdal.so.* -apps/gdal-config -apps/gdal-config-inst -apps/gdal_contour -apps/gdal_grid -apps/gdal_rasterize -apps/gdal_translate -apps/gdaladdo -apps/gdalbuildvrt -apps/gdaldem -apps/gdalenhance -apps/gdalinfo -apps/gdallocationinfo -apps/gdalmanage -apps/gdalsrsinfo -apps/gdaltindex -apps/gdaltransform -apps/gdalwarp -apps/nearblack -apps/ogr2ogr -apps/ogrinfo -apps/ogrtindex -apps/testepsg -apps/gdalserver -apps/test_ogrsf -swig/java/build -swig/java/gdal.jar -swig/java/gdal_wrap.cpp -swig/java/gdalconst_wrap.c -swig/java/libgdalconstjni.so -swig/java/libgdaljni.so -swig/java/libogrjni.so -swig/java/libosrjni.so -swig/java/ogr_wrap.cpp -swig/java/org/ -swig/java/osr_wrap.cpp -swig/python/build -swig/perl/Const.bs -swig/perl/GDAL.bs -swig/perl/Makefile_Geo__GDAL -swig/perl/Makefile_Geo__GDAL__Const -swig/perl/Makefile_Geo__OGR -swig/perl/Makefile_Geo__OSR -swig/perl/OGR.bs -swig/perl/OSR.bs -swig/perl/blib/ -swig/perl/lib/Geo/GDAL/*.pm -swig/perl/lib/Geo/*.pm -swig/perl/gdal_wrap.cpp -swig/perl/gdalconst_wrap.c -swig/perl/ogr_wrap.cpp -swig/perl/osr_wrap.cpp -swig/perl/pm_to_blib -man/ -html/ -nmake.local diff --git a/NEWS b/NEWS index eaae5f7..6809616 100644 --- a/NEWS +++ b/NEWS @@ -87,6 +87,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 creation of multiple geometry fields with SCHEMA creation option (#6141) diff --git a/apps/ogr2ogr.cpp b/apps/ogr2ogr.cpp index 8dabaf2..a0f388c 100644 --- a/apps/ogr2ogr.cpp +++ b/apps/ogr2ogr.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: ogr2ogr.cpp 30692 2015-09-24 18:01:28Z tamas $ + * $Id: ogr2ogr.cpp 33113 2016-01-23 17:10:20Z rouault $ * * Project: OpenGIS Simple Features Reference Implementation * Purpose: Simple client for translating between formats. @@ -39,7 +39,7 @@ #include <map> #include <vector> -CPL_CVSID("$Id: ogr2ogr.cpp 30692 2015-09-24 18:01:28Z tamas $"); +CPL_CVSID("$Id: ogr2ogr.cpp 33113 2016-01-23 17:10:20Z rouault $"); static int bSkipFailures = FALSE; static int nGroupTransactions = 20000; @@ -3592,6 +3592,11 @@ static int TranslateLayer( TargetLayerInfo* psInfo, { CPLDebug( "OGR2OGR", "Unable to write feature %ld into layer %s.\n", poFeature->GetFID(), poSrcLayer->GetName() ); + if( nGroupTransactions ) + { + poDstLayer->RollbackTransaction(); + poDstLayer->StartTransaction(); + } } end_loop: diff --git a/doxygen_sqlite3.db b/doxygen_sqlite3.db index eb0baaa..7bee0e9 100644 Binary files a/doxygen_sqlite3.db and b/doxygen_sqlite3.db differ diff --git a/gcore/gdal_version.h b/gcore/gdal_version.h index d4f7d81..d9882f7 100644 --- a/gcore/gdal_version.h +++ b/gcore/gdal_version.h @@ -22,7 +22,7 @@ #endif #ifndef GDAL_RELEASE_DATE -# define GDAL_RELEASE_DATE 20160122 +# define GDAL_RELEASE_DATE 20160125 #endif #ifndef GDAL_RELEASE_NAME # define GDAL_RELEASE_NAME "1.11.4" diff --git a/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 b/man/man1/_home_rouault_dist_wrk_gdal_apps_.1 index 574d7dc..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 "Fri Jan 22 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 1299619..87bc3d1 100644 --- a/man/man1/gdal-config.1 +++ b/man/man1/gdal-config.1 @@ -1,4 +1,4 @@ -.TH "gdal-config" 1 "Fri Jan 22 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 e7c50f9..06e590e 100644 --- a/man/man1/gdal2tiles.1 +++ b/man/man1/gdal2tiles.1 @@ -1,4 +1,4 @@ -.TH "gdal2tiles" 1 "Fri Jan 22 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 9d8e099..2def1c2 100644 --- a/man/man1/gdal_calc.1 +++ b/man/man1/gdal_calc.1 @@ -1,4 +1,4 @@ -.TH "gdal_calc" 1 "Fri Jan 22 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 2020139..1ad5b19 100644 --- a/man/man1/gdal_contour.1 +++ b/man/man1/gdal_contour.1 @@ -1,4 +1,4 @@ -.TH "gdal_contour" 1 "Fri Jan 22 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 927ef1f..1ccd1e0 100644 --- a/man/man1/gdal_edit.1 +++ b/man/man1/gdal_edit.1 @@ -1,4 +1,4 @@ -.TH "gdal_edit" 1 "Fri Jan 22 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 f1c0d64..2c84c29 100644 --- a/man/man1/gdal_fillnodata.1 +++ b/man/man1/gdal_fillnodata.1 @@ -1,4 +1,4 @@ -.TH "gdal_fillnodata" 1 "Fri Jan 22 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 b88f3dd..268bb00 100644 --- a/man/man1/gdal_grid.1 +++ b/man/man1/gdal_grid.1 @@ -1,4 +1,4 @@ -.TH "gdal_grid" 1 "Fri Jan 22 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 2c94cff..d3c67a9 100644 --- a/man/man1/gdal_merge.1 +++ b/man/man1/gdal_merge.1 @@ -1,4 +1,4 @@ -.TH "gdal_merge" 1 "Fri Jan 22 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 a7996a9..9954732 100644 --- a/man/man1/gdal_polygonize.1 +++ b/man/man1/gdal_polygonize.1 @@ -1,4 +1,4 @@ -.TH "gdal_polygonize" 1 "Fri Jan 22 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 cf7f31a..99d2404 100644 --- a/man/man1/gdal_proximity.1 +++ b/man/man1/gdal_proximity.1 @@ -1,4 +1,4 @@ -.TH "gdal_proximity" 1 "Fri Jan 22 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 53b0502..52d6fc6 100644 --- a/man/man1/gdal_rasterize.1 +++ b/man/man1/gdal_rasterize.1 @@ -1,4 +1,4 @@ -.TH "gdal_rasterize" 1 "Fri Jan 22 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 b939de1..cad8680 100644 --- a/man/man1/gdal_retile.1 +++ b/man/man1/gdal_retile.1 @@ -1,4 +1,4 @@ -.TH "gdal_retile" 1 "Fri Jan 22 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 b31c37d..7baeb0a 100644 --- a/man/man1/gdal_sieve.1 +++ b/man/man1/gdal_sieve.1 @@ -1,4 +1,4 @@ -.TH "gdal_sieve" 1 "Fri Jan 22 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 5067fa2..c0f534b 100644 --- a/man/man1/gdal_translate.1 +++ b/man/man1/gdal_translate.1 @@ -1,4 +1,4 @@ -.TH "gdal_translate" 1 "Fri Jan 22 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 295642f..7b8b0f2 100644 --- a/man/man1/gdal_utilities.1 +++ b/man/man1/gdal_utilities.1 @@ -1,4 +1,4 @@ -.TH "gdal_utilities" 1 "Fri Jan 22 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 71ff871..fe195cc 100644 --- a/man/man1/gdaladdo.1 +++ b/man/man1/gdaladdo.1 @@ -1,4 +1,4 @@ -.TH "gdaladdo" 1 "Fri Jan 22 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 3f92de0..4116259 100644 --- a/man/man1/gdalbuildvrt.1 +++ b/man/man1/gdalbuildvrt.1 @@ -1,4 +1,4 @@ -.TH "gdalbuildvrt" 1 "Fri Jan 22 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 fb6ec6a..c038bab 100644 --- a/man/man1/gdalcompare.1 +++ b/man/man1/gdalcompare.1 @@ -1,4 +1,4 @@ -.TH "gdalcompare" 1 "Fri Jan 22 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 80eabe4..7edf345 100644 --- a/man/man1/gdaldem.1 +++ b/man/man1/gdaldem.1 @@ -1,4 +1,4 @@ -.TH "gdaldem" 1 "Fri Jan 22 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 f146b7c..dee41c5 100644 --- a/man/man1/gdalinfo.1 +++ b/man/man1/gdalinfo.1 @@ -1,4 +1,4 @@ -.TH "gdalinfo" 1 "Fri Jan 22 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 d5ab332..78700a9 100644 --- a/man/man1/gdallocationinfo.1 +++ b/man/man1/gdallocationinfo.1 @@ -1,4 +1,4 @@ -.TH "gdallocationinfo" 1 "Fri Jan 22 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 1e5c52c..6050dae 100644 --- a/man/man1/gdalmanage.1 +++ b/man/man1/gdalmanage.1 @@ -1,4 +1,4 @@ -.TH "gdalmanage" 1 "Fri Jan 22 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 005c7ae..c72f20d 100644 --- a/man/man1/gdalmove.1 +++ b/man/man1/gdalmove.1 @@ -1,4 +1,4 @@ -.TH "gdalmove" 1 "Fri Jan 22 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 c9b17f1..fa8ca49 100644 --- a/man/man1/gdalsrsinfo.1 +++ b/man/man1/gdalsrsinfo.1 @@ -1,4 +1,4 @@ -.TH "gdalsrsinfo" 1 "Fri Jan 22 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 dc30546..c1f97e9 100644 --- a/man/man1/gdaltindex.1 +++ b/man/man1/gdaltindex.1 @@ -1,4 +1,4 @@ -.TH "gdaltindex" 1 "Fri Jan 22 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 9ea6565..dcd3590 100644 --- a/man/man1/gdaltransform.1 +++ b/man/man1/gdaltransform.1 @@ -1,4 +1,4 @@ -.TH "gdaltransform" 1 "Fri Jan 22 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 18e83ed..4efd875 100644 --- a/man/man1/gdalwarp.1 +++ b/man/man1/gdalwarp.1 @@ -1,4 +1,4 @@ -.TH "gdalwarp" 1 "Fri Jan 22 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 5f87fc6..267bb65 100644 --- a/man/man1/nearblack.1 +++ b/man/man1/nearblack.1 @@ -1,4 +1,4 @@ -.TH "nearblack" 1 "Fri Jan 22 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 04419c4..e1bca66 100644 --- a/man/man1/ogr2ogr.1 +++ b/man/man1/ogr2ogr.1 @@ -1,4 +1,4 @@ -.TH "ogr2ogr" 1 "Fri Jan 22 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 15c8f5f..eed7185 100644 --- a/man/man1/ogr_utilities.1 +++ b/man/man1/ogr_utilities.1 @@ -1,4 +1,4 @@ -.TH "ogr_utilities" 1 "Fri Jan 22 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 3cdf946..b7ebce7 100644 --- a/man/man1/ogrinfo.1 +++ b/man/man1/ogrinfo.1 @@ -1,4 +1,4 @@ -.TH "ogrinfo" 1 "Fri Jan 22 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 d64dda9..17d7208 100644 --- a/man/man1/ogrlineref.1 +++ b/man/man1/ogrlineref.1 @@ -1,4 +1,4 @@ -.TH "ogrlineref" 1 "Fri Jan 22 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 f581351..a452bd5 100644 --- a/man/man1/ogrtindex.1 +++ b/man/man1/ogrtindex.1 @@ -1,4 +1,4 @@ -.TH "ogrtindex" 1 "Fri Jan 22 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 2483c06..8235ba9 100644 --- a/man/man1/pct2rgb.1 +++ b/man/man1/pct2rgb.1 @@ -1,4 +1,4 @@ -.TH "pct2rgb" 1 "Fri Jan 22 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 9543ca5..2ce9a33 100644 --- a/man/man1/rgb2pct.1 +++ b/man/man1/rgb2pct.1 @@ -1,4 +1,4 @@ -.TH "rgb2pct" 1 "Fri Jan 22 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 57a1233..dd18a6b 100644 --- a/ogr/ogrgeometrycollection.cpp +++ b/ogr/ogrgeometrycollection.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: ogrgeometrycollection.cpp 27610 2014-08-27 15:47:43Z rouault $ + * $Id: ogrgeometrycollection.cpp 33154 2016-01-25 12:46:47Z rouault $ * * Project: OpenGIS Simple Features Reference Implementation * Purpose: The OGRGeometryCollection class. @@ -31,7 +31,7 @@ #include "ogr_geometry.h" #include "ogr_p.h" -CPL_CVSID("$Id: ogrgeometrycollection.cpp 27610 2014-08-27 15:47:43Z rouault $"); +CPL_CVSID("$Id: ogrgeometrycollection.cpp 33154 2016-01-25 12:46:47Z rouault $"); /************************************************************************/ /* OGRGeometryCollection() */ @@ -594,6 +594,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/openfilegdb/filegdbtable.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp index 2c0fabb..16d7bd3 100644 --- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp +++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp @@ -1,5 +1,5 @@ /****************************************************************************** - * $Id: filegdbtable.cpp 27727 2014-09-23 18:41:36Z rouault $ + * $Id: filegdbtable.cpp 33154 2016-01-25 12:46:47Z rouault $ * * Project: OpenGIS Simple Features Reference Implementation * Purpose: Implements reading of FileGDB tables @@ -2239,7 +2239,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++) @@ -2492,6 +2496,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
