X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fimage-loader%2Fsync-image-loader.cpp;h=e8f8ad703cc52b417fd6c9db7973a1c3a2218d96;hp=de489dcfc095456895527cbff069a91d2a38fc67;hb=26d183fc49ba2b62bbd844d668f15d141efcd326;hpb=7386b0e7cc501917168284f388353dab660db58f 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 de489dc..e8f8ad7 100644 --- a/dali-toolkit/public-api/image-loader/sync-image-loader.cpp +++ b/dali-toolkit/public-api/image-loader/sync-image-loader.cpp @@ -16,7 +16,7 @@ // CLASS HEADER #include "sync-image-loader.h" -#include +#include namespace Dali @@ -45,12 +45,13 @@ PixelData Load( const std::string& url, SamplingMode::Type samplingMode, bool orientationCorrection ) { - BitmapLoader loader = BitmapLoader::New( url, dimensions, fittingMode, samplingMode, orientationCorrection ); - // Load the image synchronously (block the thread here). - loader.Load(); - - return loader.GetPixelData(); + Devel::PixelBuffer pixelBuffer = Dali::LoadImageFromFile( url, dimensions, fittingMode, samplingMode, orientationCorrection ); + if( pixelBuffer ) + { + return Devel::PixelBuffer::Convert( pixelBuffer ); + } + return Dali::PixelData(); // return empty handle }