X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Ftext%2Ftext-abstraction%2Ffont-client-impl.cpp;h=3d0f72b4bfda0f4fc66c0bf3a1540431290d9592;hb=064bd8be3d1eaa92475030caf03f732da76aaaaa;hp=2d47928cd06e7470cbf1a94f3cc41841fef1ba8e;hpb=5d06cfffe0944a257d814b3a4165afa239808cd8;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/text/text-abstraction/font-client-impl.cpp b/dali/internal/text/text-abstraction/font-client-impl.cpp index 2d47928..3d0f72b 100644 --- a/dali/internal/text/text-abstraction/font-client-impl.cpp +++ b/dali/internal/text/text-abstraction/font-client-impl.cpp @@ -37,7 +37,7 @@ namespace Internal { FontClient::FontClient() -: mPlugin( NULL ), +: mPlugin( nullptr ), mDpiHorizontal( 0 ), mDpiVertical( 0 ) { @@ -246,11 +246,11 @@ bool FontClient::GetGlyphMetrics( GlyphInfo* array, uint32_t size, GlyphType typ return mPlugin->GetGlyphMetrics( array, size, type, horizontal ); } -void FontClient::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, Dali::TextAbstraction::FontClient::GlyphBufferData& data, int outlineWidth ) +void FontClient::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, bool softwareItalic, bool softwareBold, Dali::TextAbstraction::FontClient::GlyphBufferData& data, int outlineWidth ) { CreatePlugin(); - mPlugin->CreateBitmap( fontId, glyphIndex, data, outlineWidth ); + mPlugin->CreateBitmap( fontId, glyphIndex, softwareItalic, softwareBold, data, outlineWidth ); } PixelData FontClient::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, int outlineWidth ) @@ -281,6 +281,20 @@ bool FontClient::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex ) return mPlugin->IsColorGlyph( fontId, glyphIndex ); } +FT_FaceRec_* FontClient::GetFreetypeFace( FontId fontId ) +{ + CreatePlugin(); + + return mPlugin->GetFreetypeFace( fontId ); +} + +bool FontClient::AddCustomFontDirectory( const FontPath& path ) +{ + CreatePlugin(); + + return mPlugin->AddCustomFontDirectory( path ); +} + void FontClient::CreatePlugin() { if( !mPlugin )