Merge changes Ib7c620f5,I75f6d47b into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / atlas / atlas-manager-impl.h

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 e86bda1..dc48498 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h
@@ -59,11 +59,11 @@ 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
+    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
@@ -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
@@ -178,14 +178,14 @@ 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 );
 
 };