Fix Svace issue about font variations.

Change-Id: Ib022243ffd5d8d56e062ab0e1e58e65580f25f5d

diff --git a/dali/internal/text/text-abstraction/plugin/font-client-plugin-cache-handler.h b/dali/internal/text/text-abstraction/plugin/font-client-plugin-cache-handler.h
index 078a5dc58a9bd6b7b58f5d85e64dbc711d3d8e1e..4fffd12e790d2b8b0ff619feeb25bf439ee010dc 100644 (file)
--- a/dali/internal/text/text-abstraction/plugin/font-client-plugin-cache-handler.h
+++ b/dali/internal/text/text-abstraction/plugin/font-client-plugin-cache-handler.h
@@ -509,7 +509,6 @@ private:
   CacheHandler(const CacheHandler&) = delete;
   CacheHandler& operator=(const CacheHandler&) = delete;
 
-  std::size_t mFontDescriptionSizeCacheMaxSize; ///< The maximum capacity of font description size cache.
   using DescriptionCacheContainer = LRUCacheContainer<FontDescriptionSizeCacheKey, FontCacheIndex, FontDescriptionSizeCacheKeyHash>;
 
 public:                                    // Cache container list

diff --git a/dali/internal/text/text-abstraction/plugin/font-client-plugin-impl.cpp b/dali/internal/text/text-abstraction/plugin/font-client-plugin-impl.cpp
index 9964ac037352c3a129663fc8cf92f1e15eca2b05..a094f13aef210e2c52f7578700cab2fa369b5e20 100644 (file)
--- a/dali/internal/text/text-abstraction/plugin/font-client-plugin-impl.cpp
+++ b/dali/internal/text/text-abstraction/plugin/font-client-plugin-impl.cpp
@@ -809,7 +809,7 @@ FontId FontClient::Plugin::GetFontId(const FontDescription& fontDescription,
       // So set cacheDescription=false, that we don't call CacheFontPath().
       fontId = GetFontIdByPath(description.path, requestedPointSize, faceIndex, false, variationsMapPtr);
 
-      if(mCacheHandler->IsFontIdCacheItemExist(fontId - 1u))
+      if(fontId > 0u && mCacheHandler->IsFontIdCacheItemExist(fontId - 1u))
       {
         fontCacheIndex = mCacheHandler->FindFontIdCacheItem(fontId - 1u).index;
         mCacheHandler->FindFontFaceCacheItem(fontCacheIndex).mCharacterSet = FcCharSetCopy(mCacheHandler->mCharacterSetCache[fontDescriptionId - 1u]);

diff --git a/dali/internal/text/text-abstraction/plugin/lru-cache-container.h b/dali/internal/text/text-abstraction/plugin/lru-cache-container.h
index 651c3e7f6d93afb76106bee6e8e7b731737a15b4..3b3954582ce19255aaa9001996f6dc71a2980037 100644 (file)
--- a/dali/internal/text/text-abstraction/plugin/lru-cache-container.h
+++ b/dali/internal/text/text-abstraction/plugin/lru-cache-container.h
@@ -545,7 +545,7 @@ private:
 
     CacheId     prev{CACHE_FOOTER_ID};
     CacheId     next{CACHE_HEADER_ID};
-    ElementType element;
+    ElementType element{};
 
     using CacheIdIterator = typename CacheIdContainer::iterator;