[Git][debian-gis-team/libspatialindex][upstream] New upstream version 1.9.2
Bas Couwenberg
gitlab at salsa.debian.org
Tue Oct 22 12:46:15 BST 2019
Bas Couwenberg pushed to branch upstream at Debian GIS Project / libspatialindex
Commits:
e9692716 by Bas Couwenberg at 2019-10-22T11:33:05Z
New upstream version 1.9.2
- - - - -
10 changed files:
- CMakeLists.txt
- docs/source/conf.py
- docs/source/download.rst
- docs/source/introduction.rst
- include/spatialindex/Version.h
- package-release.sh
- scripts/conda/win64.bat
- src/mvrtree/MVRTree.h
- src/rtree/RTree.h
- src/tprtree/TPRTree.h
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -40,8 +40,8 @@ endif (APPLE)
SET(SIDX_VERSION_MAJOR "1")
SET(SIDX_VERSION_MINOR "9")
-SET(SIDX_VERSION_PATCH "1")
-SET(SIDX_LIB_VERSION "6.0.0")
+SET(SIDX_VERSION_PATCH "2")
+SET(SIDX_LIB_VERSION "6.1.0")
SET(SIDX_LIB_SOVERSION "6")
SET(BUILD_SHARED_LIBS ON)
@@ -202,7 +202,7 @@ SET(CPACK_PACKAGE_VENDOR "libspatialindex Development Team")
SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
set(CPACK_SOURCE_PACKAGE_FILE_NAME
- "${CMAKE_PROJECT_NAME}-${SIDX_VERSION_STRING}-src")
+ "${CMAKE_PROJECT_NAME}-src-${SIDX_VERSION_STRING}")
set(CPACK_SOURCE_IGNORE_FILES
"/\\\\.gitattributes;/\\\\.vagrant;/\\\\.DS_Store;/CVS/;/\\\\.git/;\\\\.swp$;~$;\\\\.\\\\#;/\\\\#")
=====================================
docs/source/conf.py
=====================================
@@ -48,9 +48,9 @@ copyright = u'2019, Marios Hadjieleftheriou'
# built documents.
#
# The short X.Y version.
-version = '1.9.1'
+version = '1.9.2'
# The full version, including alpha/beta/rc tags.
-release = '1.9.1'
+release = '1.9.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
=====================================
docs/source/download.rst
=====================================
@@ -5,13 +5,13 @@ Download
Current Release (MIT)
------------------------------------------------------------------------------
-* **2018-10-19**
+* **2018-10-22**
- - `spatialindex-src-1.9.1.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.1/spatialindex-src-1.9.1.tar.gz>`__
- `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.1/spatialindex-src-1.9.1.tar.gz.md5>`__
+ - `spatialindex-src-1.9.2.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.gz>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.gz.md5>`__
- - `spatialindex-src-1.9.1.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.1/spatialindex-src-1.9.1.tar.bz2>`__
- `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.1/spatialindex-src-1.9.1.tar.bz2.md5>`__
+ - `spatialindex-src-1.9.2.tar.bz2 <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.bz2>`__
+ `(md5) <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.2/spatialindex-src-1.9.2.tar.bz2.md5>`__
Binaries
..............................................................................
@@ -30,6 +30,10 @@ contain binaries for libspatialindex.
Past Release (MIT)
------------------------------------------------------------------------------
+* **2018-10-19**
+
+ - spatialindex-src-1.9.1.tar.gz -- broken. See GitHub tag if needed.
+
* **2018-02-08**
- `spatialindex-src-1.9.0.tar.gz <https://github.com/libspatialindex/libspatialindex/releases/download/1.9.0/spatialindex-src-1.9.0.tar.gz>`__
=====================================
docs/source/introduction.rst
=====================================
@@ -2,8 +2,8 @@
:Author: Marios Hadjieleftheriou
:Contact: mhadji at gmail.com
-:Revision: 1.9.1
-:Date: 10/19/2019
+:Revision: 1.9.2
+:Date: 10/22/2019
The entire website is available as a single PDF at https://libspatialindex.org/libspatialindex.pdf
=====================================
include/spatialindex/Version.h
=====================================
@@ -30,7 +30,7 @@
#ifndef SIDX_VERSION_MAJOR
#define SIDX_VERSION_MAJOR 1
#define SIDX_VERSION_MINOR 9
-#define SIDX_VERSION_REV 1
+#define SIDX_VERSION_REV 2
#define SIDX_VERSION_BUILD 0
#endif
@@ -39,10 +39,10 @@
#endif
#ifndef SIDX_RELEASE_DATE
-#define SIDX_RELEASE_DATE 20191019
+#define SIDX_RELEASE_DATE 20191022
#endif
#ifndef SIDX_RELEASE_NAME
-#define SIDX_RELEASE_NAME "1.9.1"
+#define SIDX_RELEASE_NAME "1.9.2"
#endif
=====================================
package-release.sh
=====================================
@@ -30,7 +30,8 @@ echo "git checkout $GITSHA" >> docker-package.sh
cat >> docker-package.sh << "EOF"
apt-get install cmake -y
-cmake .
+mkdir build; cd build
+cmake ..
make dist
EOF
=====================================
scripts/conda/win64.bat
=====================================
@@ -6,4 +6,5 @@ cmake -G "Ninja" ^
-DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF ^
-DBUILD_SHARED_LIBS=ON ^
-DSIDX_BUILD_TESTS=ON ^
+ -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX\Library ^
..
\ No newline at end of file
=====================================
src/mvrtree/MVRTree.h
=====================================
@@ -67,26 +67,26 @@ namespace SpatialIndex
// StrongVersionOverflow VT_DOUBLE Default is 0.8
// VersionUnderflow VT_DOUBLE Default is 0.3
- ~MVRTree() override;
+ ~MVRTree() ;
//
// ISpatialIndex interface
//
- virtual void insertData(uint32_t len, const uint8_t* pData, const IShape& shape, id_type id) override;
- virtual bool deleteData(const IShape& shape, id_type id) override;
- virtual void internalNodesQuery(const IShape& query, IVisitor& v) override;
- virtual void containsWhatQuery(const IShape& query, IVisitor& v) override;
- virtual void intersectsWithQuery(const IShape& query, IVisitor& v) override;
- virtual void pointLocationQuery(const Point& query, IVisitor& v) override;
- virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v, INearestNeighborComparator&) override;
- virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v) override;
- virtual void selfJoinQuery(const IShape& s, IVisitor& v) override;
- virtual void queryStrategy(IQueryStrategy& qs) override;
- virtual void getIndexProperties(Tools::PropertySet& out) const override;
- virtual void addCommand(ICommand* pCommand, CommandType ct) override;
- virtual bool isIndexValid() override;
- virtual void getStatistics(IStatistics** out) const override;
- virtual void flush() override;
+ virtual void insertData(uint32_t len, const uint8_t* pData, const IShape& shape, id_type id) ;
+ virtual bool deleteData(const IShape& shape, id_type id) ;
+ virtual void internalNodesQuery(const IShape& query, IVisitor& v) ;
+ virtual void containsWhatQuery(const IShape& query, IVisitor& v) ;
+ virtual void intersectsWithQuery(const IShape& query, IVisitor& v) ;
+ virtual void pointLocationQuery(const Point& query, IVisitor& v) ;
+ virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v, INearestNeighborComparator&) ;
+ virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v) ;
+ virtual void selfJoinQuery(const IShape& s, IVisitor& v) ;
+ virtual void queryStrategy(IQueryStrategy& qs) ;
+ virtual void getIndexProperties(Tools::PropertySet& out) const ;
+ virtual void addCommand(ICommand* pCommand, CommandType ct) ;
+ virtual bool isIndexValid() ;
+ virtual void getStatistics(IStatistics** out) const ;
+ virtual void flush() ;
private:
void initNew(Tools::PropertySet&);
@@ -186,11 +186,11 @@ namespace SpatialIndex
class NNComparator : public INearestNeighborComparator
{
public:
- double getMinimumDistance(const IShape& query, const IShape& entry) override
+ double getMinimumDistance(const IShape& query, const IShape& entry)
{
return query.getMinimumDistance(entry);
}
- double getMinimumDistance(const IShape& query, const IData& data) override
+ double getMinimumDistance(const IShape& query, const IData& data)
{
IShape* pR;
data.getShape(&pR);
=====================================
src/rtree/RTree.h
=====================================
@@ -61,28 +61,28 @@ namespace SpatialIndex
// RegionPoolCapacity VT_LONG Default is 1000
// PointPoolCapacity VT_LONG Default is 500
- ~RTree() override;
+ ~RTree() ;
//
// ISpatialIndex interface
//
- virtual void insertData(uint32_t len, const uint8_t* pData, const IShape& shape, id_type shapeIdentifier) override;
- virtual bool deleteData(const IShape& shape, id_type id) override;
- virtual void internalNodesQuery(const IShape& query, IVisitor& v) override;
- virtual void containsWhatQuery(const IShape& query, IVisitor& v) override;
- virtual void intersectsWithQuery(const IShape& query, IVisitor& v) override;
- virtual void pointLocationQuery(const Point& query, IVisitor& v) override;
- virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v, INearestNeighborComparator&) override;
- virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v) override;
- virtual void selfJoinQuery(const IShape& s, IVisitor& v) override;
- virtual void queryStrategy(IQueryStrategy& qs) override;
- virtual void getIndexProperties(Tools::PropertySet& out) const override;
- virtual void addCommand(ICommand* pCommand, CommandType ct) override;
- virtual bool isIndexValid() override;
- virtual void getStatistics(IStatistics** out) const override;
- virtual void flush() override;
+ virtual void insertData(uint32_t len, const uint8_t* pData, const IShape& shape, id_type shapeIdentifier) ;
+ virtual bool deleteData(const IShape& shape, id_type id) ;
+ virtual void internalNodesQuery(const IShape& query, IVisitor& v) ;
+ virtual void containsWhatQuery(const IShape& query, IVisitor& v) ;
+ virtual void intersectsWithQuery(const IShape& query, IVisitor& v) ;
+ virtual void pointLocationQuery(const Point& query, IVisitor& v) ;
+ virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v, INearestNeighborComparator&);
+ virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v);
+ virtual void selfJoinQuery(const IShape& s, IVisitor& v) ;
+ virtual void queryStrategy(IQueryStrategy& qs) ;
+ virtual void getIndexProperties(Tools::PropertySet& out) const ;
+ virtual void addCommand(ICommand* pCommand, CommandType ct) ;
+ virtual bool isIndexValid() ;
+ virtual void getStatistics(IStatistics** out) const ;
+ virtual void flush() ;
private:
void initNew(Tools::PropertySet&);
@@ -161,12 +161,12 @@ namespace SpatialIndex
class NNComparator : public INearestNeighborComparator
{
public:
- double getMinimumDistance(const IShape& query, const IShape& entry) override
+ double getMinimumDistance(const IShape& query, const IShape& entry)
{
return query.getMinimumDistance(entry);
}
- double getMinimumDistance(const IShape& query, const IData& data) override
+ double getMinimumDistance(const IShape& query, const IData& data)
{
IShape* pS;
data.getShape(&pS);
=====================================
src/tprtree/TPRTree.h
=====================================
@@ -62,26 +62,26 @@ namespace SpatialIndex
// RegionPoolCapacity VT_LONG Default is 1000
// PointPoolCapacity VT_LONG Default is 500
- ~TPRTree() override;
+ ~TPRTree() ;
//
// ISpatialIndex interface
//
- virtual void insertData(uint32_t len, const uint8_t* pData, const IShape& shape, id_type shapeIdentifier) override;
- virtual bool deleteData(const IShape& shape, id_type id) override;
- virtual void internalNodesQuery(const IShape& query, IVisitor& v) override;
- virtual void containsWhatQuery(const IShape& query, IVisitor& v) override;
- virtual void intersectsWithQuery(const IShape& query, IVisitor& v) override;
- virtual void pointLocationQuery(const Point& query, IVisitor& v) override;
- virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v, INearestNeighborComparator&) override;
- virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v) override;
- virtual void selfJoinQuery(const IShape& s, IVisitor& v) override;
- virtual void queryStrategy(IQueryStrategy& qs) override;
- virtual void getIndexProperties(Tools::PropertySet& out) const override;
- virtual void addCommand(ICommand* pCommand, CommandType ct) override;
- virtual bool isIndexValid() override;
- virtual void getStatistics(IStatistics** out) const override;
- virtual void flush() override;
+ virtual void insertData(uint32_t len, const uint8_t* pData, const IShape& shape, id_type shapeIdentifier) ;
+ virtual bool deleteData(const IShape& shape, id_type id) ;
+ virtual void internalNodesQuery(const IShape& query, IVisitor& v) ;
+ virtual void containsWhatQuery(const IShape& query, IVisitor& v) ;
+ virtual void intersectsWithQuery(const IShape& query, IVisitor& v) ;
+ virtual void pointLocationQuery(const Point& query, IVisitor& v) ;
+ virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v, INearestNeighborComparator&) ;
+ virtual void nearestNeighborQuery(uint32_t k, const IShape& query, IVisitor& v) ;
+ virtual void selfJoinQuery(const IShape& s, IVisitor& v) ;
+ virtual void queryStrategy(IQueryStrategy& qs) ;
+ virtual void getIndexProperties(Tools::PropertySet& out) const ;
+ virtual void addCommand(ICommand* pCommand, CommandType ct) ;
+ virtual bool isIndexValid() ;
+ virtual void getStatistics(IStatistics** out) const ;
+ virtual void flush() ;
private:
void initNew(Tools::PropertySet&);
@@ -162,12 +162,12 @@ namespace SpatialIndex
class NNComparator : public INearestNeighborComparator
{
public:
- double getMinimumDistance(const IShape& query, const IShape& entry) override
+ double getMinimumDistance(const IShape& query, const IShape& entry)
{
return query.getMinimumDistance(entry);
}
- double getMinimumDistance(const IShape& query, const IData& data) override
+ double getMinimumDistance(const IShape& query, const IData& data)
{
IShape* pS;
data.getShape(&pS);
View it on GitLab: https://salsa.debian.org/debian-gis-team/libspatialindex/commit/e9692716fe45f1e2f55fd85eaec94dedb9c4157d
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libspatialindex/commit/e9692716fe45f1e2f55fd85eaec94dedb9c4157d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20191022/ae131e30/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list