From 4c4deeef2ca161ba0947060d977d29d1ff671a4f Mon Sep 17 00:00:00 2001 From: sammycage Date: Sat, 14 Sep 2024 21:26:04 +0100 Subject: [PATCH] Fix uint32_t -> size_t compiler warnings --- source/svgparser.cpp | 14 +++++++------- source/svgtextelement.h | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/source/svgparser.cpp b/source/svgparser.cpp index d7e2516..61d9363 100644 --- a/source/svgparser.cpp +++ b/source/svgparser.cpp @@ -73,7 +73,7 @@ struct Rule { class RuleData { public: - RuleData(const Selector& selector, const DeclarationList& declarations, uint32_t specificity, uint32_t position) + RuleData(const Selector& selector, const DeclarationList& declarations, size_t specificity, size_t position) : m_selector(selector), m_declarations(declarations), m_specificity(specificity), m_position(position) {} @@ -81,8 +81,8 @@ class RuleData { const Selector& selector() const { return m_selector; } const DeclarationList& declarations() const { return m_declarations; } - uint32_t specificity() const { return m_specificity; } - uint32_t position() const { return m_position; } + size_t specificity() const { return m_specificity; } + size_t position() const { return m_position; } bool match(const SVGElement* element) const; @@ -93,8 +93,8 @@ class RuleData { Selector m_selector; DeclarationList m_declarations; - uint32_t m_specificity; - uint32_t m_position; + size_t m_specificity; + size_t m_position; }; inline bool operator<(const RuleData& a, const RuleData& b) { return a.isLessThan(b); } @@ -303,7 +303,7 @@ class StyleSheet { static bool parseSimpleSelector(std::string_view& input, SimpleSelector& simpleSelector); RuleDataList m_rules; - uint32_t m_position{0}; + size_t m_position{0}; }; bool StyleSheet::parseSheet(std::string_view input) @@ -332,7 +332,7 @@ bool StyleSheet::parseSheet(std::string_view input) if(!parseRule(input, rule)) return false; for(const auto& selector : rule.selectors) { - uint32_t specificity = 0; + size_t specificity = 0; for(const auto& simpleSelector : selector) { specificity += (simpleSelector.id == ElementID::Star) ? 0x0 : 0x1; for(const auto& attributeSelector : simpleSelector.attributeSelectors) { diff --git a/source/svgtextelement.h b/source/svgtextelement.h index 09deeea..fd55609 100644 --- a/source/svgtextelement.h +++ b/source/svgtextelement.h @@ -18,16 +18,16 @@ struct SVGCharacterPosition { std::optional rotate; }; -using SVGCharacterPositions = std::map; +using SVGCharacterPositions = std::map; struct SVGTextPosition { - SVGTextPosition(const SVGNode* node, uint32_t startOffset, uint32_t endOffset) + SVGTextPosition(const SVGNode* node, size_t startOffset, size_t endOffset) : node(node), startOffset(startOffset), endOffset(endOffset) {} const SVGNode* node; - uint32_t startOffset; - uint32_t endOffset; + size_t startOffset; + size_t endOffset; }; using SVGTextPositionList = std::vector; @@ -35,8 +35,8 @@ using SVGTextPositionList = std::vector; struct SVGTextFragment { explicit SVGTextFragment(const SVGTextPositioningElement* element) : element(element) {} const SVGTextPositioningElement* element; - uint32_t offset = 0; - uint32_t length = 0; + size_t offset = 0; + size_t length = 0; float x = 0; float y = 0; float angle = 0; @@ -60,7 +60,7 @@ class SVGTextFragmentsBuilder { SVGTextFragmentList& m_fragments; SVGCharacterPositions m_characterPositions; SVGTextPositionList m_textPositions; - uint32_t m_characterOffset = 0; + size_t m_characterOffset = 0; float m_x = 0; float m_y = 0; };