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 "Node JS Addon for DALi + Improvements" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
text-atlas-renderer.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
index
4107f82
..
809c236
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h
@@
-51,7
+51,7
@@
public:
* @param[in] depth The depth in the tree of the parent.
* @return The Renderable actor used to position the text.
*/
* @param[in] depth The depth in the tree of the parent.
* @return The Renderable actor used to position the text.
*/
- virtual Actor Render( ViewInterface& view,
unsigned
int depth );
+ virtual Actor Render( ViewInterface& view, int depth );
protected:
protected: