X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fimage-loader%2Fasync-image-loader-impl.h;h=7810a8f03f2a4e477e939d82e6ffea4a7b5098e7;hb=a267f3da043b1b792ffc64d1848542aa761e44c0;hp=cb0311c7e8b3b5eb80641de9c9117ee7e61d300a;hpb=41307f75478fd6c6fb5f9ae7e7de5036647f39b3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.h b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
index cb0311c..7810a8f 100644
--- a/dali-toolkit/internal/image-loader/async-image-loader-impl.h
+++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.h
@@ -1,5 +1,5 @@
-#ifndef DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H__
-#define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H__
+#ifndef DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
+#define DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -22,7 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/image-loader/async-image-loader.h>
+#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
+#include <dali-toolkit/devel-api/image-loader/async-image-loader-devel.h>
 #include <dali-toolkit/internal/image-loader/image-load-thread.h>
 
 namespace Dali
@@ -49,13 +50,14 @@ public:
   static IntrusivePtr<AsyncImageLoader> New();
 
   /**
-   * @copydoc Toolkit::AsyncImageLoader::Load( const std::string&, ImageDimensions,FittingMode::Type, SamplingMode::Type, bool )
+   * @copydoc Toolkit::AsyncImageLoader::Load( const std::string&, ImageDimensions, FittingMode::Type, SamplingMode::Type, bool , DevelAsyncImageLoader::PreMultiplyOnLoad )
    */
-  uint32_t Load( const std::string& url,
-                 ImageDimensions size,
+  uint32_t Load( const VisualUrl& url,
+                 ImageDimensions dimensions,
                  FittingMode::Type fittingMode,
                  SamplingMode::Type samplingMode,
-                 bool orientationCorrection );
+                 bool orientationCorrection,
+                 DevelAsyncImageLoader::PreMultiplyOnLoad preMultiplyOnLoad );
 
   /**
    * @copydoc Toolkit::AsyncImageLoader::ImageLoadedSignal
@@ -63,6 +65,11 @@ public:
   Toolkit::AsyncImageLoader::ImageLoadedSignalType& ImageLoadedSignal();
 
   /**
+   * @copydoc Toolkit::AsyncImageLoader::PixelBufferLoadedSignal
+   */
+  Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType& PixelBufferLoadedSignal();
+
+  /**
    * @copydoc Toolkit::AsyncImageLoader::Cancel
    */
   bool Cancel( uint32_t loadingTaskId );
@@ -85,32 +92,30 @@ protected:
   ~AsyncImageLoader();
 
 private:
-
   Toolkit::AsyncImageLoader::ImageLoadedSignalType mLoadedSignal;
+  Toolkit::DevelAsyncImageLoader::PixelBufferLoadedSignalType mPixelBufferLoadedSignal;
 
   ImageLoadThread mLoadThread;
   uint32_t        mLoadTaskId;
   bool            mIsLoadThreadStarted;
-
-
 };
 
 } // namespace Internal
 
-inline const Internal::AsyncImageLoader& GetImplementation( const Toolkit::AsyncImageLoader& loader )
+inline const Internal::AsyncImageLoader& GetImplementation( const Toolkit::AsyncImageLoader& handle )
 {
-  DALI_ASSERT_ALWAYS( loader && "AsyncImageLoader handle is empty" );
+  DALI_ASSERT_ALWAYS( handle && "AsyncImageLoader handle is empty" );
 
-  const BaseObject& object = loader.GetBaseObject();
+  const BaseObject& object = handle.GetBaseObject();
 
   return static_cast<const Internal::AsyncImageLoader&>( object );
 }
 
-inline Internal::AsyncImageLoader& GetImplementation( Toolkit::AsyncImageLoader& loader )
+inline Internal::AsyncImageLoader& GetImplementation( Toolkit::AsyncImageLoader& handle )
 {
-  DALI_ASSERT_ALWAYS( loader && "AsyncImageLoader handle is empty" );
+  DALI_ASSERT_ALWAYS( handle && "AsyncImageLoader handle is empty" );
 
-  BaseObject& object = loader.GetBaseObject();
+  BaseObject& object = handle.GetBaseObject();
 
   return static_cast<Internal::AsyncImageLoader&>( object );
 }
@@ -119,4 +124,4 @@ inline Internal::AsyncImageLoader& GetImplementation( Toolkit::AsyncImageLoader&
 
 } // namespace Dali
 
-#endif /* DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H__ */
+#endif // DALI_TOOLKIT_ASYNC_IMAGE_LOADER_IMPL_H