X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fimage-loader%2Fasync-image-loader.h;h=6f73dd05839de1da3191128bcf11b8c10ca19832;hb=c281071e49022c17ca2459c91bfab58c471b05d4;hp=9c021b56220bb2744c283ad451705231399fb2c4;hpb=fbb1f2f599b2fc1a54b327039ce6111f4b4ba4cf;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.h b/dali-toolkit/public-api/image-loader/async-image-loader.h
index 9c021b5..6f73dd0 100644
--- a/dali-toolkit/public-api/image-loader/async-image-loader.h
+++ b/dali-toolkit/public-api/image-loader/async-image-loader.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_H
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,13 @@
  */
 
 // EXTERNAL INCLUDES
-#include <string>
-#include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/images/image-operations.h>
+#include <dali/public-api/object/base-handle.h>
 #include <dali/public-api/signals/dali-signal.h>
+#include <string>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -29,13 +32,17 @@ class PixelData;
 
 namespace Toolkit
 {
-
 namespace Internal DALI_INTERNAL
 {
 class AsyncImageLoader;
 }
 
 /**
+ * @addtogroup dali_toolkit_image_loader
+ * @{
+ */
+
+/**
  * @brief The AsyncImageLoader is used to load pixel data from a URL asynchronously.
  *
  * The images are loaded in a worker thread to avoid blocking the main event thread.
@@ -87,14 +94,12 @@ class AsyncImageLoader;
  *
  * @endcode
  */
-class DALI_IMPORT_API AsyncImageLoader : public BaseHandle
+class DALI_TOOLKIT_API AsyncImageLoader : public BaseHandle
 {
 public:
-
-  typedef Signal< void( uint32_t, PixelData ) > ImageLoadedSignalType; ///< Image loaded signal type @SINCE_1_2_14
+  typedef Signal<void(uint32_t, PixelData)> ImageLoadedSignalType; ///< Image loaded signal type @SINCE_1_2_14
 
 public:
-
   /**
    * @brief Constructor which creates an empty AsyncImageLoader handle.
    * @SINCE_1_2_14
@@ -117,7 +122,15 @@ public:
    *
    * @param[in] handle A reference to the copied handle
    */
-  AsyncImageLoader( const AsyncImageLoader& handle );
+  AsyncImageLoader(const AsyncImageLoader& handle);
+
+  /**
+   * @brief Move constructor
+   * @SINCE_1_9.23
+   *
+   * @param[in] rhs A reference to the moved handle
+   */
+  AsyncImageLoader(AsyncImageLoader&& rhs);
 
   /**
    * @brief This assignment operator is required for (smart) pointer semantics.
@@ -126,7 +139,15 @@ public:
    * @param[in] handle  A reference to the copied handle
    * @return A reference to this
    */
-  AsyncImageLoader& operator=( const AsyncImageLoader& handle );
+  AsyncImageLoader& operator=(const AsyncImageLoader& handle);
+
+  /**
+   * @brief Move assignment
+   * @SINCE_1_9.23
+   *
+   * @param[in] rhs A reference to the moved handle
+   */
+  AsyncImageLoader& operator=(AsyncImageLoader&& rhs);
 
   /**
    * @brief Creates a new loader to load the image asynchronously in a worker thread.
@@ -146,7 +167,7 @@ public:
    * @param[in] handle A handle to an object
    * @return A handle to a AsyncImageLoader object or an uninitialized handle
    */
-  static AsyncImageLoader DownCast( BaseHandle handle );
+  static AsyncImageLoader DownCast(BaseHandle handle);
 
   /**
    * @brief Starts an image loading task.
@@ -161,7 +182,7 @@ public:
    * @param[in] url The URL of the image file to load
    * @return The loading task id
    */
-  uint32_t Load( const std::string& url );
+  uint32_t Load(const std::string& url);
 
   /**
    * @brief Starts an image loading task.
@@ -177,7 +198,7 @@ public:
    * @param[in] dimensions The width and height to fit the loaded image to
    * @return The loading task id
    */
-  uint32_t Load( const std::string& url, ImageDimensions dimensions );
+  uint32_t Load(const std::string& url, ImageDimensions dimensions);
 
   /**
    * @brief Starts an image loading task.
@@ -191,11 +212,11 @@ public:
    * @param[in] orientationCorrection Reorient the image to respect any orientation metadata in its header
    * @return The loading task id
    */
-  uint32_t Load( const std::string& url,
-                 ImageDimensions dimensions,
-                 FittingMode::Type fittingMode,
-                 SamplingMode::Type samplingMode,
-                 bool orientationCorrection );
+  uint32_t Load(const std::string& url,
+                ImageDimensions    dimensions,
+                FittingMode::Type  fittingMode,
+                SamplingMode::Type samplingMode,
+                bool               orientationCorrection);
 
   /**
    * @brief Cancels an image loading task if it is still queueing in the work thread.
@@ -204,7 +225,7 @@ public:
    * @param[in] loadingTaskId The task id returned when invoking the load call.
    * @return If true, the loading task is removed from the queue, otherwise the loading is already implemented and unable to cancel anymore
    */
-  bool Cancel( uint32_t loadingTaskId );
+  bool Cancel(uint32_t loadingTaskId);
 
   /**
    * @brief Cancels all the loading tasks in the queue.
@@ -225,7 +246,6 @@ public:
   ImageLoadedSignalType& ImageLoadedSignal();
 
 public: // Not intended for developer use
-
   /// @cond internal
   /**
    * @brief Allows the creation of a AsyncImageLoader handle from an internal pointer.
@@ -234,11 +254,13 @@ public: // Not intended for developer use
    * @SINCE_1_2_14
    * @param[in] impl A pointer to the object
    */
-  explicit DALI_INTERNAL AsyncImageLoader( Internal::AsyncImageLoader* impl );
+  explicit DALI_INTERNAL AsyncImageLoader(Internal::AsyncImageLoader* impl);
   /// @endcond
-
 };
 
+/**
+ * @}
+ */
 } // namespace Toolkit
 
 } // namespace Dali