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
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-CarouselEffect.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
index
07e3c9f
..
8d6367a
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
@@
-76,7
+76,7
@@
int UtcDaliCarouselEffectDefaultValues(void)
Toolkit::CarouselEffect effect = Toolkit::CarouselEffect::New();
DALI_TEST_CHECK( effect );
Toolkit::CarouselEffect effect = Toolkit::CarouselEffect::New();
DALI_TEST_CHECK( effect );
- B
itmapImage image = CreateBitmap
Image();
+ B
ufferImage image = CreateBuffer
Image();
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );
@@
-105,7
+105,7
@@
int UtcDaliCarouselEffectCustomValues(void)
Toolkit::CarouselEffect effect = Toolkit::CarouselEffect::New();
DALI_TEST_CHECK( effect );
Toolkit::CarouselEffect effect = Toolkit::CarouselEffect::New();
DALI_TEST_CHECK( effect );
- B
itmapImage image = CreateBitmap
Image();
+ B
ufferImage image = CreateBuffer
Image();
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );
ImageActor actor = ImageActor::New( image );
actor.SetSize( 100.0f, 100.0f );