From 8c494f77361a6774a30ee86a86c40c4bdeeda83a Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Sat, 6 Feb 2021 00:05:27 +0100
Subject: Work on fedora/debian compatibility
---
svg-flatten/src/svg_doc.cpp | 6 +++---
svg-flatten/src/vec_core.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'svg-flatten/src')
diff --git a/svg-flatten/src/svg_doc.cpp b/svg-flatten/src/svg_doc.cpp
index 3b253be..e9c9dfc 100644
--- a/svg-flatten/src/svg_doc.cpp
+++ b/svg-flatten/src/svg_doc.cpp
@@ -95,14 +95,14 @@ bool gerbolyze::SVGDocument::load(istream &in, string debug_out_filename) {
const Paths *gerbolyze::SVGDocument::lookup_clip_path(const pugi::xml_node &node) {
string id(usvg_id_url(node.attribute("clip-path").value()));
- if (id.empty() || !clip_path_map.contains(id)) {
+ if (id.empty() || clip_path_map.count(id) == 0) {
return nullptr;
}
return &clip_path_map[id];
}
Pattern *gerbolyze::SVGDocument::lookup_pattern(const string id) {
- if (id.empty() || !pattern_map.contains(id)) {
+ if (id.empty() || pattern_map.count(id) == 0) {
return nullptr;
}
return &pattern_map[id];
@@ -484,7 +484,7 @@ void gerbolyze::SVGDocument::load_clips() {
/* Support clip paths that themselves have clip paths */
if (!meta_clip_path_id.empty()) {
- if (clip_path_map.contains(meta_clip_path_id)) {
+ if (clip_path_map.count(meta_clip_path_id) > 0) {
/* all clip paths must be closed */
c.AddPaths(clip_path_map[meta_clip_path_id], ptClip, /* closed */ true);
diff --git a/svg-flatten/src/vec_core.cpp b/svg-flatten/src/vec_core.cpp
index 9d2909f..add94b4 100644
--- a/svg-flatten/src/vec_core.cpp
+++ b/svg-flatten/src/vec_core.cpp
@@ -556,7 +556,7 @@ gerbolyze::VectorizerSelectorizer::VectorizerSelectorizer(const string default_v
ImageVectorizer *gerbolyze::VectorizerSelectorizer::select(const pugi::xml_node &img) {
const string id = img.attribute("id").value();
cerr << "selecting vectorizer for image \"" << id << "\"" << endl;
- if (m_map.contains(id)) {
+ if (m_map.count(id) > 0) {
cerr << " -> found" << endl;
return makeVectorizer(m_map[id]);
}
--
cgit