[gdal] 02/09: Imported Upstream version 2.0.2~rc4+dfsg
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Feb 1 16:25:39 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 f6bb722426d9fc46207c1bb531a786e02aa499eb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jan 26 22:14:33 2016 +0100
Imported Upstream version 2.0.2~rc4+dfsg
---
NEWS | 1 +
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/gpkg/ogrgeopackagedatasource.cpp | 7 +++++--
39 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/NEWS b/NEWS
index 5974025..814a00d 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,7 @@ GTiff driver:
GPKG driver:
* fix various issues in update scenarios when interacting with the GDAL block cache that could result in lost/corrupted band data to be written in tiles (#6309)
+ * fix potential use of freed sqlite temporary DB handle when generating overviews with partial tiles (#6335)
HFA driver:
* fix crash when nNumRuns = 0 with RLE compression (#6208)
diff --git a/gcore/gdal_version.h b/gcore/gdal_version.h
index ad8d34c..39740b2 100644
--- a/gcore/gdal_version.h
+++ b/gcore/gdal_version.h
@@ -22,7 +22,7 @@
#endif
#ifndef GDAL_RELEASE_DATE
-# define GDAL_RELEASE_DATE 20160125
+# define GDAL_RELEASE_DATE 20160126
#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 587cf72..a65998c 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 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "apps Directory Reference" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal-config.1 b/man/man1/gdal-config.1
index 87bc3d1..77db0a1 100644
--- a/man/man1/gdal-config.1
+++ b/man/man1/gdal-config.1
@@ -1,4 +1,4 @@
-.TH "gdal-config" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal-config" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal2tiles.1 b/man/man1/gdal2tiles.1
index 06e590e..e429065 100644
--- a/man/man1/gdal2tiles.1
+++ b/man/man1/gdal2tiles.1
@@ -1,4 +1,4 @@
-.TH "gdal2tiles" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal2tiles" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_calc.1 b/man/man1/gdal_calc.1
index 76609cc..8d8ca6d 100644
--- a/man/man1/gdal_calc.1
+++ b/man/man1/gdal_calc.1
@@ -1,4 +1,4 @@
-.TH "gdal_calc" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_calc" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_contour.1 b/man/man1/gdal_contour.1
index 1ad5b19..3cfe32c 100644
--- a/man/man1/gdal_contour.1
+++ b/man/man1/gdal_contour.1
@@ -1,4 +1,4 @@
-.TH "gdal_contour" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_contour" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_edit.1 b/man/man1/gdal_edit.1
index ebd4548..115c65a 100644
--- a/man/man1/gdal_edit.1
+++ b/man/man1/gdal_edit.1
@@ -1,4 +1,4 @@
-.TH "gdal_edit" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_edit" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_fillnodata.1 b/man/man1/gdal_fillnodata.1
index 2a0d8f3..748814b 100644
--- a/man/man1/gdal_fillnodata.1
+++ b/man/man1/gdal_fillnodata.1
@@ -1,4 +1,4 @@
-.TH "gdal_fillnodata" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_fillnodata" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_grid.1 b/man/man1/gdal_grid.1
index 268bb00..912f554 100644
--- a/man/man1/gdal_grid.1
+++ b/man/man1/gdal_grid.1
@@ -1,4 +1,4 @@
-.TH "gdal_grid" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_grid" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_merge.1 b/man/man1/gdal_merge.1
index 20f5958..420da1f 100644
--- a/man/man1/gdal_merge.1
+++ b/man/man1/gdal_merge.1
@@ -1,4 +1,4 @@
-.TH "gdal_merge" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_merge" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_polygonize.1 b/man/man1/gdal_polygonize.1
index 7666e94..435a143 100644
--- a/man/man1/gdal_polygonize.1
+++ b/man/man1/gdal_polygonize.1
@@ -1,4 +1,4 @@
-.TH "gdal_polygonize" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_polygonize" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_proximity.1 b/man/man1/gdal_proximity.1
index fe83e8f..0816fae 100644
--- a/man/man1/gdal_proximity.1
+++ b/man/man1/gdal_proximity.1
@@ -1,4 +1,4 @@
-.TH "gdal_proximity" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_proximity" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_rasterize.1 b/man/man1/gdal_rasterize.1
index 695ae17..33b9d68 100644
--- a/man/man1/gdal_rasterize.1
+++ b/man/man1/gdal_rasterize.1
@@ -1,4 +1,4 @@
-.TH "gdal_rasterize" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_rasterize" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_retile.1 b/man/man1/gdal_retile.1
index cad8680..1fc1f39 100644
--- a/man/man1/gdal_retile.1
+++ b/man/man1/gdal_retile.1
@@ -1,4 +1,4 @@
-.TH "gdal_retile" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_retile" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_sieve.1 b/man/man1/gdal_sieve.1
index 502d45a..debec1d 100644
--- a/man/man1/gdal_sieve.1
+++ b/man/man1/gdal_sieve.1
@@ -1,4 +1,4 @@
-.TH "gdal_sieve" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_sieve" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_translate.1 b/man/man1/gdal_translate.1
index 70c6e67..28559c4 100644
--- a/man/man1/gdal_translate.1
+++ b/man/man1/gdal_translate.1
@@ -1,4 +1,4 @@
-.TH "gdal_translate" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_translate" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdal_utilities.1 b/man/man1/gdal_utilities.1
index 3afeb73..97161bd 100644
--- a/man/man1/gdal_utilities.1
+++ b/man/man1/gdal_utilities.1
@@ -1,4 +1,4 @@
-.TH "gdal_utilities" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdal_utilities" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaladdo.1 b/man/man1/gdaladdo.1
index 62cd78f..5e66c8d 100644
--- a/man/man1/gdaladdo.1
+++ b/man/man1/gdaladdo.1
@@ -1,4 +1,4 @@
-.TH "gdaladdo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaladdo" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalbuildvrt.1 b/man/man1/gdalbuildvrt.1
index 873c220..a4ab009 100644
--- a/man/man1/gdalbuildvrt.1
+++ b/man/man1/gdalbuildvrt.1
@@ -1,4 +1,4 @@
-.TH "gdalbuildvrt" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalbuildvrt" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalcompare.1 b/man/man1/gdalcompare.1
index c038bab..9f27416 100644
--- a/man/man1/gdalcompare.1
+++ b/man/man1/gdalcompare.1
@@ -1,4 +1,4 @@
-.TH "gdalcompare" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalcompare" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaldem.1 b/man/man1/gdaldem.1
index 7edf345..1919678 100644
--- a/man/man1/gdaldem.1
+++ b/man/man1/gdaldem.1
@@ -1,4 +1,4 @@
-.TH "gdaldem" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaldem" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalinfo.1 b/man/man1/gdalinfo.1
index eff606b..1bd9aa9 100644
--- a/man/man1/gdalinfo.1
+++ b/man/man1/gdalinfo.1
@@ -1,4 +1,4 @@
-.TH "gdalinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalinfo" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdallocationinfo.1 b/man/man1/gdallocationinfo.1
index d200e68..a04e97f 100644
--- a/man/man1/gdallocationinfo.1
+++ b/man/man1/gdallocationinfo.1
@@ -1,4 +1,4 @@
-.TH "gdallocationinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdallocationinfo" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalmanage.1 b/man/man1/gdalmanage.1
index 6050dae..00d9138 100644
--- a/man/man1/gdalmanage.1
+++ b/man/man1/gdalmanage.1
@@ -1,4 +1,4 @@
-.TH "gdalmanage" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalmanage" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalmove.1 b/man/man1/gdalmove.1
index c72f20d..3cf464c 100644
--- a/man/man1/gdalmove.1
+++ b/man/man1/gdalmove.1
@@ -1,4 +1,4 @@
-.TH "gdalmove" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalmove" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalsrsinfo.1 b/man/man1/gdalsrsinfo.1
index fa8ca49..973ed54 100644
--- a/man/man1/gdalsrsinfo.1
+++ b/man/man1/gdalsrsinfo.1
@@ -1,4 +1,4 @@
-.TH "gdalsrsinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalsrsinfo" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaltindex.1 b/man/man1/gdaltindex.1
index c1f97e9..3223621 100644
--- a/man/man1/gdaltindex.1
+++ b/man/man1/gdaltindex.1
@@ -1,4 +1,4 @@
-.TH "gdaltindex" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaltindex" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdaltransform.1 b/man/man1/gdaltransform.1
index cfb0dce..c5182e3 100644
--- a/man/man1/gdaltransform.1
+++ b/man/man1/gdaltransform.1
@@ -1,4 +1,4 @@
-.TH "gdaltransform" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdaltransform" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/gdalwarp.1 b/man/man1/gdalwarp.1
index f0bda2d..d9aceae 100644
--- a/man/man1/gdalwarp.1
+++ b/man/man1/gdalwarp.1
@@ -1,4 +1,4 @@
-.TH "gdalwarp" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "gdalwarp" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/nearblack.1 b/man/man1/nearblack.1
index 267bb65..f9fb9c4 100644
--- a/man/man1/nearblack.1
+++ b/man/man1/nearblack.1
@@ -1,4 +1,4 @@
-.TH "nearblack" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "nearblack" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogr2ogr.1 b/man/man1/ogr2ogr.1
index 5ee727a..5f05c0d 100644
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
@@ -1,4 +1,4 @@
-.TH "ogr2ogr" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "ogr2ogr" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogr_utilities.1 b/man/man1/ogr_utilities.1
index 18168b0..9f26836 100644
--- a/man/man1/ogr_utilities.1
+++ b/man/man1/ogr_utilities.1
@@ -1,4 +1,4 @@
-.TH "ogr_utilities" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "ogr_utilities" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrinfo.1 b/man/man1/ogrinfo.1
index 1a30c95..4de4bc9 100644
--- a/man/man1/ogrinfo.1
+++ b/man/man1/ogrinfo.1
@@ -1,4 +1,4 @@
-.TH "ogrinfo" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "ogrinfo" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrlineref.1 b/man/man1/ogrlineref.1
index 136098c..ebf0db0 100644
--- a/man/man1/ogrlineref.1
+++ b/man/man1/ogrlineref.1
@@ -1,4 +1,4 @@
-.TH "ogrlineref" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "ogrlineref" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/ogrtindex.1 b/man/man1/ogrtindex.1
index 09ba281..bb10e0a 100644
--- a/man/man1/ogrtindex.1
+++ b/man/man1/ogrtindex.1
@@ -1,4 +1,4 @@
-.TH "ogrtindex" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "ogrtindex" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/pct2rgb.1 b/man/man1/pct2rgb.1
index 8235ba9..c64e999 100644
--- a/man/man1/pct2rgb.1
+++ b/man/man1/pct2rgb.1
@@ -1,4 +1,4 @@
-.TH "pct2rgb" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "pct2rgb" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/man/man1/rgb2pct.1 b/man/man1/rgb2pct.1
index 2ce9a33..410c4a9 100644
--- a/man/man1/rgb2pct.1
+++ b/man/man1/rgb2pct.1
@@ -1,4 +1,4 @@
-.TH "rgb2pct" 1 "Mon Jan 25 2016" "GDAL" \" -*- nroff -*-
+.TH "rgb2pct" 1 "Tue Jan 26 2016" "GDAL" \" -*- nroff -*-
.ad l
.nh
.SH NAME
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 838da51..3838a87 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -484,6 +484,11 @@ GDALGeoPackageDataset::~GDALGeoPackageDataset()
FlushCache();
FlushMetadata();
+ // Destroy overviews before cleaning m_hTempDB as they could still
+ // need it
+ for( int i = 0; i < m_nOverviewCount; i++ )
+ delete m_papoOverviewDS[i];
+
if( m_poParentDS != NULL )
{
hDB = NULL;
@@ -497,8 +502,6 @@ GDALGeoPackageDataset::~GDALGeoPackageDataset()
for( i = 0; i < m_nLayers; i++ )
delete m_papoLayers[i];
- for( i = 0; i < m_nOverviewCount; i++ )
- delete m_papoOverviewDS[i];
CPLFree( m_papoLayers );
CPLFree( m_papoOverviewDS );
--
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