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
Fix setting z value issue in Layout
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-MultiLanguage.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
index
dbb0e94
..
94bb485
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.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.
@@
-178,9
+178,11
@@
bool ScriptsTest( const ScriptsData& data )
Vector<Character> utf32;
utf32.Resize( data.text.size() );
Vector<Character> utf32;
utf32.Resize( data.text.size() );
- const uint32_t numberOfCharacters = Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
- data.text.size(),
- &utf32[0u] );
+ const uint32_t numberOfCharacters = ( data.text.size() == 0 ) ? 0 :
+ Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
+ data.text.size(),
+ &utf32[0u] );
+
utf32.Resize( numberOfCharacters );
// 2) Set the script info.
utf32.Resize( numberOfCharacters );
// 2) Set the script info.
@@
-255,7
+257,8
@@
bool ValidateFontTest( const ValidateFontsData& data )
Vector<Character> utf32;
utf32.Resize( data.text.size() );
Vector<Character> utf32;
utf32.Resize( data.text.size() );
- const uint32_t numberOfCharacters = Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
+ const uint32_t numberOfCharacters = (data.text.size() == 0 ) ? 0 :
+ Utf8ToUtf32( reinterpret_cast<const uint8_t* const>( data.text.c_str() ),
data.text.size(),
&utf32[0u] );
utf32.Resize( numberOfCharacters );
data.text.size(),
&utf32[0u] );
utf32.Resize( numberOfCharacters );