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=510da05befb8b13047ac12dae8426992203e1893;hp=d28b58630831c76b19e942acc041eadd19944905;hb=6f990775daf7adf6170db59f0b99e00ae25fceed;hpb=ab01efc8b47c89288c7fbc9948dead57d0411c1f 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 --- 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 ); }