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
[3.0] Text - Fix for emojis resampling.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
index
5a46ef5
..
743bc6c
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
@@
-69,7
+69,7
@@
AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl)
}
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
}
void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph,
- const
BufferImage
& bitmap,
+ const
PixelData
& bitmap,
AtlasManager::AtlasSlot& slot )
{
GetImplementation(*this).Add( glyph, bitmap, slot );
AtlasManager::AtlasSlot& slot )
{
GetImplementation(*this).Add( glyph, bitmap, slot );
@@
-106,9
+106,9
@@
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
return GetImplementation(*this).GetPixelFormat( atlasId );
}
return GetImplementation(*this).GetPixelFormat( atlasId );
}
-
Material AtlasGlyphManager::GetMaterial
( uint32_t atlasId ) const
+
TextureSet AtlasGlyphManager::GetTextures
( uint32_t atlasId ) const
{
{
- return GetImplementation(*this).Get
Material
( atlasId );
+ return GetImplementation(*this).Get
Textures
( atlasId );
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()