Revert "[Tizen] Support custom fonts registration"

This reverts commit 3c558a47e427220cd9f88cd94af5fcdc0d12d4fa.

diff --git a/dali/devel-api/text-abstraction/font-client.cpp b/dali/devel-api/text-abstraction/font-client.cpp
index fb11e5c503a237da83e26989a10930ffc71a2482..43519c81634a96bb7b98812ff1905bd2a2a1e186 100644 (file)
--- a/dali/devel-api/text-abstraction/font-client.cpp
+++ b/dali/devel-api/text-abstraction/font-client.cpp
@@ -207,11 +207,6 @@ bool FontClient::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
   return GetImplementation(*this).IsColorGlyph( fontId, glyphIndex );
 }
 
-bool FontClient::AddCustomFontDirectory( const FontPath& path )
-{
-  return GetImplementation(*this).AddCustomFontDirectory( path );
-}
-
 FontClient::FontClient( Internal::FontClient* internal )
 : BaseHandle( internal )
 {

diff --git a/dali/devel-api/text-abstraction/font-client.h b/dali/devel-api/text-abstraction/font-client.h
index 5cfe938614463caff9a46d8202cbf317918be075..6411b1689df24f42764183813c4750f7e83aa190 100755 (executable)
--- a/dali/devel-api/text-abstraction/font-client.h
+++ b/dali/devel-api/text-abstraction/font-client.h
@@ -406,15 +406,6 @@ public:
    */
   bool IsColorGlyph( FontId fontId, GlyphIndex glyphIndex );
 
-  /**
-   * @brief  Add custom fonts directory
-   *
-   * @param[in] path to the fonts directory
-   *
-   * @return true if the fonts can be added.
-   */
-  bool AddCustomFontDirectory( const FontPath& path );
-
 public: // Not intended for application developers
   /**
    * @brief This constructor is used by FontClient::Get().

diff --git a/dali/internal/text/text-abstraction/font-client-impl.cpp b/dali/internal/text/text-abstraction/font-client-impl.cpp
index 6c71899df4155a83c33b00d76820f7d8b95f1673..2d47928cd06e7470cbf1a94f3cc41841fef1ba8e 100644 (file)
--- a/dali/internal/text/text-abstraction/font-client-impl.cpp
+++ b/dali/internal/text/text-abstraction/font-client-impl.cpp
@@ -281,13 +281,6 @@ bool FontClient::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
   return mPlugin->IsColorGlyph( fontId, glyphIndex );
 }
 
-bool FontClient::AddCustomFontDirectory( const FontPath& path )
-{
-  CreatePlugin();
-
-  return mPlugin->AddCustomFontDirectory( path );
-}
-
 void FontClient::CreatePlugin()
 {
   if( !mPlugin )

diff --git a/dali/internal/text/text-abstraction/font-client-impl.h b/dali/internal/text/text-abstraction/font-client-impl.h
index 13d847bbe13422917309d018309badfb822006fd..cfa3a20c54bb2d25f35a9232360ffd21928ba499 100644 (file)
--- a/dali/internal/text/text-abstraction/font-client-impl.h
+++ b/dali/internal/text/text-abstraction/font-client-impl.h
@@ -193,11 +193,6 @@ public:
    */
   bool IsColorGlyph( FontId fontId, GlyphIndex glyphIndex );
 
-  /**
-   * @copydoc Dali::TextAbstraction::FontClient::AddCustomFontDirectory()
-   */
-  bool AddCustomFontDirectory( const FontPath& path );
-
 private:
 
   /**

diff --git a/dali/internal/text/text-abstraction/font-client-plugin-impl.cpp b/dali/internal/text/text-abstraction/font-client-plugin-impl.cpp
index f7fc5cbb026d943b78566e2a23f0e094ba539811..14efb7b56135101d22c5f6c2acbf365035b57bb7 100644 (file)
--- a/dali/internal/text/text-abstraction/font-client-plugin-impl.cpp
+++ b/dali/internal/text/text-abstraction/font-client-plugin-impl.cpp
@@ -1274,12 +1274,6 @@ bool FontClient::Plugin::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
   return FT_Err_Ok == error;
 }
 
-bool FontClient::Plugin::AddCustomFontDirectory( const FontPath& path )
-{
-  // NULL as first parameter means the current configuration is used.
-  return FcConfigAppFontAddDir( NULL, reinterpret_cast<const FcChar8 *>( path.c_str() ) );
-}
-
 void FontClient::Plugin::InitSystemFonts()
 {
   DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::InitSystemFonts\n" );

diff --git a/dali/internal/text/text-abstraction/font-client-plugin-impl.h b/dali/internal/text/text-abstraction/font-client-plugin-impl.h
index 0af3278b3d73cb1af57050ef3519dc3ece913d9e..3ada20cb08d09109cf7a0c31a58c3a4ccd2b3bed 100644 (file)
--- a/dali/internal/text/text-abstraction/font-client-plugin-impl.h
+++ b/dali/internal/text/text-abstraction/font-client-plugin-impl.h
@@ -321,11 +321,6 @@ struct FontClient::Plugin
    */
   bool IsColorGlyph( FontId fontId, GlyphIndex glyphIndex );
 
-  /**
-   * @copydoc Dali::TextAbstraction::FontClient::AddCustomFontDirectory()
-   */
-  bool AddCustomFontDirectory( const FontPath& path );
-
 private:
 
   /**