X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=platform-abstractions%2Ftizen%2Ftizen-platform-abstraction.cpp;h=1a8a876c8b13e54878a5c926ce430037ea973c04;hb=efbfe41145cb178ee71f073f74f1e98e2485fffc;hp=2bf6e6f9954564bbfaa8dc38959ae747c1893993;hpb=f4b05fe51ddba1d7d2035103ef3cfcd1d4741d3c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/platform-abstractions/tizen/tizen-platform-abstraction.cpp b/platform-abstractions/tizen/tizen-platform-abstraction.cpp index 2bf6e6f..1a8a876 100644 --- a/platform-abstractions/tizen/tizen-platform-abstraction.cpp +++ b/platform-abstractions/tizen/tizen-platform-abstraction.cpp @@ -28,7 +28,6 @@ // INTERNAL INCLUDES #include "image-loaders/image-loader.h" #include "portable/file-reader.h" -#include namespace Dali { @@ -70,8 +69,7 @@ Integration::ResourcePointer TizenPlatformAbstraction::LoadImageSynchronously(co Integration::BitmapPtr TizenPlatformAbstraction::DecodeBuffer( const Integration::BitmapResourceType& resource, uint8_t * buffer, size_t size ) { - Integration::BitmapPtr resultBitmap; - Dali::Devel::PixelBuffer bitmap; + Integration::BitmapPtr bitmap = 0; Dali::Internal::Platform::FileReader fileReader( buffer, size ); FILE * const fp = fileReader.GetFile(); @@ -83,29 +81,9 @@ Integration::BitmapPtr TizenPlatformAbstraction::DecodeBuffer( const Integration bitmap.Reset(); DALI_LOG_WARNING( "Unable to decode bitmap supplied as in-memory blob.\n" ); } - else - { - Integration::Bitmap::Profile profile{Integration::Bitmap::Profile::BITMAP_2D_PACKED_PIXELS}; - - // For backward compatibility the Bitmap must be created - auto retval = Integration::Bitmap::New(profile, Dali::ResourcePolicy::OWNED_DISCARD); - - retval->GetPackedPixelsProfile()->ReserveBuffer( - bitmap.GetPixelFormat(), - bitmap.GetWidth(), - bitmap.GetHeight(), - bitmap.GetWidth(), - bitmap.GetHeight() - ); - - auto& impl = Dali::GetImplementation(bitmap); - - std::copy( impl.GetBuffer(), impl.GetBuffer()+impl.GetBufferSize(), retval->GetBuffer()); - resultBitmap.Reset(retval); - } } - return resultBitmap; + return bitmap; } bool TizenPlatformAbstraction::LoadShaderBinaryFile( const std::string& filename, Dali::Vector< unsigned char >& buffer ) const