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
Adding debug methods for Control internals
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
dali-toolkit-test-utils
/
toolkit-text-utils.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
index
7768344
..
b977ec3
100755
(executable)
--- a/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-109,7
+109,8
@@
void CreateTextModel( const std::string& text,
Vector<Character>& utf32Characters = logicalModel->mText;
utf32Characters.Resize( text.size() );
Vector<Character>& utf32Characters = logicalModel->mText;
utf32Characters.Resize( text.size() );
- const uint32_t numberOfCharacters = Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( text.c_str() ),
+ const uint32_t numberOfCharacters = ( text.size() == 0) ? 0 :
+ Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( text.c_str() ),
text.size(),
&utf32Characters[0u] );
utf32Characters.Resize( numberOfCharacters );
text.size(),
&utf32Characters[0u] );
utf32Characters.Resize( numberOfCharacters );