[gdal] 01/04: Imported Upstream version 2.1.2~rc3+dfsg
Bas Couwenberg
sebastic at debian.org
Fri Oct 21 11:05:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.1
in repository gdal.
commit 78b34716ab3fbffbed57cbb687aec7470e24fcb9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 21 11:48:09 2016 +0200
Imported Upstream version 2.1.2~rc3+dfsg
---
NEWS | 9 ++++-----
gcore/gdal_version.h | 4 ++--
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_pansharpen.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/gnm_utilities.1 | 2 +-
man/man1/gnmanalyse.1 | 2 +-
man/man1/gnmmanage.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/osm/ogrosmlayer.cpp | 9 +++++----
42 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/NEWS b/NEWS
index 5f58206..0f40882 100644
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,6 @@ The 2.1.2 release is a bug fix release.
* Fix regression in PLScenes V1 raster random access. Add a CPL_VSIL_CURL_ALLOWED_FILENAME config option to solve that (fixes #6691)
* /vsimem/: fix potential crash when closing -different- handles pointing to the same file from different threads (fixes #6683)
-== GDAL algorithms ==
-
== GDAL Core ==
* Nodata comparison: fix test when nodata is FLT_MIN or DBL_MIN (#6578)
* External overview: fix incorrect overview building when generating from greater
@@ -87,8 +85,6 @@ VRT driver:
* VRTComplexSource: do temp computations on double to avoid precision issues
when band data type is Int32/UInt32/CInt32/Float64/CFloat64 (#6642)
-== OGR core ==
-
== OGR utilities ==
* GDALVectorTranslate(): imply update mode if access mode not explicitly
specified and hDstDS != NULL (#6612)
@@ -136,6 +132,9 @@ NAS driver:
OCI driver:
* 3 new options: MULTI_LOAD, MULTI_LOAD_COUNT, FIRST_ID (#6606)
+OSM driver:
+* fix issue garbage content when laundering tag name with column (https://github.com/OSGeo/gdal/pull/161)
+
PG driver:
* fix errors caused by missing geometry_columns/spatial_ref_sys tables in non
PostGIS databases, that prevent reading more than 500 features (http://hub.qgis.org/issues/10904)
@@ -150,7 +149,7 @@ S57 driver:
Shapefile driver:
* change REPACK implementation on Windows to be robust to remaining file
- descriptors openend on the .shp/.shx/.dbf (#6672)
+ descriptors opened on the .shp/.shx/.dbf (#6672)
SQLite driver:
* do not emit error when running ExecuteSQL() with a spatial filter on an
diff --git a/gcore/gdal_version.h b/gcore/gdal_version.h
index ff5648f..b667de0 100644
--- a/gcore/gdal_version.h
+++ b/gcore/gdal_version.h
@@ -10,7 +10,7 @@
# define GDAL_VERSION_BUILD 0
#endif
-/* GDAL_COMPUTE_VERSION macro introduced in GDAL 1.10 */
+ /* GDAL_COMPUTE_VERSION macro introduced in GDAL 1.10 */
/* Must be used ONLY to compare with version numbers for GDAL >= 1.10 */
#ifndef GDAL_COMPUTE_VERSION
#define GDAL_COMPUTE_VERSION(maj,min,rev) ((maj)*1000000+(min)*10000+(rev)*100)
@@ -22,7 +22,7 @@
#endif
#ifndef GDAL_RELEASE_DATE
-# define GDAL_RELEASE_DATE 20161020
+# define GDAL_RELEASE_DATE 20161021
#endif
#ifndef GDAL_RELEASE_NAME
# define GDAL_RELEASE_NAME "2.1.2"
diff --git a/man/man1/gdal-config.1 b/man/man1/gdal-config.1
index ca84e5f..68d3c4a 100644
--- a/man/man1/gdal-config.1
+++ b/man/man1/gdal-config.1
@@ -1,4 +1,4 @@
-.TH "gdal-config" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal-config" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal2tiles.1 b/man/man1/gdal2tiles.1
index 7a580f3..c85691b 100644
--- a/man/man1/gdal2tiles.1
+++ b/man/man1/gdal2tiles.1
@@ -1,4 +1,4 @@
-.TH "gdal2tiles" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal2tiles" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_calc.1 b/man/man1/gdal_calc.1
index 1bd4dc3..8d438ae 100644
--- a/man/man1/gdal_calc.1
+++ b/man/man1/gdal_calc.1
@@ -1,4 +1,4 @@
-.TH "gdal_calc" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_calc" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_contour.1 b/man/man1/gdal_contour.1
index f5d457c..692a09b 100644
--- a/man/man1/gdal_contour.1
+++ b/man/man1/gdal_contour.1
@@ -1,4 +1,4 @@
-.TH "gdal_contour" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_contour" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_edit.1 b/man/man1/gdal_edit.1
index c4cb016..cccbea0 100644
--- a/man/man1/gdal_edit.1
+++ b/man/man1/gdal_edit.1
@@ -1,4 +1,4 @@
-.TH "gdal_edit" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_edit" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_fillnodata.1 b/man/man1/gdal_fillnodata.1
index b06ae01..36b88d7 100644
--- a/man/man1/gdal_fillnodata.1
+++ b/man/man1/gdal_fillnodata.1
@@ -1,4 +1,4 @@
-.TH "gdal_fillnodata" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_fillnodata" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_grid.1 b/man/man1/gdal_grid.1
index dcbd326..9f82686 100644
--- a/man/man1/gdal_grid.1
+++ b/man/man1/gdal_grid.1
@@ -1,4 +1,4 @@
-.TH "gdal_grid" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_grid" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_merge.1 b/man/man1/gdal_merge.1
index f797f2f..2a9e8b0 100644
--- a/man/man1/gdal_merge.1
+++ b/man/man1/gdal_merge.1
@@ -1,4 +1,4 @@
-.TH "gdal_merge" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_merge" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_pansharpen.1 b/man/man1/gdal_pansharpen.1
index bab83a7..c8b6501 100644
--- a/man/man1/gdal_pansharpen.1
+++ b/man/man1/gdal_pansharpen.1
@@ -1,4 +1,4 @@
-.TH "gdal_pansharpen" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_pansharpen" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_polygonize.1 b/man/man1/gdal_polygonize.1
index 64c79d0..f013332 100644
--- a/man/man1/gdal_polygonize.1
+++ b/man/man1/gdal_polygonize.1
@@ -1,4 +1,4 @@
-.TH "gdal_polygonize" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_polygonize" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_proximity.1 b/man/man1/gdal_proximity.1
index 71248bc..b936711 100644
--- a/man/man1/gdal_proximity.1
+++ b/man/man1/gdal_proximity.1
@@ -1,4 +1,4 @@
-.TH "gdal_proximity" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_proximity" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_rasterize.1 b/man/man1/gdal_rasterize.1
index f45884c..ba5969b 100644
--- a/man/man1/gdal_rasterize.1
+++ b/man/man1/gdal_rasterize.1
@@ -1,4 +1,4 @@
-.TH "gdal_rasterize" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_rasterize" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_retile.1 b/man/man1/gdal_retile.1
index 360721a..d5b7695 100644
--- a/man/man1/gdal_retile.1
+++ b/man/man1/gdal_retile.1
@@ -1,4 +1,4 @@
-.TH "gdal_retile" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_retile" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_sieve.1 b/man/man1/gdal_sieve.1
index 210bf2b..f2bf0d3 100644
--- a/man/man1/gdal_sieve.1
+++ b/man/man1/gdal_sieve.1
@@ -1,4 +1,4 @@
-.TH "gdal_sieve" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_sieve" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_translate.1 b/man/man1/gdal_translate.1
index d82b937..9c9ca8b 100644
--- a/man/man1/gdal_translate.1
+++ b/man/man1/gdal_translate.1
@@ -1,4 +1,4 @@
-.TH "gdal_translate" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_translate" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_utilities.1 b/man/man1/gdal_utilities.1
index 059ae10..5526184 100644
--- a/man/man1/gdal_utilities.1
+++ b/man/man1/gdal_utilities.1
@@ -1,4 +1,4 @@
-.TH "gdal_utilities" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_utilities" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaladdo.1 b/man/man1/gdaladdo.1
index 399f252..cadff10 100644
--- a/man/man1/gdaladdo.1
+++ b/man/man1/gdaladdo.1
@@ -1,4 +1,4 @@
-.TH "gdaladdo" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaladdo" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalbuildvrt.1 b/man/man1/gdalbuildvrt.1
index d07e8ee..0c69f5d 100644
--- a/man/man1/gdalbuildvrt.1
+++ b/man/man1/gdalbuildvrt.1
@@ -1,4 +1,4 @@
-.TH "gdalbuildvrt" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalbuildvrt" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalcompare.1 b/man/man1/gdalcompare.1
index 38e1a6a..a3faa3d 100644
--- a/man/man1/gdalcompare.1
+++ b/man/man1/gdalcompare.1
@@ -1,4 +1,4 @@
-.TH "gdalcompare" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalcompare" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaldem.1 b/man/man1/gdaldem.1
index 99638ff..30c8527 100644
--- a/man/man1/gdaldem.1
+++ b/man/man1/gdaldem.1
@@ -1,4 +1,4 @@
-.TH "gdaldem" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaldem" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalinfo.1 b/man/man1/gdalinfo.1
index e75438f..339ef28 100644
--- a/man/man1/gdalinfo.1
+++ b/man/man1/gdalinfo.1
@@ -1,4 +1,4 @@
-.TH "gdalinfo" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalinfo" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdallocationinfo.1 b/man/man1/gdallocationinfo.1
index 33b4783..53a6a61 100644
--- a/man/man1/gdallocationinfo.1
+++ b/man/man1/gdallocationinfo.1
@@ -1,4 +1,4 @@
-.TH "gdallocationinfo" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdallocationinfo" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalmanage.1 b/man/man1/gdalmanage.1
index 1ba376d..b9f2a77 100644
--- a/man/man1/gdalmanage.1
+++ b/man/man1/gdalmanage.1
@@ -1,4 +1,4 @@
-.TH "gdalmanage" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalmanage" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalmove.1 b/man/man1/gdalmove.1
index 662d764..adc3cb8 100644
--- a/man/man1/gdalmove.1
+++ b/man/man1/gdalmove.1
@@ -1,4 +1,4 @@
-.TH "gdalmove" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalmove" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalsrsinfo.1 b/man/man1/gdalsrsinfo.1
index daa3dbb..6ae37b6 100644
--- a/man/man1/gdalsrsinfo.1
+++ b/man/man1/gdalsrsinfo.1
@@ -1,4 +1,4 @@
-.TH "gdalsrsinfo" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalsrsinfo" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaltindex.1 b/man/man1/gdaltindex.1
index 16875a2..aacb963 100644
--- a/man/man1/gdaltindex.1
+++ b/man/man1/gdaltindex.1
@@ -1,4 +1,4 @@
-.TH "gdaltindex" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaltindex" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaltransform.1 b/man/man1/gdaltransform.1
index 4270625..bd157d4 100644
--- a/man/man1/gdaltransform.1
+++ b/man/man1/gdaltransform.1
@@ -1,4 +1,4 @@
-.TH "gdaltransform" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaltransform" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalwarp.1 b/man/man1/gdalwarp.1
index 3044a4b..f62e12f 100644
--- a/man/man1/gdalwarp.1
+++ b/man/man1/gdalwarp.1
@@ -1,4 +1,4 @@
-.TH "gdalwarp" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalwarp" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gnm_utilities.1 b/man/man1/gnm_utilities.1
index 3c2b18e..8c83c1c 100644
--- a/man/man1/gnm_utilities.1
+++ b/man/man1/gnm_utilities.1
@@ -1,4 +1,4 @@
-.TH "gnm_utilities" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gnm_utilities" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gnmanalyse.1 b/man/man1/gnmanalyse.1
index 6eb8d11..e48286b 100644
--- a/man/man1/gnmanalyse.1
+++ b/man/man1/gnmanalyse.1
@@ -1,4 +1,4 @@
-.TH "gnmanalyse" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gnmanalyse" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gnmmanage.1 b/man/man1/gnmmanage.1
index 45f90c0..91ec462 100644
--- a/man/man1/gnmmanage.1
+++ b/man/man1/gnmmanage.1
@@ -1,4 +1,4 @@
-.TH "gnmmanage" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "gnmmanage" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/nearblack.1 b/man/man1/nearblack.1
index c69a7db..fe7472a 100644
--- a/man/man1/nearblack.1
+++ b/man/man1/nearblack.1
@@ -1,4 +1,4 @@
-.TH "nearblack" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "nearblack" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogr2ogr.1 b/man/man1/ogr2ogr.1
index dbf7fc8..6e904d8 100644
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
@@ -1,4 +1,4 @@
-.TH "ogr2ogr" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "ogr2ogr" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogr_utilities.1 b/man/man1/ogr_utilities.1
index bce54a8..8aa1c62 100644
--- a/man/man1/ogr_utilities.1
+++ b/man/man1/ogr_utilities.1
@@ -1,4 +1,4 @@
-.TH "ogr_utilities" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "ogr_utilities" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrinfo.1 b/man/man1/ogrinfo.1
index 7cec09e..2a42e36 100644
--- a/man/man1/ogrinfo.1
+++ b/man/man1/ogrinfo.1
@@ -1,4 +1,4 @@
-.TH "ogrinfo" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "ogrinfo" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrlineref.1 b/man/man1/ogrlineref.1
index 27e03e7..92dacaf 100644
--- a/man/man1/ogrlineref.1
+++ b/man/man1/ogrlineref.1
@@ -1,4 +1,4 @@
-.TH "ogrlineref" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "ogrlineref" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrtindex.1 b/man/man1/ogrtindex.1
index bd9a5fd..6a851e8 100644
--- a/man/man1/ogrtindex.1
+++ b/man/man1/ogrtindex.1
@@ -1,4 +1,4 @@
-.TH "ogrtindex" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "ogrtindex" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/pct2rgb.1 b/man/man1/pct2rgb.1
index 1a7d8ee..2d115a2 100644
--- a/man/man1/pct2rgb.1
+++ b/man/man1/pct2rgb.1
@@ -1,4 +1,4 @@
-.TH "pct2rgb" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "pct2rgb" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/rgb2pct.1 b/man/man1/rgb2pct.1
index 0eae71c..12526c2 100644
--- a/man/man1/rgb2pct.1
+++ b/man/man1/rgb2pct.1
@@ -1,4 +1,4 @@
-.TH "rgb2pct" 1 "Wed Oct 19 2016" "GDAL" \" -*- nroff -*-
+.TH "rgb2pct" 1 "Fri Oct 21 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp b/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp
index bd85e82..df53bd2 100644
--- a/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmlayer.cpp
@@ -1,5 +1,5 @@
/******************************************************************************
- * $Id: ogrosmlayer.cpp 33332 2016-02-02 23:01:31Z rouault $
+ * $Id: ogrosmlayer.cpp 35846 2016-10-21 05:20:10Z goatbar $
*
* Project: OpenGIS Simple Features Reference Implementation
* Purpose: Implements OGROSMLayer class
@@ -33,7 +33,7 @@
#include "cpl_time.h"
#include "ogr_p.h"
-CPL_CVSID("$Id: ogrosmlayer.cpp 33332 2016-02-02 23:01:31Z rouault $");
+CPL_CVSID("$Id: ogrosmlayer.cpp 35846 2016-10-21 05:20:10Z goatbar $");
#define SWITCH_THRESHOLD 10000
#define MAX_THRESHOLD 100000
@@ -419,7 +419,8 @@ const char* OGROSMLayer::GetLaunderedFieldName(const char* pszName)
if( poDS->DoesAttributeNameLaundering() &&
strchr(pszName, ':') != NULL )
{
- for( size_t i = 0;
+ size_t i = 0;
+ for( ;
i < sizeof(szLaunderedFieldName) - 1 && pszName[i] != '\0';
i++ )
{
@@ -428,7 +429,7 @@ const char* OGROSMLayer::GetLaunderedFieldName(const char* pszName)
else
szLaunderedFieldName[i] = pszName[i];
}
- szLaunderedFieldName[sizeof(szLaunderedFieldName) - 1] = '\0';
+ szLaunderedFieldName[i] = '\0';
return szLaunderedFieldName;
}
--
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