X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager.cpp;h=743bc6c706e8c1dd0d8cd88c5d695071bef1dc10;hb=e8983d597547efef7f2220c07db4d55028c02bd6;hp=37f7ee1e32a1e8e5ec924944212c0d65f749d829;hpb=df5c192e17a7f8be8df32489111f5e6d09974680;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 37f7ee1..743bc6c 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp @@ -22,7 +22,6 @@ #include // INTERNAL INCLUDES -#include #include namespace Dali @@ -70,7 +69,7 @@ AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl) } void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, - const BufferImage& bitmap, + const PixelData& bitmap, AtlasManager::AtlasSlot& slot ) { GetImplementation(*this).Add( glyph, bitmap, slot ); @@ -78,24 +77,18 @@ void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, void AtlasGlyphManager::GenerateMeshData( uint32_t imageId, const Vector2& position, - MeshData& meshData ) + Toolkit::AtlasManager::Mesh2D& mesh ) { GetImplementation(*this).GenerateMeshData( imageId, position, - meshData ); + mesh ); } -void AtlasGlyphManager::StitchMesh( MeshData& first, - const MeshData& second ) +bool AtlasGlyphManager::IsCached( Text::FontId fontId, + Text::GlyphIndex index, + AtlasManager::AtlasSlot& slot ) { - GetImplementation(*this).StitchMesh( first, second ); -} - -void AtlasGlyphManager::Cached( Text::FontId fontId, - Text::GlyphIndex index, - AtlasManager::AtlasSlot& slot ) -{ - GetImplementation(*this).Cached( fontId, index, slot ); + return GetImplementation(*this).IsCached( fontId, index, slot ); } void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight ) @@ -108,14 +101,14 @@ Vector2 AtlasGlyphManager::GetAtlasSize( uint32_t atlasId ) return GetImplementation(*this).GetAtlasSize( atlasId ); } -void AtlasGlyphManager::Remove( uint32_t imageId ) +Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId ) { - GetImplementation(*this).Remove( imageId ); + return GetImplementation(*this).GetPixelFormat( atlasId ); } -Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId ) +TextureSet AtlasGlyphManager::GetTextures( uint32_t atlasId ) const { - return GetImplementation(*this).GetPixelFormat( atlasId ); + return GetImplementation(*this).GetTextures( atlasId ); } const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics() @@ -123,6 +116,11 @@ const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics() return GetImplementation(*this).GetMetrics(); } +void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta ) +{ + GetImplementation(*this).AdjustReferenceCount( fontId, index, delta ); +} + } // namespace Toolkit } // namespace Dali