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 "Updates for NativeImageInterface" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
segmentation.h
diff --git
a/dali-toolkit/internal/text/segmentation.h
b/dali-toolkit/internal/text/segmentation.h
index
61ddcc7
..
a60865a
100644
(file)
--- a/
dali-toolkit/internal/text/segmentation.h
+++ b/
dali-toolkit/internal/text/segmentation.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_SEGMENTATION_H__
-#define
__DALI_TOOLKIT_TEXT_SEGMENTATION_H__
+#ifndef
DALI_TOOLKIT_TEXT_SEGMENTATION_H
+#define
DALI_TOOLKIT_TEXT_SEGMENTATION_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-45,9
+45,13
@@
class LogicalModel;
* - 2 is a LINE_NO_BREAK. Text can't be broken into a new line.
*
* @param[in] text Vector of UTF-32 characters.
* - 2 is a LINE_NO_BREAK. Text can't be broken into a new line.
*
* @param[in] text Vector of UTF-32 characters.
+ * @param[in] startIndex The character from where the break info is set.
+ * @param[in] numberOfCharacters The number of characters.
* @param[out] lineBreakInfo The line break info
*/
void SetLineBreakInfo( const Vector<Character>& text,
* @param[out] lineBreakInfo The line break info
*/
void SetLineBreakInfo( const Vector<Character>& text,
+ CharacterIndex startIndex,
+ Length numberOfCharacters,
Vector<LineBreakInfo>& lineBreakInfo );
/**
Vector<LineBreakInfo>& lineBreakInfo );
/**
@@
-72,4
+76,4
@@
void SetWordBreakInfo( const Vector<Character>& text,
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_SEGMENTATION_H__
+#endif //
DALI_TOOLKIT_TEXT_SEGMENTATION_H