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 "Fix for text's popup." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ImageAtlas.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index
3883553
..
0f56e92
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
@@
-153,8
+153,8
@@
int UtcDaliImageAtlasSetBrokenImage(void)
atlas.Upload( textureRect, gImageNonExist );
Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect, size);
atlas.Upload( textureRect, gImageNonExist );
Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect, size);
- DALI_TEST_EQUALS( pixelArea.width, 34
.f
, TEST_LOCATION );
- DALI_TEST_EQUALS( pixelArea.height, 34
.f
, TEST_LOCATION );
+ DALI_TEST_EQUALS( pixelArea.width, 34, TEST_LOCATION );
+ DALI_TEST_EQUALS( pixelArea.height, 34, TEST_LOCATION );
END_TEST;
}
END_TEST;
}
@@
-231,8
+231,8
@@
int UtcDaliImageAtlasRemove(void)
// one pixel gap
Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect2, size);
// one pixel gap
Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect2, size);
- DALI_TEST_EQUALS( pixelArea.x, 0
.f
, TEST_LOCATION );
- DALI_TEST_EQUALS( pixelArea.y, 0
.f
, TEST_LOCATION );
+ DALI_TEST_EQUALS( pixelArea.x, 0, TEST_LOCATION );
+ DALI_TEST_EQUALS( pixelArea.y, 0, TEST_LOCATION );
END_TEST;
}
END_TEST;
}