X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-manager-impl.h;h=ed51450db9a1855bbf0d1603a009fdf3e2c85d08;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hp=b4828a0c6b0358117ee8060c36dbb98c14515b27;hpb=225ea9dd33c2d8669d8dac1f2b116eeb2ea00c0d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h
index b4828a0..ed51450 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__
-#define __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__
+#ifndef DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H
+#define DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,12 +59,12 @@ public:
    */
   struct AtlasDescriptor
   {
-    Dali::Atlas mAtlas;                                                 // atlas image
+    Dali::Texture mAtlas;                                                 // atlas image
     Toolkit::AtlasManager::AtlasSize mSize;                             // size of atlas
     Pixel::Format mPixelFormat;                                         // pixel format used by atlas
-    BufferImage mHorizontalStrip;                                       // Image used to pad upload
-    BufferImage mVerticalStrip;                                         // Image used to pad upload
-    Material mMaterial;                                                 // material used for atlas texture
+    PixelData mHorizontalStrip;                                       // Image used to pad upload
+    PixelData mVerticalStrip;                                         // Image used to pad upload
+    TextureSet mTextureSet;                                             // Texture set used for atlas texture
     SizeType mTotalBlocks;                                              // total number of blocks in atlas
     SizeType mAvailableBlocks;                                          // number of blocks available in atlas
     Dali::Vector< SizeType > mFreeBlocksList;                           // unless there are any previously freed blocks
@@ -101,7 +101,7 @@ public:
   /**
    * @copydoc Toolkit::AtlasManager::Add
    */
-  bool Add( const BufferImage& image,
+  bool Add( const PixelData& image,
             Toolkit::AtlasManager::AtlasSlot& slot,
             Toolkit::AtlasManager::AtlasId atlas );
 
@@ -121,7 +121,7 @@ public:
   /**
    * @copydoc Toolkit::AtlasManager::GetAtlasContainer
    */
-  Dali::Atlas GetAtlasContainer( AtlasId atlas ) const;
+  Dali::Texture GetAtlasContainer( AtlasId atlas ) const;
 
   /**
    * @copydoc Toolkit::AtlasManager::GetAtlas
@@ -156,7 +156,7 @@ public:
   /**
    * @copydoc Toolkit::AtlasManager::GetPixelFormat
    */
-  Pixel::Format GetPixelFormat( AtlasId atlas );
+  Pixel::Format GetPixelFormat( AtlasId atlas ) const;
 
   /**
    * @copydoc Toolkit::AtlasManager::GetMetrics
@@ -164,28 +164,28 @@ public:
   void GetMetrics( Toolkit::AtlasManager::Metrics& metrics );
 
   /**
-   * @copydoc Toolkit::AtlasManager::GetMaterial
+   * @copydoc Toolkit::AtlasManager::GetTextures
    */
-  Material GetMaterial( AtlasId atlas ) const;
+  TextureSet GetTextures( AtlasId atlas ) const;
 
   /**
-   * @copydoc Toolkit::AtlasManager::SetMaterial
+   * @copydoc Toolkit::AtlasManager::SetTextures
    */
-  void SetMaterial( AtlasId atlas, Material& material );
+  void SetTextures( AtlasId atlas, TextureSet& textureSet );
 
 private:
 
   std::vector< AtlasDescriptor > mAtlasList;            // List of atlases created
   Vector< AtlasSlotDescriptor > mImageList;             // List of bitmaps stored in atlases
   Toolkit::AtlasManager::AtlasSize mNewAtlasSize;       // Atlas size to use in next creation
-  Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy;  // Policy for faling to add an Image
+  Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy;  // Policy for failing to add an Image
 
   SizeType CheckAtlas( SizeType atlas,
                        SizeType width,
                        SizeType height,
                        Pixel::Format pixelFormat );
 
-  void UploadImage( const BufferImage& image,
+  void UploadImage( const PixelData& image,
                     const AtlasSlotDescriptor& desc );
 
 };
@@ -215,4 +215,4 @@ inline Internal::AtlasManager& GetImplementation(Toolkit::AtlasManager& manager)
 } // namespace Dali
 
 
- #endif // __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__
+ #endif // DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H