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
Changed Atlas manager to use Dali::Texture instead of Dali::Atlas
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-manager.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
index
d28b586
..
510da05
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp
@@
-55,7
+55,7
@@
void AtlasManager::SetAddPolicy( AddFailPolicy policy )
GetImplementation(*this).SetAddPolicy( policy );
}
GetImplementation(*this).SetAddPolicy( policy );
}
-bool AtlasManager::Add( const
BufferImage
& image,
+bool AtlasManager::Add( const
PixelData
& image,
AtlasManager::AtlasSlot& slot,
AtlasManager::AtlasId atlas )
{
AtlasManager::AtlasSlot& slot,
AtlasManager::AtlasId atlas )
{
@@
-78,7
+78,7
@@
void AtlasManager::GenerateMeshData( ImageId id,
addReference );
}
addReference );
}
-Dali::
Atlas
AtlasManager::GetAtlasContainer( AtlasId atlas ) const
+Dali::
Texture
AtlasManager::GetAtlasContainer( AtlasId atlas ) const
{
return GetImplementation(*this).GetAtlasContainer( atlas );
}
{
return GetImplementation(*this).GetAtlasContainer( atlas );
}