Merge "Change not to use the mask if it is set to an empty path" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / npatch-loader.h

diff --git a/dali-toolkit/internal/visuals/npatch-loader.h b/dali-toolkit/internal/visuals/npatch-loader.h
index 0d39d0d..58bd73f 100644 (file)
--- 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,13 +57,19 @@ public:
   struct Data
   {
     Data()
-    : loadCompleted( false )
+    : url(),
+      textureSet(),
+      hash( 0 ),
+      croppedWidth( 0 ),
+      croppedHeight( 0 ),
+      border( 0, 0, 0, 0 ),
+      loadCompleted( false )
     {}
 
     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
+    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