GUIFontCache: Switch Lookup to use std::span

Author: neo1973

xbmc/guilib/GUIFontCache.cpp

@@ -84,8 +84,8 @@ class CGUIFontCacheImpl
   explicit CGUIFontCacheImpl(CGUIFontCache<Position, Value>* parent) : m_parent(parent) {}
   Value& Lookup(const CGraphicContext& context,
                 Position& pos,
-                const std::vector<KODI::UTILS::COLOR::Color>& colors,
-                const vecText& text,
+                std::span<const KODI::UTILS::COLOR::Color> colors,
+                std::span<const character_t> text,
                 uint32_t alignment,
                 float maxPixelWidth,
                 bool scrolling,
@@ -131,8 +131,8 @@ CGUIFontCache<Position, Value>::~CGUIFontCache() = default;
 template<class Position, class Value>
 Value& CGUIFontCache<Position, Value>::Lookup(const CGraphicContext& context,
                                               Position& pos,
-                                              const std::vector<KODI::UTILS::COLOR::Color>& colors,
-                                              const vecText& text,
+                                              std::span<const KODI::UTILS::COLOR::Color> colors,
+                                              std::span<const character_t> text,
                                               uint32_t alignment,
                                               float maxPixelWidth,
                                               bool scrolling,
@@ -147,21 +147,19 @@ Value& CGUIFontCache<Position, Value>::Lookup(const CGraphicContext& context,
 }
 
 template<class Position, class Value>
-Value& CGUIFontCacheImpl<Position, Value>::Lookup(
-    const CGraphicContext& context,
-    Position& pos,
-    const std::vector<KODI::UTILS::COLOR::Color>& colors,
-    const vecText& text,
-    uint32_t alignment,
-    float maxPixelWidth,
-    bool scrolling,
-    std::chrono::steady_clock::time_point now,
-    bool& dirtyCache)
+Value& CGUIFontCacheImpl<Position, Value>::Lookup(const CGraphicContext& context,
+                                                  Position& pos,
+                                                  std::span<const KODI::UTILS::COLOR::Color> colors,
+                                                  std::span<const character_t> text,
+                                                  uint32_t alignment,
+                                                  float maxPixelWidth,
+                                                  bool scrolling,
+                                                  std::chrono::steady_clock::time_point now,
+                                                  bool& dirtyCache)
 {
-  const CGUIFontCacheKey<Position> key(
-      pos, const_cast<std::vector<KODI::UTILS::COLOR::Color>&>(colors), const_cast<vecText&>(text),
-      alignment, maxPixelWidth, scrolling, context.GetGUIMatrix(), context.GetGUIScaleX(),
-      context.GetGUIScaleY());
+  const CGUIFontCacheKey<Position> key(pos, colors, text, alignment, maxPixelWidth, scrolling,
+                                       context.GetGUIMatrix(), context.GetGUIScaleX(),
+                                       context.GetGUIScaleY());
 
   auto i = m_list.FindKey(key);
   if (i == m_list.hashMap.end())
@@ -227,8 +225,8 @@ template CGUIFontCacheStaticValue& CGUIFontCache<
     CGUIFontCacheStaticPosition,
     CGUIFontCacheStaticValue>::Lookup(const CGraphicContext& context,
                                       CGUIFontCacheStaticPosition&,
-                                      const std::vector<KODI::UTILS::COLOR::Color>&,
-                                      const vecText&,
+                                      std::span<const KODI::UTILS::COLOR::Color> colors,
+                                      std::span<const character_t> text,
                                       uint32_t,
                                       float,
                                       bool,
@@ -245,8 +243,8 @@ template CGUIFontCacheDynamicValue& CGUIFontCache<
     CGUIFontCacheDynamicPosition,
     CGUIFontCacheDynamicValue>::Lookup(const CGraphicContext& context,
                                        CGUIFontCacheDynamicPosition&,
-                                       const std::vector<KODI::UTILS::COLOR::Color>&,
-                                       const vecText&,
+                                       std::span<const KODI::UTILS::COLOR::Color> colors,
+                                       std::span<const character_t> text,
                                        uint32_t,
                                        float,
                                        bool,

xbmc/guilib/GUIFontCache.h

@@ -160,8 +160,8 @@ class CGUIFontCache
 
   Value& Lookup(const CGraphicContext& context,
                 Position& pos,
-                const std::vector<KODI::UTILS::COLOR::Color>& colors,
-                const vecText& text,
+                std::span<const KODI::UTILS::COLOR::Color> colors,
+                std::span<const character_t> text,
                 uint32_t alignment,
                 float maxPixelWidth,
                 bool scrolling,