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 2aa1bce..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 );
 }
 
-bool AtlasManager::Add( const BufferImage& image,
+bool AtlasManager::Add( const PixelData& image,
                         AtlasManager::AtlasSlot& slot,
                         AtlasManager::AtlasId atlas )
 {
@@ -78,7 +78,7 @@ void AtlasManager::GenerateMeshData( ImageId id,
                                              addReference );
 }
 
-Dali::Atlas AtlasManager::GetAtlasContainer( AtlasId atlas ) const
+Dali::Texture AtlasManager::GetAtlasContainer( AtlasId atlas ) const
 {
   return GetImplementation(*this).GetAtlasContainer( atlas );
 }
@@ -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