X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage-atlas-manager.h;h=45e2a54e605d7f22d7b69064a6fa4dcdde152be3;hb=74f25e93f1094929c90c1632b686e9bfa03bd017;hp=6553ed95777dff583aaaec679135792bdca39aa8;hpb=146486a8c7410a2f2a20a6d670145fe855672b96;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/image-atlas-manager.h b/dali-toolkit/internal/visuals/image-atlas-manager.h
index 6553ed9..45e2a54 100644
--- a/dali-toolkit/internal/visuals/image-atlas-manager.h
+++ b/dali-toolkit/internal/visuals/image-atlas-manager.h
@@ -24,7 +24,7 @@
 #include <dali/public-api/rendering/texture-set.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/image-atlas/image-atlas.h>
+#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
 
 namespace Dali
 {
@@ -32,6 +32,8 @@ namespace Dali
 namespace Toolkit
 {
 
+class AtlasUploadObserver;
+
 namespace Internal
 {
 
@@ -62,17 +64,18 @@ public:
    *
    * @param [out] textureRect The texture area of the resource image in the atlas.
    * @param [in] url The URL of the resource image file to use.
-   * @param [in] size The width and height to fit the loaded image to.
+   * @param [in, out] size The width and height to fit the loaded image to.
    * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
    * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
+   * @param [in] atlasUploadObserver The object to observe the uploading state inside ImageAtlas.
    * @return The texture set containing the image.
    */
   TextureSet Add( Vector4& textureRect,
-                const std::string& url,
-                ImageDimensions size = ImageDimensions(),
-                FittingMode::Type fittingMode = FittingMode::DEFAULT,
-                bool orientationCorrection = true );
-
+                  const std::string& url,
+                  ImageDimensions& size,
+                  FittingMode::Type fittingMode = FittingMode::DEFAULT,
+                  bool orientationCorrection = true,
+                  AtlasUploadObserver* atlasUploadObserver = NULL );
   /**
    * @brief Add a pixel buffer to the atlas
    *
@@ -117,7 +120,7 @@ protected:
   /**
    * Destructor
    */
-  virtual ~ImageAtlasManager();
+  ~ImageAtlasManager() override;
 
   /**
    * Undefined copy constructor.