[gdal] 01/03: Imported Upstream version 2.0.2~rc2+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Jan 23 19:26:06 UTC 2016
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 5e87a5fa5dbe67d3f46dfb1d344098400d2c9ea2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jan 23 20:23:51 2016 +0100
Imported Upstream version 2.0.2~rc2+dfsg
---
.gitignore | 86 ---------------------------
NEWS | 1 +
apps/ogr2ogr.cpp | 17 +++++-
doxygen_sqlite3.db | Bin 162816 -> 162816 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/ogrsf_frmts/ili/ogrili1layer.cpp | 21 +++++--
42 files changed, 68 insertions(+), 131 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 59559d4..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,86 +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/ogrlineref
-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 424ed9b..62d90b9 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ The 2.0.2 release is a bug fix release.
== Utilities ==
* ogr2ogr: prevent from the gt setting to override transaction group size of 1 set by skipfailures earlier (#2409)
+ * ogr2ogr: fix -skip mode to rollback current transaction in case of failed insertion (#6328)
* gdalmove.py: fix to run with GDAL 2.0 gdal.InvGeoTransform() signature (#6173)
* gdaladdo: emit error message if passed an invalid dataset name (#6240)
* gdalwarp: fix -srcnodata to not put garbage values as target dstnodata (#6315)
diff --git a/apps/ogr2ogr.cpp b/apps/ogr2ogr.cpp
index 6905913..8420b14 100644
--- a/apps/ogr2ogr.cpp
+++ b/apps/ogr2ogr.cpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogr2ogr.cpp 30691 2015-09-24 18:00:57Z tamas $
+ * $Id: ogr2ogr.cpp 33112 2016-01-23 17:09:34Z 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 30691 2015-09-24 18:00:57Z tamas $");
+CPL_CVSID("$Id: ogr2ogr.cpp 33112 2016-01-23 17:09:34Z rouault $");
static int bSkipFailures = FALSE;
static int bLayerTransaction = -1;
@@ -4049,6 +4049,19 @@ int LayerTranslator::Translate( TargetLayerInfo* psInfo,
{
CPLDebug( "OGR2OGR", "Unable to write feature " CPL_FRMT_GIB " into layer %s.\n",
poFeature->GetFID(), poSrcLayer->GetName() );
+ if( nGroupTransactions )
+ {
+ if( bLayerTransaction )
+ {
+ poDstLayer->RollbackTransaction();
+ poDstLayer->StartTransaction();
+ }
+ else
+ {
+ poODS->RollbackTransaction();
+ poODS->StartTransaction(bForceTransaction);
+ }
+ }
}
end_loop:
diff --git a/doxygen_sqlite3.db b/doxygen_sqlite3.db
index 6e05a1a..d1c8b4e 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 24e2281..69b09ed 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 20160123
#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 574d7dc..dd3f8c2 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal-config.1 b/man/man1/gdal-config.1
index 1299619..b56a50d 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal2tiles.1 b/man/man1/gdal2tiles.1
index e7c50f9..d292cf1 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_calc.1 b/man/man1/gdal_calc.1
index d79ac27..ed694aa 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_contour.1 b/man/man1/gdal_contour.1
index 2020139..599fd6a 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_edit.1 b/man/man1/gdal_edit.1
index ad50d4c..4d2ea8f 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_fillnodata.1 b/man/man1/gdal_fillnodata.1
index 2a9fea8..0f683a1 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_grid.1 b/man/man1/gdal_grid.1
index b88f3dd..1a9f065 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_merge.1 b/man/man1/gdal_merge.1
index 277f317..fe8bd67 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_polygonize.1 b/man/man1/gdal_polygonize.1
index 571aaf9..158140a 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_proximity.1 b/man/man1/gdal_proximity.1
index 7df7394..954e21c 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_rasterize.1 b/man/man1/gdal_rasterize.1
index 07f10cc..d85fde9 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_retile.1 b/man/man1/gdal_retile.1
index b939de1..fd9d682 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_sieve.1 b/man/man1/gdal_sieve.1
index b1767b9..624e935 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_translate.1 b/man/man1/gdal_translate.1
index 18fe8a7..7099059 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_utilities.1 b/man/man1/gdal_utilities.1
index e5ef7d3..7ea16ff 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaladdo.1 b/man/man1/gdaladdo.1
index 7910857..be18fee 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalbuildvrt.1 b/man/man1/gdalbuildvrt.1
index c41a55a..bfb6f12 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalcompare.1 b/man/man1/gdalcompare.1
index fb6ec6a..1c8ce6e 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaldem.1 b/man/man1/gdaldem.1
index 80eabe4..32364ff 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalinfo.1 b/man/man1/gdalinfo.1
index 9b6fced..f4275d3 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdallocationinfo.1 b/man/man1/gdallocationinfo.1
index ff616da..6879e8a 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalmanage.1 b/man/man1/gdalmanage.1
index 1e5c52c..e51e05a 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalmove.1 b/man/man1/gdalmove.1
index 005c7ae..f982f66 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalsrsinfo.1 b/man/man1/gdalsrsinfo.1
index c9b17f1..c165950 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaltindex.1 b/man/man1/gdaltindex.1
index dc30546..074afe5 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaltransform.1 b/man/man1/gdaltransform.1
index cba8099..6051763 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalwarp.1 b/man/man1/gdalwarp.1
index 39c1592..e2b657b 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/nearblack.1 b/man/man1/nearblack.1
index 5f87fc6..02e7a6c 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogr2ogr.1 b/man/man1/ogr2ogr.1
index 631665b..54fb4f2 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogr_utilities.1 b/man/man1/ogr_utilities.1
index 84ea685..1075527 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrinfo.1 b/man/man1/ogrinfo.1
index 8e29681..756d8d4 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrlineref.1 b/man/man1/ogrlineref.1
index b90a319..ce636cb 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrtindex.1 b/man/man1/ogrtindex.1
index 84fcb35..3f12fbb 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/pct2rgb.1 b/man/man1/pct2rgb.1
index 2483c06..a1bc9c9 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/rgb2pct.1 b/man/man1/rgb2pct.1
index 9543ca5..8581462 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 "Sat Jan 23 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/ogr/ogrsf_frmts/ili/ogrili1layer.cpp b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp
index 352dc70..76a7ef7 100644
--- a/ogr/ogrsf_frmts/ili/ogrili1layer.cpp
+++ b/ogr/ogrsf_frmts/ili/ogrili1layer.cpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogrili1layer.cpp 33076 2016-01-22 09:45:53Z pka $
+ * $Id: ogrili1layer.cpp 33090 2016-01-22 15:05:44Z pka $
*
* 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 33076 2016-01-22 09:45:53Z pka $");
+CPL_CVSID("$Id: ogrili1layer.cpp 33090 2016-01-22 15:05:44Z pka $");
/************************************************************************/
/* OGRILI1Layer() */
@@ -482,9 +482,13 @@ void OGRILI1Layer::JoinSurfaceLayer( OGRILI1Layer* poSurfaceLineLayer, int nSurf
OGRCurve *ring = 0;
if (surface_lines) {
//SURFACE polygon lines spread over multiple OBJECTs, so we collect curves
- OGRCompoundCurve* ccurve = (OGRCompoundCurve*)line;
- for (int j=0; j<ccurve->getNumCurves(); j++) {
- surface_lines->addCurveDirectly(ccurve->getCurve(j));
+ if (line->getGeometryType() == wkbCompoundCurve) {
+ OGRCompoundCurve* ccurve = (OGRCompoundCurve*)line;
+ for (int j=0; j<ccurve->getNumCurves(); j++) {
+ surface_lines->addCurveDirectly(ccurve->getCurve(j));
+ }
+ } else { // wkbLineString (linearized)
+ surface_lines->addCurve(line);
}
line = surface_lines;
}
@@ -497,7 +501,12 @@ void OGRILI1Layer::JoinSurfaceLayer( OGRILI1Layer* poSurfaceLineLayer, int nSurf
}
if (ring == 0 && surface_lines == 0) {
//SURFACE polygon lines spread over multiple OBJECTs, so we collect curves
- surface_lines = (OGRCompoundCurve*)line->clone();
+ if (line->getGeometryType() == wkbCompoundCurve) {
+ surface_lines = (OGRCompoundCurve*)line->clone();
+ } else { // wkbLineString (linearized)
+ surface_lines = new OGRCompoundCurve();
+ surface_lines->addCurve(line);
+ }
}
if (ring) {
OGRErr error = poly->addRingDirectly(ring);
--
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