Fixed SVACE errors

Change-Id: Idf920c3e39dceca7b34d2eedd8a875f9330739a9

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 faebc9c..d31df24 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
@@ -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 1b20663..fa09dbe 100644 (file)
--- 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);