X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-platform-abstraction.cpp;h=190aa63c1fb645c981a61288e2885af17184d741;hb=908670e8d7b3447b5201a7f9118cca881cf0a41e;hp=b177e4a8b3c8bd5a65179cc5d4c5bd390b7c7a4d;hpb=37e9d8db3f288d32f93cee6089edccdb10b34084;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index b177e4a..190aa63 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp @@ -25,7 +25,6 @@ namespace Dali TestPlatformAbstraction::TestPlatformAbstraction() : mTrace(), mIsLoadingResult( false ), - mSize(), mClosestSize(), mLoadFileResult(), mSaveFileResult( false ), @@ -44,7 +43,7 @@ ImageDimensions TestPlatformAbstraction::GetClosestImageSize( const std::string& SamplingMode::Type samplingMode, bool orientationCorrection ) { - ImageDimensions closestSize = ImageDimensions( mClosestSize.x, mClosestSize.y ); + ImageDimensions closestSize = ImageDimensions( mClosestSize ); mTrace.PushCall("GetClosestImageSize", ""); return closestSize; } @@ -55,18 +54,18 @@ ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::Resou SamplingMode::Type samplingMode, bool orientationCorrection ) { - ImageDimensions closestSize = ImageDimensions( mClosestSize.x, mClosestSize.y ); + ImageDimensions closestSize = ImageDimensions( mClosestSize ); mTrace.PushCall("GetClosestImageSize", ""); return closestSize; } -Integration::ResourcePointer TestPlatformAbstraction::LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath ) +Integration::ResourcePointer TestPlatformAbstraction::LoadImageSynchronously( const Integration::BitmapResourceType& resourceType, const std::string& resourcePath ) { mTrace.PushCall("LoadResourceSynchronously", ""); return mSynchronouslyLoadedResource; } -Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration::ResourceType& resourceType, uint8_t * buffer, size_t size ) +Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration::BitmapResourceType& resourceType, uint8_t * buffer, size_t size ) { mTrace.PushCall("DecodeBuffer", ""); return mDecodedBitmap; @@ -116,9 +115,9 @@ void TestPlatformAbstraction::ClearReadyResources() mDecodedBitmap.Reset(); } -void TestPlatformAbstraction::SetClosestImageSize(const Vector2& size) +void TestPlatformAbstraction::SetClosestImageSize( const Vector2& size ) { - mClosestSize = size; + mClosestSize = ImageDimensions( static_cast( size.x ), static_cast( size.y ) ); } void TestPlatformAbstraction::SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer )