X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager-impl.h;h=a2232f9405625cff88855b9d49161019fe19d4f4;hb=08a5346b49f4ca8234bf97750e1e030ef89b2750;hp=90210f2f3d7231901f4d11899b81d0cd01e40c0c;hpb=eb52cb9cbb74e37ebdc1c18619af597e2b595b08;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h index 90210f2..a2232f9 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h @@ -70,7 +70,7 @@ public: * @copydoc Toolkit::AtlasGlyphManager::Add */ void Add( const Text::GlyphInfo& glyph, - const BufferImage& bitmap, + const PixelData& bitmap, Dali::Toolkit::AtlasManager::AtlasSlot& slot ); /** @@ -113,11 +113,6 @@ public: TextureSet GetTextures( uint32_t atlasId ) const; /** - * @copydoc Toolkit::AtlasGlyphManager::GetShader - */ - Shader GetShader( uint32_t atlasId ) const; - - /** * @copydoc Toolkit::AtlasGlyphManager::GetMetrics */ const Toolkit::AtlasGlyphManager::Metrics& GetMetrics(); @@ -134,9 +129,6 @@ private: Dali::Toolkit::AtlasManager mAtlasManager; ///> Atlas Manager created by GlyphManager std::vector< FontGlyphRecord > mFontGlyphRecords; Toolkit::AtlasGlyphManager::Metrics mMetrics; ///> Metrics to pass back on GlyphManager status - - Shader mShaderL8; - Shader mShaderRgba; }; } // namespace Internal