Merge "Line wrap mode property is added." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / image-loader / image-load-thread.h

diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h
index f46d435..3d0ad24 100644 (file)
--- a/dali-toolkit/internal/image-loader/image-load-thread.h
+++ b/dali-toolkit/internal/image-loader/image-load-thread.h
@@ -21,12 +21,12 @@
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/images/image-operations.h>
-#include <dali/public-api/images/pixel-data.h>
 #include <dali/devel-api/threading/conditional-wait.h>
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>
 #include <dali/devel-api/adaptor-framework/event-thread-callback.h>
-
+#include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
 {
@@ -51,8 +51,9 @@ struct LoadingTask
    * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
    * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
    */
-  LoadingTask( uint32_t id, const std::string& url, ImageDimensions dimensions,
-               FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection );
+  LoadingTask( uint32_t id, const VisualUrl& url, ImageDimensions dimensions,
+               FittingMode::Type fittingMode, SamplingMode::Type samplingMode,
+               bool orientationCorrection );
 
   /**
    * Load the image
@@ -69,13 +70,13 @@ private:
 
 public:
 
-  PixelData pixelData;             ///< pixelData handle after successfull load
-  std::string url;                 ///< url of the image to load
-  uint32_t     id;                 ///< The unique id associated with this task.
-  ImageDimensions dimensions;      ///< dimensions to load
-  FittingMode::Type fittingMode;   ///< fitting options
-  SamplingMode::Type samplingMode; ///< sampling options
-  bool orientationCorrection:1;    ///< if orientation correction is needed
+  Devel::PixelBuffer pixelBuffer;   ///< pixelBuffer handle after successful load
+  VisualUrl          url;           ///< url of the image to load
+  uint32_t           id;            ///< The unique id associated with this task.
+  ImageDimensions    dimensions;    ///< dimensions to load
+  FittingMode::Type  fittingMode;   ///< fitting options
+  SamplingMode::Type samplingMode;  ///< sampling options
+  bool               orientationCorrection:1; ///< if orientation correction is needed
 
 };