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=7a8ab3cf7ed142e616abfe1d9cd822a213767574;hb=26d183fc49ba2b62bbd844d668f15d141efcd326;hpb=89ae5b785c2eb8276d5fb350004414bc3fab8a2d 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..e8f8ad7 100644 --- a/dali-toolkit/public-api/image-loader/sync-image-loader.cpp +++ b/dali-toolkit/public-api/image-loader/sync-image-loader.cpp @@ -46,7 +46,12 @@ PixelData Load( const std::string& url, 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 }