From 6a12eb712e93295b9827dd553eb7301fc7a699fc Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 27 Mar 2018 15:04:35 +0900 Subject: [PATCH] Revert "[Tizen] Support custom fonts registration" This reverts commit 465548136ccad6bd7a8a54ef884af81613e609bc. Change-Id: I65de724fc5f9eb2086a2feb484d2732658526243 --- dali/devel-api/text-abstraction/font-client.cpp | 5 ----- dali/devel-api/text-abstraction/font-client.h | 9 --------- dali/internal/text/text-abstraction/font-client-impl.cpp | 7 ------- dali/internal/text/text-abstraction/font-client-impl.h | 5 ----- dali/internal/text/text-abstraction/font-client-plugin-impl.cpp | 6 ------ dali/internal/text/text-abstraction/font-client-plugin-impl.h | 5 ----- 6 files changed, 37 deletions(-) diff --git a/dali/devel-api/text-abstraction/font-client.cpp b/dali/devel-api/text-abstraction/font-client.cpp index fb11e5c..43519c8 100644 --- 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 951d4ae..8c8cfca 100644 --- a/dali/devel-api/text-abstraction/font-client.h +++ b/dali/devel-api/text-abstraction/font-client.h @@ -405,15 +405,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 6c71899..2d47928 100644 --- 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 13d847b..cfa3a20 100644 --- 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 3c40da8..6e91eb5 100644 --- 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( 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 4f1e344..969f160 100644 --- 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: /** -- 2.7.4