From 49e06da7832316004ffb75c26a1e707436e1367f Mon Sep 17 00:00:00 2001 From: rettinghaus Date: Fri, 31 Jan 2025 20:20:36 +0100 Subject: [PATCH 1/2] fix: conflict after #3930 --- src/findfunctor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/findfunctor.cpp b/src/findfunctor.cpp index 5f6e4505ad..5c19f2c3b7 100644 --- a/src/findfunctor.cpp +++ b/src/findfunctor.cpp @@ -278,8 +278,8 @@ FunctorCode FindAllReferencedObjectsFunctor::VisitObject(Object *object) if (object->HasInterface(INTERFACE_FACSIMILE)) { FacsimileInterface *interface = object->GetFacsimileInterface(); assert(interface); - if (interface->GetSurface()) m_elements->push_back(interface->GetSurface()); - if (interface->GetZone()) m_elements->push_back(interface->GetZone()); + if (interface->GetSurface()) m_elements->insert(interface->GetSurface()); + if (interface->GetZone()) m_elements->insert(interface->GetZone()); } if (object->HasInterface(INTERFACE_PLIST)) { PlistInterface *interface = object->GetPlistInterface(); From 855f165d867844cd0c2c05e05c6059188ed3ca9e Mon Sep 17 00:00:00 2001 From: rettinghaus Date: Fri, 31 Jan 2025 20:21:19 +0100 Subject: [PATCH 2/2] treat percentage like doubles --- libmei/addons/att.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libmei/addons/att.cpp b/libmei/addons/att.cpp index 97177dee52..e754eba041 100644 --- a/libmei/addons/att.cpp +++ b/libmei/addons/att.cpp @@ -631,7 +631,7 @@ data_ORIENTATION Att::StrToOrientation(const std::string &value, bool logWarning std::string Att::PercentToStr(data_PERCENT data) const { - return StringFormat("%.2f%%", data); + return DblToStr(data) + "%"; } data_PERCENT Att::StrToPercent(const std::string &value, bool logWarning) const @@ -646,7 +646,7 @@ data_PERCENT Att::StrToPercent(const std::string &value, bool logWarning) const std::string Att::PercentLimitedToStr(data_PERCENT_LIMITED data) const { - return StringFormat("%.2f%%", data); + return DblToStr(data) + "%"; } data_PERCENT_LIMITED Att::StrToPercentLimited(const std::string &value, bool logWarning) const @@ -661,7 +661,7 @@ data_PERCENT_LIMITED Att::StrToPercentLimited(const std::string &value, bool log std::string Att::PercentLimitedSignedToStr(data_PERCENT_LIMITED_SIGNED data) const { - return StringFormat("%.2f%%", data); + return DblToStr(data) + "%"; } data_PERCENT_LIMITED_SIGNED Att::StrToPercentLimitedSigned(const std::string &value, bool logWarning) const