From 33078111a014b6a312f16a4cac3a71d308d2310f Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 5 Dec 2023 16:36:39 +0000 Subject: [PATCH] Fixed SVACE errors Change-Id: Idf920c3e39dceca7b34d2eedd8a875f9330739a9 --- .../text-abstraction/plugin/font-client-plugin-impl.cpp | 6 +++--- .../text/text-abstraction/plugin/harfbuzz-proxy-font.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 faebc9c16..d31df24bc 100644 --- a/dali/internal/text/text-abstraction/plugin/font-client-plugin-impl.cpp +++ b/dali/internal/text/text-abstraction/plugin/font-client-plugin-impl.cpp @@ -127,7 +127,7 @@ bool IsFitIntoAtlas(FT_Face& ftFace, int& error, const unsigned int& horizontalD error = FT_Set_Char_Size(ftFace, 0, - requestedPointSize, + FT_F26Dot6(requestedPointSize), horizontalDpi, verticalDpi); @@ -321,7 +321,7 @@ void FontClient::Plugin::CacheFontFaceFromFile(const std::string& fontPath) cons } FT_Face ftFace; - int error = FT_New_Face(mFreeTypeLibrary, fontPath.c_str(), 0, &ftFace); + int error = FT_New_Face(mFreeTypeLibrary, fontPath.c_str(), 0, &ftFace); if(FT_Err_Ok != error) { FONT_LOG_MESSAGE(Dali::Integration::Log::ERROR, "Failed to load font face : %s\n", fontPath.c_str()); @@ -1285,7 +1285,7 @@ FontId FontClient::Plugin::CreateFont(const FontPath& path, { error = FT_Set_Char_Size(ftFace, 0, - requestedPointSize, + FT_F26Dot6(requestedPointSize), mDpiHorizontal, mDpiVertical); } diff --git a/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp b/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp index 1b206638a..fa09dbe2e 100644 --- a/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp +++ b/dali/internal/text/text-abstraction/plugin/harfbuzz-proxy-font.cpp @@ -380,7 +380,7 @@ void HarfBuzzProxyFont::Impl::CreateHarfBuzzFont(const PointSize26Dot6& requeste // Before create hb_font_t, we must set FT_Char_Size FT_Set_Char_Size(mFreeTypeFace, 0u, - requestedPointSize, + FT_F26Dot6(requestedPointSize), horizontalDpi, verticalDpi); -- 2.34.1