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.h;h=75f117a80f80d754c1c7942e68e20c79f4d68b06;hp=34493629cf2e66a2301aeda39e07c59e726a9988;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=90925e62266ce32a326ba2458e9c3d1107244218

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
index 3449362..75f117a 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/texture-set.h>
 
 namespace Dali
 {
@@ -247,7 +247,7 @@ public:
    *
    * @return Pixel format used by this atlas
    */
-  Pixel::Format GetPixelFormat( AtlasId atlas );
+  Pixel::Format GetPixelFormat( AtlasId atlas ) const;
 
   /**
    * @brief Fill in a metrics structure showing current status of this Atlas Manager
@@ -257,21 +257,21 @@ public:
   void GetMetrics( Metrics& metrics );
 
   /**
-   * @brief Get Material used by atlas
+   * @brief Get TextureSet used by atlas
    *
    * @param[in] atlas AtlasId
    *
-   * @return Material used by atlas
+   * @return TextureSet used by atlas
    */
-  Material GetMaterial( AtlasId atlas ) const;
+  TextureSet GetTextures( AtlasId atlas ) const;
 
   /**
-   * @brief Set the material used by an atlas
+   * @brief Set the texture set used by an atlas
    *
    * @param[in] atlas AtlasId
-   * @param[in] material The Material to assign
+   * @param[in] textureSet The texture set to assign
    */
-  void SetMaterial( AtlasId atlas, Material& material );
+  void SetTextures( AtlasId atlas, TextureSet& textureSet );
 
 private: