X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-manager.cpp;h=d28b58630831c76b19e942acc041eadd19944905;hp=2aa1bce6b7d1e18986f5af26b71e83a48f06a6b8;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=a9e64686388c10743bf66a9c5d6e0aa06e198c70 diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp index 2aa1bce..d28b586 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.cpp @@ -108,7 +108,7 @@ AtlasManager::SizeType AtlasManager::GetAtlasCount() const return GetImplementation(*this).GetAtlasCount(); } -Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas ) +Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas ) const { return GetImplementation(*this).GetPixelFormat( atlas ); } @@ -118,14 +118,14 @@ void AtlasManager::GetMetrics( Metrics& metrics ) GetImplementation(*this).GetMetrics( metrics ); } -Material AtlasManager::GetMaterial( AtlasId atlas ) const +TextureSet AtlasManager::GetTextures( AtlasId atlas ) const { - return GetImplementation(*this).GetMaterial( atlas ); + return GetImplementation(*this).GetTextures( atlas ); } -void AtlasManager::SetMaterial( AtlasId atlas, Material& material ) +void AtlasManager::SetTextures( AtlasId atlas, TextureSet& textureSet ) { - GetImplementation(*this).SetMaterial( atlas, material ); + GetImplementation(*this).SetTextures( atlas, textureSet ); } } // namespace Toolkit