Merge remote-tracking branch 'origin/tizen' into new_text

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

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
index 14f6c72..6f1411e 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
@@ -65,6 +65,9 @@ public:
     SizeType mBlockWidth;                                               // width of a block in atlas
     SizeType mBlockHeight;                                              // height of a block in atlas
     Pixel::Format mPixelFormat;                                         // pixel format used by atlas
+    BufferImage mHorizontalStrip;                                       // Image used to pad upload
+    BufferImage mVerticalStrip;                                         // Image used to pad upload
+    PixelBuffer* mStripBuffer;                                          // Blank image buffer used to pad upload
     Material mMaterial;                                                 // material used for atlas texture
     SizeType mNextFreeBlock;                                            // next free block will be placed here ( actually +1 )
     Dali::Vector< SizeType > mFreeBlocksList;                           // unless there are any previously freed blocks
@@ -146,10 +149,15 @@ public:
   AtlasId GetAtlas( ImageId id ) const;
 
   /**
-   * @copydoc Toolkit::AtlasManager::SetAtlasSize
+   * @copydoc Toolkit::AtlasManager::SetNewAtlasSize
    */
-  void SetAtlasSize( const Vector2& size,
-                     const Vector2& blockSize );
+  void SetNewAtlasSize( const Vector2& size,
+                        const Vector2& blockSize );
+
+  /**
+   * @copydoc Toolkit::AtlasManager::GetAtlasSize
+   */
+  Vector2 GetAtlasSize( AtlasId atlas );
 
   /**
    * @copydoc Toolkit::AtlasManager::GetBlockSize
@@ -171,6 +179,11 @@ public:
    */
   Pixel::Format GetPixelFormat( AtlasId atlas );
 
+  /**
+   * @copydoc Toolkit::AtlasManager::GetMetrics
+   */
+  void GetMetrics( Toolkit::AtlasManager::Metrics& metrics );
+
 private:
 
   std::vector< AtlasDescriptor > mAtlasList;        // List of atlases created