X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fimage-loader%2Fimage-load-thread.cpp;h=a06953ea7eb5fb86f5ae611d8655f4aef56ff5a4;hb=3e8125aaa4cd84f45c67a054bd0f6abe71ca0e9e;hp=d0b504d262729f5b8f26631991fd8fbe6a9abf46;hpb=78d26caf8723599166886a1fca571c2365f227bf;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/image-loader/image-load-thread.cpp b/dali-toolkit/internal/image-loader/image-load-thread.cpp
index d0b504d..a06953e 100644
--- a/dali-toolkit/internal/image-loader/image-load-thread.cpp
+++ b/dali-toolkit/internal/image-loader/image-load-thread.cpp
@@ -30,7 +30,7 @@ namespace Toolkit
 namespace Internal
 {
 
-LoadingTask::LoadingTask( uint32_t id, const std::string& url, ImageDimensions dimensions,
+LoadingTask::LoadingTask( uint32_t id, const VisualUrl& url, ImageDimensions dimensions,
                           FittingMode::Type fittingMode, SamplingMode::Type samplingMode, bool orientationCorrection )
 : pixelData(),
   url( url ),
@@ -44,7 +44,14 @@ LoadingTask::LoadingTask( uint32_t id, const std::string& url, ImageDimensions d
 
 void LoadingTask::Load()
 {
-  pixelData = Dali::LoadImageFromFile( url, dimensions, fittingMode, samplingMode, orientationCorrection );
+  if( url.IsLocal() )
+  {
+    pixelData = Dali::LoadImageFromFile( url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection );
+  }
+  else
+  {
+    pixelData = Dali::DownloadImageSynchronously ( url.GetUrl(), dimensions, fittingMode, samplingMode, orientationCorrection );
+  }
 }