X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-Text-Shaping.cpp;h=025dd5427d2d39f337896a7a7eb02cfb1fcee100;hb=10caf1dca0d3b222b74ba3916a84474fbcf8834e;hp=65a56da7007e6e0ded0e67b1f4f1908aac642356;hpb=10b846b1f907673d1c6639e9298e1acda6f0538c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp old mode 100644 new mode 100755 index 65a56da..025dd54 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp @@ -55,8 +55,8 @@ struct GlyphInfoData float yBearing; ///< The distance from the baseline to the topmost border of the glyph float advance; ///< The distance to move the cursor for this glyph float scaleFactor; ///< The scaling applied (fixed-size fonts only) - bool softwareItalic; ///< Whether glyph needs software support to draw italic style - bool softwareBold; ///< Whether glyph needs software support to draw bold style + bool isItalicRequired; ///< Whether the italic style is required. + bool isBoldRequired; ///< Whether the bold style is required. }; bool IsEqualGlyph ( const GlyphInfoData& glyphData, const GlyphInfo& glyph ) @@ -93,11 +93,11 @@ bool IsEqualGlyph ( const GlyphInfoData& glyphData, const GlyphInfo& glyph ) { return false; } - if( glyphData.softwareItalic != glyph.softwareItalic ) + if( glyphData.isItalicRequired != glyph.isItalicRequired ) { return false; } - if( glyphData.softwareBold != glyph.softwareBold ) + if( glyphData.isBoldRequired != glyph.isBoldRequired ) { return false; } @@ -551,15 +551,15 @@ int UtcDaliTextSoftwareStyling(void) struct GlyphInfoData glyphs01[] = { - { 2u, 4857u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f, true, false }, - { 2u, 7316u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f, true, false }, - { 2u, 4364u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f, true, false }, + { 2u, 21154u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, + { 2u, 12298u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, + { 2u, 17828u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, true }, }; struct GlyphInfoData glyphs02[] = { - { 2u, 4857u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f, false, false }, - { 2u, 7316u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f, false, false }, - { 2u, 4364u, 0.f, 0.f, 0.f, 0.f, 15.f, 0.f, true, false }, + { 2u, 21154u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, false }, + { 2u, 12298u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, false, true }, + { 2u, 17828u, 0.f, 0.f, 0.f, 0.f, 16.f, 0.f, true, false }, }; CharacterIndex characterIndices[] = { 0u, 1u, 2u };