X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fimage-loader%2Fsync-image-loader.cpp;h=c035488631287db84808db94c836088eaa2e45e8;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hp=7a8ab3cf7ed142e616abfe1d9cd822a213767574;hpb=a68dbe03813fd3db34c81f4e6960572e8882930b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/image-loader/sync-image-loader.cpp b/dali-toolkit/public-api/image-loader/sync-image-loader.cpp
index 7a8ab3c..c035488 100644
--- a/dali-toolkit/public-api/image-loader/sync-image-loader.cpp
+++ b/dali-toolkit/public-api/image-loader/sync-image-loader.cpp
@@ -1,5 +1,5 @@
 /*
- * 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,38 +18,37 @@
 #include "sync-image-loader.h"
 #include <dali/devel-api/adaptor-framework/image-loading.h>
 
-
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace SyncImageLoader
 {
-
-
-PixelData Load( const std::string& url )
+PixelData Load(const std::string& url)
 {
-  return Load( url, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true );
+  return Load(url, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true);
 }
 
-PixelData Load( const std::string& url, ImageDimensions dimensions )
+PixelData Load(const std::string& url, ImageDimensions dimensions)
 {
-  return Load( url, dimensions, FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true );
+  return Load(url, dimensions, FittingMode::DEFAULT, SamplingMode::BOX_THEN_LINEAR, true);
 }
 
-PixelData Load( const std::string& url,
-                ImageDimensions dimensions,
-                FittingMode::Type fittingMode,
-                SamplingMode::Type samplingMode,
-                bool orientationCorrection )
+PixelData Load(const std::string& url,
+               ImageDimensions    dimensions,
+               FittingMode::Type  fittingMode,
+               SamplingMode::Type samplingMode,
+               bool               orientationCorrection)
 {
   // Load the image synchronously (block the thread here).
-  return Dali::LoadImageFromFile( url, dimensions, fittingMode, samplingMode, orientationCorrection );
+  Devel::PixelBuffer pixelBuffer = Dali::LoadImageFromFile(url, dimensions, fittingMode, samplingMode, orientationCorrection);
+  if(pixelBuffer)
+  {
+    return Devel::PixelBuffer::Convert(pixelBuffer);
+  }
+  return Dali::PixelData(); // return empty handle
 }
 
-
 } // namespace SyncImageLoader
 
 } // namespace Toolkit