projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Remove dali-core dependency of GLES version."
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-platform-abstraction.cpp
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
(file)
--- 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 ),
TestPlatformAbstraction::TestPlatformAbstraction()
: mTrace(),
mIsLoadingResult( false ),
- mSize(),
mClosestSize(),
mLoadFileResult(),
mSaveFileResult( false ),
mClosestSize(),
mLoadFileResult(),
mSaveFileResult( false ),
@@
-44,7
+43,7
@@
ImageDimensions TestPlatformAbstraction::GetClosestImageSize( const std::string&
SamplingMode::Type samplingMode,
bool orientationCorrection )
{
SamplingMode::Type samplingMode,
bool orientationCorrection )
{
- ImageDimensions closestSize = ImageDimensions( mClosestSize
.x, mClosestSize.y
);
+ ImageDimensions closestSize = ImageDimensions( mClosestSize );
mTrace.PushCall("GetClosestImageSize", "");
return closestSize;
}
mTrace.PushCall("GetClosestImageSize", "");
return closestSize;
}
@@
-55,18
+54,18
@@
ImageDimensions TestPlatformAbstraction::GetClosestImageSize( Integration::Resou
SamplingMode::Type samplingMode,
bool orientationCorrection )
{
SamplingMode::Type samplingMode,
bool orientationCorrection )
{
- ImageDimensions closestSize = ImageDimensions( mClosestSize
.x, mClosestSize.y
);
+ ImageDimensions closestSize = ImageDimensions( mClosestSize );
mTrace.PushCall("GetClosestImageSize", "");
return closestSize;
}
mTrace.PushCall("GetClosestImageSize", "");
return closestSize;
}
-Integration::ResourcePointer TestPlatformAbstraction::Load
ResourceSynchronously( const Integration::
ResourceType& resourceType, const std::string& resourcePath )
+Integration::ResourcePointer TestPlatformAbstraction::Load
ImageSynchronously( const Integration::Bitmap
ResourceType& resourceType, const std::string& resourcePath )
{
mTrace.PushCall("LoadResourceSynchronously", "");
return mSynchronouslyLoadedResource;
}
{
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::
Bitmap
ResourceType& resourceType, uint8_t * buffer, size_t size )
{
mTrace.PushCall("DecodeBuffer", "");
return mDecodedBitmap;
{
mTrace.PushCall("DecodeBuffer", "");
return mDecodedBitmap;
@@
-116,9
+115,9
@@
void TestPlatformAbstraction::ClearReadyResources()
mDecodedBitmap.Reset();
}
mDecodedBitmap.Reset();
}
-void TestPlatformAbstraction::SetClosestImageSize(
const Vector2& size
)
+void TestPlatformAbstraction::SetClosestImageSize(
const Vector2& size
)
{
{
- mClosestSize =
size
;
+ mClosestSize =
ImageDimensions( static_cast<uint32_t>( size.x ), static_cast<uint32_t>( size.y ) )
;
}
void TestPlatformAbstraction::SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer )
}
void TestPlatformAbstraction::SetLoadFileResult( bool result, Dali::Vector< unsigned char >& buffer )