X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fimage-loader%2Fasync-image-loader.cpp;h=97ebf6298a77f9567e0627ed4a0f2f510bf40e53;hb=11e1ee5bb1a33525dd3016a0fd145a6a3ee2c133;hp=c1e23eea07496e81ba7dcbdc9189ab29545a417f;hpb=7386b0e7cc501917168284f388353dab660db58f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.cpp b/dali-toolkit/public-api/image-loader/async-image-loader.cpp
index c1e23ee..97ebf62 100644
--- a/dali-toolkit/public-api/image-loader/async-image-loader.cpp
+++ b/dali-toolkit/public-api/image-loader/async-image-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -19,13 +19,12 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/image-loader/async-image-loader-impl.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 AsyncImageLoader::AsyncImageLoader()
 {
 }
@@ -34,65 +33,62 @@ AsyncImageLoader::~AsyncImageLoader()
 {
 }
 
-AsyncImageLoader::AsyncImageLoader( Internal::AsyncImageLoader* impl )
-: BaseHandle( impl )
+AsyncImageLoader::AsyncImageLoader(Internal::AsyncImageLoader* impl)
+: BaseHandle(impl)
 {
 }
 
-AsyncImageLoader::AsyncImageLoader( const AsyncImageLoader& handle )
-: BaseHandle( handle )
-{
-}
+AsyncImageLoader::AsyncImageLoader(const AsyncImageLoader& handle) = default;
 
-AsyncImageLoader& AsyncImageLoader::operator=( const AsyncImageLoader& handle )
-{
-  BaseHandle::operator=( handle );
-  return *this;
-}
+AsyncImageLoader::AsyncImageLoader(AsyncImageLoader&& rhs) = default;
+
+AsyncImageLoader& AsyncImageLoader::operator=(const AsyncImageLoader& handle) = default;
+
+AsyncImageLoader& AsyncImageLoader::operator=(AsyncImageLoader&& rhs) = default;
 
-AsyncImageLoader AsyncImageLoader::DownCast( BaseHandle handle )
+AsyncImageLoader AsyncImageLoader::DownCast(BaseHandle handle)
 {
-  return AsyncImageLoader( dynamic_cast<Dali::Toolkit::Internal::AsyncImageLoader*>( handle.GetObjectPtr() ) );
+  return AsyncImageLoader(dynamic_cast<Dali::Toolkit::Internal::AsyncImageLoader*>(handle.GetObjectPtr()));
 }
 
 AsyncImageLoader AsyncImageLoader::New()
 {
   IntrusivePtr<Internal::AsyncImageLoader> internal = Internal::AsyncImageLoader::New();
-   return AsyncImageLoader( internal.Get() );
+  return AsyncImageLoader(internal.Get());
 }
 
-uint32_t AsyncImageLoader::Load( const std::string& url )
+uint32_t AsyncImageLoader::Load(const std::string& url)
 {
-  return GetImplementation( *this ).Load( url, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true );
+  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
 }
 
-uint32_t AsyncImageLoader::Load( const std::string& url, ImageDimensions dimensions )
+uint32_t AsyncImageLoader::Load(const std::string& url, ImageDimensions dimensions)
 {
-  return GetImplementation( *this ).Load( url, dimensions, FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true );
+  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), dimensions, FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
 }
 
-uint32_t AsyncImageLoader::Load( const std::string& url,
-                                 ImageDimensions dimensions,
-                                 FittingMode::Type fittingMode,
-                                 SamplingMode::Type samplingMode,
-                                 bool orientationCorrection )
+uint32_t AsyncImageLoader::Load(const std::string& url,
+                                ImageDimensions    dimensions,
+                                FittingMode::Type  fittingMode,
+                                SamplingMode::Type samplingMode,
+                                bool               orientationCorrection)
 {
-  return GetImplementation(*this).Load( url, dimensions, fittingMode, samplingMode, orientationCorrection );
+  return GetImplementation(*this).Load(Toolkit::Internal::VisualUrl(url), dimensions, fittingMode, samplingMode, orientationCorrection, DevelAsyncImageLoader::PreMultiplyOnLoad::OFF, false);
 }
 
-bool AsyncImageLoader::Cancel( uint32_t loadingTaskId )
+bool AsyncImageLoader::Cancel(uint32_t loadingTaskId)
 {
-  return GetImplementation(*this).Cancel( loadingTaskId );
+  return GetImplementation(*this).Cancel(loadingTaskId);
 }
 
 void AsyncImageLoader::CancelAll()
 {
-  GetImplementation( *this ).CancelAll();
+  GetImplementation(*this).CancelAll();
 }
 
 AsyncImageLoader::ImageLoadedSignalType& AsyncImageLoader::ImageLoadedSignal()
 {
-  return GetImplementation( *this ).ImageLoadedSignal();
+  return GetImplementation(*this).ImageLoadedSignal();
 }
 } // namespace Toolkit