X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Ftext%2Ftext-abstraction%2Ffont-client-plugin-impl.cpp;h=65ca24ea776d1a2157c0aadba89ab321a67b24b8;hb=8c25130e1ea3682bfac08c25c47b8199226cd92f;hp=3c40da8694b55eea349193a22b5adbc689f287b1;hpb=465548136ccad6bd7a8a54ef884af81613e609bc;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git 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..65ca24e 100644 --- a/dali/internal/text/text-abstraction/font-client-plugin-impl.cpp +++ b/dali/internal/text/text-abstraction/font-client-plugin-impl.cpp @@ -1009,7 +1009,7 @@ bool FontClient::Plugin::GetBitmapMetrics( GlyphInfo* array, else #endif { - int error = FT_Load_Glyph( ftFace, glyph.index, FT_LOAD_DEFAULT ); + int error = FT_Load_Glyph( ftFace, glyph.index, FT_LOAD_NO_AUTOHINT ); if( FT_Err_Ok == error ) { @@ -1102,7 +1102,7 @@ void FontClient::Plugin::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, Dal else #endif { - error = FT_Load_Glyph( ftFace, glyphIndex, FT_LOAD_DEFAULT ); + error = FT_Load_Glyph( ftFace, glyphIndex, FT_LOAD_NO_AUTOHINT ); } if( FT_Err_Ok == error ) { @@ -1430,23 +1430,25 @@ _FcFontSet* FontClient::Plugin::GetFcFontSet() const // a pattern holds a set of names, each name refers to a property of the font FcPattern* pattern = FcPatternCreate(); + FcFontSet* fontset = NULL; + // create an object set used to define which properties are to be returned in the patterns from FcFontList. FcObjectSet* objectSet = FcObjectSetCreate(); - // build an object set from a list of property names - FcObjectSetAdd( objectSet, FC_FILE ); - FcObjectSetAdd( objectSet, FC_FAMILY ); - FcObjectSetAdd( objectSet, FC_WIDTH ); - FcObjectSetAdd( objectSet, FC_WEIGHT ); - FcObjectSetAdd( objectSet, FC_SLANT ); - - // get a list of fonts - // creates patterns from those fonts containing only the objects in objectSet and returns the set of unique such patterns - FcFontSet* fontset = FcFontList( NULL /* the default configuration is checked to be up to date, and used */, pattern, objectSet ); - - // clear up the object set if( objectSet ) { + // build an object set from a list of property names + FcObjectSetAdd( objectSet, FC_FILE ); + FcObjectSetAdd( objectSet, FC_FAMILY ); + FcObjectSetAdd( objectSet, FC_WIDTH ); + FcObjectSetAdd( objectSet, FC_WEIGHT ); + FcObjectSetAdd( objectSet, FC_SLANT ); + + // get a list of fonts + // creates patterns from those fonts containing only the objects in objectSet and returns the set of unique such patterns + fontset = FcFontList( NULL /* the default configuration is checked to be up to date, and used */, pattern, objectSet ); + + // clear up the object set FcObjectSetDestroy( objectSet ); } // clear up the pattern