projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync UTC with text shape method.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-Shaping.cpp
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
index
80624a8
..
301f191
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Shaping.cpp
@@
-87,7
+87,7
@@
bool IsEqualGlyph(const GlyphInfoData& glyphData, const GlyphInfo& glyph)
{
return false;
}
{
return false;
}
- if(fabsf(glyphData.advance - floor(glyph.advance)) > Math::MACHINE_EPSILON_1000)
+ if(
glyphData.advance >= 0.0f &&
fabsf(glyphData.advance - floor(glyph.advance)) > Math::MACHINE_EPSILON_1000)
{
return false;
}
{
return false;
}
@@
-961,9
+961,10
@@
int UtcDaliTextShapeEmojiSequences(void)
bool sizeDefined = false;
// variation selector 16 (Emoji)
bool sizeDefined = false;
// variation selector 16 (Emoji)
+ // Note : Non-scalable font's advance value is undefined. See https://github.com/harfbuzz/harfbuzz/discussions/3023. 2022-06-03 updated.
struct GlyphInfoData glyphsVS16[] =
{
struct GlyphInfoData glyphsVS16[] =
{
- {2u, 74u, 0.f, 0.f, 0.f, 0.f,
39.0f
, 0.f, false, false},
+ {2u, 74u, 0.f, 0.f, 0.f, 0.f,
-1.0f /* Special value that we don't check it */
, 0.f, false, false},
};
CharacterIndex characterIndicesVS16[] = {0u, 1u};
Length charactersPerGlyphVS16[] = {2u};
};
CharacterIndex characterIndicesVS16[] = {0u, 1u};
Length charactersPerGlyphVS16[] = {2u};