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-glyph-manager.cpp;h=304a5318a688db52d56e1cce37823f2fc364736f;hp=729201208f00d47443016995883bf70f32230984;hb=31df2b9472ccbe0ae460a958535be8ef790c96f2;hpb=c6032a09ae68156bcdaef2f09fbb4617245bc75f 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 7292012..304a531 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp @@ -69,11 +69,12 @@ AtlasGlyphManager::AtlasGlyphManager(Internal::AtlasGlyphManager *impl) { } -void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, +void AtlasGlyphManager::Add( Text::FontId fontId, + const Text::GlyphInfo& glyph, const BufferImage& bitmap, AtlasManager::AtlasSlot& slot ) { - GetImplementation(*this).Add( glyph, bitmap, slot ); + GetImplementation(*this).Add( fontId, glyph, bitmap, slot ); } void AtlasGlyphManager::GenerateMeshData( uint32_t imageId, @@ -91,11 +92,11 @@ void AtlasGlyphManager::StitchMesh( Toolkit::AtlasManager::Mesh2D& first, GetImplementation(*this).StitchMesh( first, second ); } -void AtlasGlyphManager::Cached( Text::FontId fontId, +bool AtlasGlyphManager::Cached( Text::FontId fontId, Text::GlyphIndex index, AtlasManager::AtlasSlot& slot ) { - GetImplementation(*this).Cached( fontId, index, slot ); + return GetImplementation(*this).Cached( fontId, index, slot ); } void AtlasGlyphManager::SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight ) @@ -108,11 +109,6 @@ Vector2 AtlasGlyphManager::GetAtlasSize( uint32_t atlasId ) return GetImplementation(*this).GetAtlasSize( atlasId ); } -void AtlasGlyphManager::Remove( uint32_t imageId ) -{ - GetImplementation(*this).Remove( imageId ); -} - Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId ) { return GetImplementation(*this).GetPixelFormat( atlasId ); @@ -133,6 +129,11 @@ const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics() return GetImplementation(*this).GetMetrics(); } +void AtlasGlyphManager::AdjustReferenceCount( Text::FontId fontId, uint32_t imageId, int32_t delta ) +{ + GetImplementation(*this).AdjustReferenceCount( fontId, imageId, delta ); +} + Shader AtlasGlyphManager::GetEffectBufferShader() const { return GetImplementation(*this).GetEffectBufferShader();