X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fmulti-language-helper-functions.h;h=41cb04aad3f958a4f989a3d1016dad71ef85fced;hb=29a52105283ce8ced672ed92545daeacf882316a;hp=14dee1b1837a0f048737ac1f423fcd07a4e9159a;hpb=2cf32ac170f397aacce527efd34909b3fd62efda;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/multi-language-helper-functions.h b/dali-toolkit/internal/text/multi-language-helper-functions.h index 14dee1b..41cb04a 100644 --- a/dali-toolkit/internal/text/multi-language-helper-functions.h +++ b/dali-toolkit/internal/text/multi-language-helper-functions.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H__ -#define __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H__ +#ifndef DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H +#define DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -27,13 +27,10 @@ namespace Dali { - namespace Toolkit { - namespace Text { - /** * @brief Merges font's descriptions to retrieve the combined font's description for a given character. * @@ -45,13 +42,13 @@ namespace Text * @param[out] fontPointSize The font's point size for the character. * @param[out] isDefaultFont Whether the font is a default one. */ -void MergeFontDescriptions( const Vector& fontDescriptions, - const TextAbstraction::FontDescription& defaultFontDescription, - TextAbstraction::PointSize26Dot6 defaultPointSize, - CharacterIndex characterIndex, - TextAbstraction::FontDescription& fontDescription, - TextAbstraction::PointSize26Dot6& fontPointSize, - bool& isDefaultFont ); +void MergeFontDescriptions(const Vector& fontDescriptions, + const TextAbstraction::FontDescription& defaultFontDescription, + TextAbstraction::PointSize26Dot6 defaultPointSize, + CharacterIndex characterIndex, + TextAbstraction::FontDescription& fontDescription, + TextAbstraction::PointSize26Dot6& fontPointSize, + bool& isDefaultFont); /** * @brief Retrieves the script Id from the script run for a given character's @p index. @@ -64,9 +61,9 @@ void MergeFontDescriptions( const Vector& fontDescriptions, * * @return The script. */ -Script GetScript( Length index, - Vector::ConstIterator& scriptRunIt, - const Vector::ConstIterator& scriptRunEndIt ); +Script GetScript(Length index, + Vector::ConstIterator& scriptRunIt, + const Vector::ConstIterator& scriptRunEndIt); } // namespace Text @@ -74,4 +71,4 @@ Script GetScript( Length index, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H__ +#endif // DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H