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-impl.cpp;h=8532b93ef1b42ef77bb498f3cc372d33f52e3ed9;hp=f40b3a4b07c505e870c01a7757daaecb93503faa;hb=6f990775daf7adf6170db59f0b99e00ae25fceed;hpb=ab01efc8b47c89288c7fbc9948dead57d0411c1f;ds=sidebyside diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp index f40b3a4..8532b93 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp @@ -89,7 +89,7 @@ AtlasGlyphManager::AtlasGlyphManager() } void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, - const BufferImage& bitmap, + const PixelData& bitmap, Dali::Toolkit::AtlasManager::AtlasSlot& slot ) { DALI_LOG_INFO( gLogFilter, Debug::General, "Added glyph, font: %d index: %d\n", glyph.fontId, glyph.index ); @@ -97,9 +97,9 @@ void AtlasGlyphManager::Add( const Text::GlyphInfo& glyph, if ( mAtlasManager.Add( bitmap, slot ) ) { // A new atlas was created so set the texture set details for the atlas - Dali::Atlas atlas = mAtlasManager.GetAtlasContainer( slot.mAtlasId ); + Dali::Texture atlas = mAtlasManager.GetAtlasContainer( slot.mAtlasId ); TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, atlas ); + textureSet.SetTexture( 0u, atlas ); mAtlasManager.SetTextures( slot.mAtlasId, textureSet ); }