[Git][debian-gis-team/libcitygml][master] 5 commits: New upstream version 2.4.3
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon Jun 27 14:58:08 BST 2022
Bas Couwenberg pushed to branch master at Debian GIS Project / libcitygml
Commits:
58e63403 by Bas Couwenberg at 2022-06-27T15:17:28+02:00
New upstream version 2.4.3
- - - - -
0a488e5e by Bas Couwenberg at 2022-06-27T15:17:29+02:00
Update upstream source from tag 'upstream/2.4.3'
Update to upstream version '2.4.3'
with Debian dir 703b62c1784e66b927970aa0bd06a1cdd150644c
- - - - -
335177ba by Bas Couwenberg at 2022-06-27T15:17:41+02:00
New upstream release.
- - - - -
6d9e2c9b by Bas Couwenberg at 2022-06-27T15:49:50+02:00
Update symbols for amd64.
- - - - -
e43705e1 by Bas Couwenberg at 2022-06-27T15:49:50+02:00
Set distribution to experimental.
- - - - -
6 changed files:
- debian/changelog
- debian/libcitygml2.symbols
- sources/include/citygml/citygmlfactory.h
- sources/include/parser/externalreferenceparser.h
- sources/src/citygml/citygmlfactory.cpp
- sources/src/parser/externalreferenceparser.cpp
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,11 @@
-libcitygml (2.4.2-2) UNRELEASED; urgency=medium
+libcitygml (2.4.3-1) unstable; urgency=medium
* Team upload.
+ * New upstream release.
* Bump Standards-Version to 4.6.1, no changes.
+ * Update symbols for amd64.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 21 Jun 2022 07:10:04 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 27 Jun 2022 15:18:15 +0200
libcitygml (2.4.2-1) unstable; urgency=medium
=====================================
debian/libcitygml2.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.4.1 amd64 arm64 armel armhf hppa i386 ia64 m68k mips64el mipsel powerpc ppc64el riscv64 s390x
+# SymbolsHelper-Confirmed: 2.4.3 amd64
libcitygml.so.2 #PACKAGE# #MINVER#
* Build-Depends-Package: libcitygml-dev
_Z11toStdStringB5cxx11PKDs at Base 2.0.4
@@ -1266,12 +1266,6 @@ libcitygml.so.2 #PACKAGE# #MINVER#
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE1EED0Ev at Base 2.4.1
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE1EED1Ev at Base 2.4.1
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE1EED2Ev at Base 2.4.1
- (optional=templinst)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv at Base 2.4.1
- (optional=templinst)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv at Base 2.4.1
- (optional=templinst)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info at Base 2.4.1
- (optional=templinst)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EED0Ev at Base 2.4.1
- (optional=templinst)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EED1Ev at Base 2.4.1
- (optional=templinst)_ZNSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EED2Ev at Base 2.4.1
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 1.4.3
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE1EE10_M_disposeEv at Base 1.4.3
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE1EE14_M_get_deleterERKSt9type_info at Base 1.4.3
@@ -1587,7 +1581,6 @@ libcitygml.so.2 #PACKAGE# #MINVER#
(arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN7citygml13ElementParserELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
(arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN7citygml13ElementParserELN9__gnu_cxx12_Lock_policyE2EE at Base 2.0
(arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
- _ZTISt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EE at Base 2.4.1
(arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
(arch=!armel !riscv64)_ZTISt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE2EE at Base 2.0
(arch=armel riscv64)_ZTISt15_Sp_counted_ptrIPN7citygml23TextureTargetDefinitionELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
@@ -1709,7 +1702,6 @@ libcitygml.so.2 #PACKAGE# #MINVER#
(arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN7citygml13ElementParserELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
(arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN7citygml13ElementParserELN9__gnu_cxx12_Lock_policyE2EE at Base 2.0
(arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
- _ZTSSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EE at Base 2.4.1
(arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
(arch=!armel !riscv64)_ZTSSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE2EE at Base 2.0
(arch=armel riscv64)_ZTSSt15_Sp_counted_ptrIPN7citygml23TextureTargetDefinitionELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
@@ -1807,7 +1799,6 @@ libcitygml.so.2 #PACKAGE# #MINVER#
(arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN7citygml13ElementParserELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
(arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN7citygml13ElementParserELN9__gnu_cxx12_Lock_policyE2EE at Base 2.0
(arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
- _ZTVSt15_Sp_counted_ptrIPN7citygml17ExternalReferenceELN9__gnu_cxx12_Lock_policyE2EE at Base 2.4.1
(arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
(arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN7citygml20GeoreferencedTextureELN9__gnu_cxx12_Lock_policyE2EE at Base 2.0
(arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPN7citygml23TextureTargetDefinitionELN9__gnu_cxx12_Lock_policyE1EE at Base 2.4.1
=====================================
sources/include/citygml/citygmlfactory.h
=====================================
@@ -41,7 +41,7 @@ namespace citygml {
std::shared_ptr<Polygon> createPolygon(const std::string& id);
std::shared_ptr<LineString> createLineString(const std::string& id);
- std::shared_ptr<ExternalReference> createExternalReference(const std::string& id);
+ ExternalReference* createExternalReference(const std::string& id);
/**
* @brief requests a polygon for a Geometry object that will be added later
=====================================
sources/include/parser/externalreferenceparser.h
=====================================
@@ -25,7 +25,7 @@ namespace citygml {
virtual Object* getObject() override;
private:
- std::shared_ptr<ExternalReference> model;
+ std::unique_ptr<ExternalReference> model;
std::function<void(ExternalReference *)> callback;
};
}
=====================================
sources/src/citygml/citygmlfactory.cpp
=====================================
@@ -95,10 +95,9 @@ namespace citygml {
return std::shared_ptr<LineString>(lineString);
}
- std::shared_ptr<ExternalReference> CityGMLFactory::createExternalReference(const std::string& id)
+ ExternalReference* CityGMLFactory::createExternalReference(const std::string& id)
{
- ExternalReference * externalReference = new ExternalReference(id);
- return std::shared_ptr<ExternalReference>(externalReference);
+ return new ExternalReference(id);
}
void CityGMLFactory::requestSharedPolygonForGeometry(Geometry* geom, const std::string& polygonId)
=====================================
sources/src/parser/externalreferenceparser.cpp
=====================================
@@ -25,13 +25,13 @@ namespace citygml {
CITYGML_LOG_ERROR(m_logger, "Expected start tag <" << NodeType::CORE_ExternalReferenceNode << "> but got <" << node.name() << "> at " << getDocumentLocation());
}
- model = m_factory.createExternalReference(attributes.getCityGMLIDAttribute());
+ model.reset(m_factory.createExternalReference(attributes.getCityGMLIDAttribute()));
return true;
}
bool ExternalReferenceParser::parseElementEndTag(NodeType::XMLNode const& node, std::string const&) {
- callback(model.get());
+ callback(model.release());
return true;
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/-/compare/057b8f5f9e0a35d9377828ede857411b75b6bf65...e43705e16e9845d2ea9370d98eb5e3918455363b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libcitygml/-/compare/057b8f5f9e0a35d9377828ede857411b75b6bf65...e43705e16e9845d2ea9370d98eb5e3918455363b
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/20220627/2f3c4e46/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list