X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fnpatch-loader.h;h=2c0e8520dde84ab1b1bf4489e1c61eff87c0d1ab;hp=0d39d0d7aea9edd4d169c428c7711aa87f5455a5;hb=666b4b2f13d2f417557180a8440c6686c5dbfe83;hpb=4cc02f3e2045755c2c65e64a6f5e126a4c6208ea

diff --git a/dali-toolkit/internal/visuals/npatch-loader.h b/dali-toolkit/internal/visuals/npatch-loader.h
index 0d39d0d..2c0e852 100644
--- a/dali-toolkit/internal/visuals/npatch-loader.h
+++ b/dali-toolkit/internal/visuals/npatch-loader.h
@@ -20,12 +20,12 @@
 // EXTERNAL INCLUDES
 #include <string>
 #include <dali/public-api/rendering/texture-set.h>
-#include <dali/public-api/math/uint-16-pair.h>
 #include <dali/devel-api/common/owner-container.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
 
-// INTERNAL HEADERS
+// INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/texture-manager-impl.h>
+#include <dali-toolkit/devel-api/utility/npatch-utilities.h>
 
 namespace Dali
 {
@@ -36,13 +36,6 @@ namespace Toolkit
 namespace Internal
 {
 
-namespace NPatchBuffer
-{
-
-void GetRedOffsetAndMask( Dali::Pixel::Format pixelFormat, int& byteOffset, int& bitMask );
-
-} // namespace NPatchBuffer
-
 /**
  * The manager for loading Npatch textures.
  * It caches them internally for better performance; i.e. to avoid loading and
@@ -56,8 +49,6 @@ class NPatchLoader
 {
 public:
 
-  typedef Dali::Vector< Uint16Pair > StretchRanges;
-
   enum
   {
     UNINITIALIZED_ID = 0 ///< uninitialised id, use to initialize ids
@@ -66,18 +57,28 @@ public:
   struct Data
   {
     Data()
-    : loadCompleted( false )
+    : url(),
+      textureSet(),
+      hash( 0 ),
+      croppedWidth( 0 ),
+      croppedHeight( 0 ),
+      border( 0, 0, 0, 0 ),
+      loadCompleted( false ),
+      renderingMap{ nullptr }
     {}
 
-    std::string url;                              ///< Url of the N-Patch
-    TextureSet textureSet;                        ///< Texture containing the cropped image
-    StretchRanges stretchPixelsX;                 ///< X stretch pixels
-    StretchRanges stretchPixelsY;                 ///< Y stretch pixels
-    std::size_t hash;                             ///< Hash code for the Url
-    uint32_t croppedWidth;                        ///< Width of the cropped middle part of N-patch
-    uint32_t croppedHeight;                       ///< Height of the cropped middle part of N-patch
-    Rect< int > border;                           ///< The size of the border
-    bool loadCompleted;                           ///< True if the data loading is completed
+    ~Data();
+
+    std::string url;                               ///< Url of the N-Patch
+    TextureSet textureSet;                         ///< Texture containing the cropped image
+    NPatchUtility::StretchRanges stretchPixelsX;   ///< X stretch pixels
+    NPatchUtility::StretchRanges stretchPixelsY;   ///< Y stretch pixels
+    std::size_t hash;                              ///< Hash code for the Url
+    uint32_t croppedWidth;                         ///< Width of the cropped middle part of N-patch
+    uint32_t croppedHeight;                        ///< Height of the cropped middle part of N-patch
+    Rect< int > border;                            ///< The size of the border
+    bool loadCompleted;                            ///< True if the data loading is completed
+    void* renderingMap;                            ///< NPatch rendering data
   };
 
 public: